Skip to content

V
V8
Commit 6c85119c authored by jkummerow@chromium.org's avatar jkummerow@chromium.org
Browse files
Options

Fix building with clang 

BUG=v8:1912

Review URL: https://chromiumcodereview.appspot.com/9285013

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10492 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent be288cf2
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 141 deletions
build/common.gypi
View file @ 6c85119c
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
'-O3', '-O3',
], ],
'conditions': [ 'conditions': [
[ 'gcc_version==44', { [ 'gcc_version==44 and clang==0', {
'cflags': [ 'cflags': [
# Avoid crashes with gcc 4.4 in the v8 test suite. # Avoid crashes with gcc 4.4 in the v8 test suite.
'-fno-tree-vrp', '-fno-tree-vrp',
......
src/arm/assembler-arm.h
View file @ 6c85119c
...@@ -300,11 +300,13 @@ const DwVfpRegister d13 = { 13 }; ...@@ -300,11 +300,13 @@ const DwVfpRegister d13 = { 13 };
const DwVfpRegister d14 = { 14 }; const DwVfpRegister d14 = { 14 };
const DwVfpRegister d15 = { 15 }; const DwVfpRegister d15 = { 15 };
// Aliases for double registers. // Aliases for double registers. Defined using #define instead of
static const DwVfpRegister& kFirstCalleeSavedDoubleReg = d8; // "static const DwVfpRegister&" because Clang complains otherwise when a
static const DwVfpRegister& kLastCalleeSavedDoubleReg = d15; // compilation unit that includes this header doesn't use the variables.
static const DwVfpRegister& kDoubleRegZero = d14; #define kFirstCalleeSavedDoubleReg d8
static const DwVfpRegister& kScratchDoubleReg = d15; #define kLastCalleeSavedDoubleReg d15
#define kDoubleRegZero d14
#define kScratchDoubleReg d15
// Coprocessor register // Coprocessor register
......
src/arm/lithium-arm.cc
View file @ 6c85119c
...@@ -1923,12 +1923,11 @@ LInstruction* LChunkBuilder::DoLoadKeyedFastDoubleElement( ...@@ -1923,12 +1923,11 @@ LInstruction* LChunkBuilder::DoLoadKeyedFastDoubleElement(
LInstruction* LChunkBuilder::DoLoadKeyedSpecializedArrayElement( LInstruction* LChunkBuilder::DoLoadKeyedSpecializedArrayElement(
HLoadKeyedSpecializedArrayElement* instr) { HLoadKeyedSpecializedArrayElement* instr) {
ElementsKind elements_kind = instr->elements_kind(); ElementsKind elements_kind = instr->elements_kind();
Representation representation(instr->representation());
ASSERT( ASSERT(
(representation.IsInteger32() && (instr->representation().IsInteger32() &&
(elements_kind != EXTERNAL_FLOAT_ELEMENTS) && (elements_kind != EXTERNAL_FLOAT_ELEMENTS) &&
(elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) || (elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) ||
(representation.IsDouble() && (instr->representation().IsDouble() &&
((elements_kind == EXTERNAL_FLOAT_ELEMENTS) || ((elements_kind == EXTERNAL_FLOAT_ELEMENTS) ||
(elements_kind == EXTERNAL_DOUBLE_ELEMENTS)))); (elements_kind == EXTERNAL_DOUBLE_ELEMENTS))));
ASSERT(instr->key()->representation().IsInteger32()); ASSERT(instr->key()->representation().IsInteger32());
...@@ -1988,13 +1987,12 @@ LInstruction* LChunkBuilder::DoStoreKeyedFastDoubleElement( ...@@ -1988,13 +1987,12 @@ LInstruction* LChunkBuilder::DoStoreKeyedFastDoubleElement(
LInstruction* LChunkBuilder::DoStoreKeyedSpecializedArrayElement( LInstruction* LChunkBuilder::DoStoreKeyedSpecializedArrayElement(
HStoreKeyedSpecializedArrayElement* instr) { HStoreKeyedSpecializedArrayElement* instr) {
Representation representation(instr->value()->representation());
ElementsKind elements_kind = instr->elements_kind(); ElementsKind elements_kind = instr->elements_kind();
ASSERT( ASSERT(
(representation.IsInteger32() && (instr->value()->representation().IsInteger32() &&
(elements_kind != EXTERNAL_FLOAT_ELEMENTS) && (elements_kind != EXTERNAL_FLOAT_ELEMENTS) &&
(elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) || (elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) ||
(representation.IsDouble() && (instr->value()->representation().IsDouble() &&
((elements_kind == EXTERNAL_FLOAT_ELEMENTS) || ((elements_kind == EXTERNAL_FLOAT_ELEMENTS) ||
(elements_kind == EXTERNAL_DOUBLE_ELEMENTS)))); (elements_kind == EXTERNAL_DOUBLE_ELEMENTS))));
ASSERT(instr->external_pointer()->representation().IsExternal()); ASSERT(instr->external_pointer()->representation().IsExternal());
......
src/ia32/lithium-ia32.cc
View file @ 6c85119c
...@@ -2008,12 +2008,11 @@ LInstruction* LChunkBuilder::DoLoadKeyedFastDoubleElement( ...@@ -2008,12 +2008,11 @@ LInstruction* LChunkBuilder::DoLoadKeyedFastDoubleElement(
LInstruction* LChunkBuilder::DoLoadKeyedSpecializedArrayElement( LInstruction* LChunkBuilder::DoLoadKeyedSpecializedArrayElement(
HLoadKeyedSpecializedArrayElement* instr) { HLoadKeyedSpecializedArrayElement* instr) {
ElementsKind elements_kind = instr->elements_kind(); ElementsKind elements_kind = instr->elements_kind();
Representation representation(instr->representation());
ASSERT( ASSERT(
(representation.IsInteger32() && (instr->representation().IsInteger32() &&
(elements_kind != EXTERNAL_FLOAT_ELEMENTS) && (elements_kind != EXTERNAL_FLOAT_ELEMENTS) &&
(elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) || (elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) ||
(representation.IsDouble() && (instr->representation().IsDouble() &&
((elements_kind == EXTERNAL_FLOAT_ELEMENTS) || ((elements_kind == EXTERNAL_FLOAT_ELEMENTS) ||
(elements_kind == EXTERNAL_DOUBLE_ELEMENTS)))); (elements_kind == EXTERNAL_DOUBLE_ELEMENTS))));
ASSERT(instr->key()->representation().IsInteger32()); ASSERT(instr->key()->representation().IsInteger32());
...@@ -2076,13 +2075,12 @@ LInstruction* LChunkBuilder::DoStoreKeyedFastDoubleElement( ...@@ -2076,13 +2075,12 @@ LInstruction* LChunkBuilder::DoStoreKeyedFastDoubleElement(
LInstruction* LChunkBuilder::DoStoreKeyedSpecializedArrayElement( LInstruction* LChunkBuilder::DoStoreKeyedSpecializedArrayElement(
HStoreKeyedSpecializedArrayElement* instr) { HStoreKeyedSpecializedArrayElement* instr) {
Representation representation(instr->value()->representation());
ElementsKind elements_kind = instr->elements_kind(); ElementsKind elements_kind = instr->elements_kind();
ASSERT( ASSERT(
(representation.IsInteger32() && (instr->value()->representation().IsInteger32() &&
(elements_kind != EXTERNAL_FLOAT_ELEMENTS) && (elements_kind != EXTERNAL_FLOAT_ELEMENTS) &&
(elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) || (elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) ||
(representation.IsDouble() && (instr->value()->representation().IsDouble() &&
((elements_kind == EXTERNAL_FLOAT_ELEMENTS) || ((elements_kind == EXTERNAL_FLOAT_ELEMENTS) ||
(elements_kind == EXTERNAL_DOUBLE_ELEMENTS)))); (elements_kind == EXTERNAL_DOUBLE_ELEMENTS))));
ASSERT(instr->external_pointer()->representation().IsExternal()); ASSERT(instr->external_pointer()->representation().IsExternal());
......
src/serialize.cc
View file @ 6c85119c
// Copyright 2011 the V8 project authors. All rights reserved. // Copyright 2012 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
// met: // met:
...@@ -1081,36 +1081,6 @@ void SnapshotByteSink::PutInt(uintptr_t integer, const char* description) { ...@@ -1081,36 +1081,6 @@ void SnapshotByteSink::PutInt(uintptr_t integer, const char* description) {
PutSection(static_cast<int>(integer & 0x7f), "IntLastPart"); PutSection(static_cast<int>(integer & 0x7f), "IntLastPart");
} }
#ifdef DEBUG
void Deserializer::Synchronize(const char* tag) {
int data = source_->Get();
// If this assert fails then that indicates that you have a mismatch between
// the number of GC roots when serializing and deserializing.
ASSERT_EQ(kSynchronize, data);
do {
int character = source_->Get();
if (character == 0) break;
if (FLAG_debug_serialization) {
PrintF("%c", character);
}
} while (true);
if (FLAG_debug_serialization) {
PrintF("\n");
}
}
void Serializer::Synchronize(const char* tag) {
sink_->Put(kSynchronize, tag);
int character;
do {
character = *tag++;
sink_->PutSection(character, "TagCharacter");
} while (character != 0);
}
#endif
Serializer::Serializer(SnapshotByteSink* sink) Serializer::Serializer(SnapshotByteSink* sink)
: sink_(sink), : sink_(sink),
......
src/serialize.h
View file @ 6c85119c
...@@ -341,10 +341,6 @@ class Deserializer: public SerializerDeserializer { ...@@ -341,10 +341,6 @@ class Deserializer: public SerializerDeserializer {
// Deserialize a single object and the objects reachable from it. // Deserialize a single object and the objects reachable from it.
void DeserializePartial(Object** root); void DeserializePartial(Object** root);
#ifdef DEBUG
virtual void Synchronize(const char* tag);
#endif
private: private:
virtual void VisitPointers(Object** start, Object** end); virtual void VisitPointers(Object** start, Object** end);
...@@ -485,9 +481,6 @@ class Serializer : public SerializerDeserializer { ...@@ -485,9 +481,6 @@ class Serializer : public SerializerDeserializer {
SerializationAddressMapper* address_mapper() { return &address_mapper_; } SerializationAddressMapper* address_mapper() { return &address_mapper_; }
void PutRoot( void PutRoot(
int index, HeapObject* object, HowToCode how, WhereToPoint where); int index, HeapObject* object, HowToCode how, WhereToPoint where);
#ifdef DEBUG
virtual void Synchronize(const char* tag);
#endif
protected: protected:
static const int kInvalidRootIndex = -1; static const int kInvalidRootIndex = -1;
......
src/x64/lithium-x64.cc
View file @ 6c85119c
...@@ -1918,12 +1918,11 @@ LInstruction* LChunkBuilder::DoLoadKeyedFastDoubleElement( ...@@ -1918,12 +1918,11 @@ LInstruction* LChunkBuilder::DoLoadKeyedFastDoubleElement(
LInstruction* LChunkBuilder::DoLoadKeyedSpecializedArrayElement( LInstruction* LChunkBuilder::DoLoadKeyedSpecializedArrayElement(
HLoadKeyedSpecializedArrayElement* instr) { HLoadKeyedSpecializedArrayElement* instr) {
ElementsKind elements_kind = instr->elements_kind(); ElementsKind elements_kind = instr->elements_kind();
Representation representation(instr->representation());
ASSERT( ASSERT(
(representation.IsInteger32() && (instr->representation().IsInteger32() &&
(elements_kind != EXTERNAL_FLOAT_ELEMENTS) && (elements_kind != EXTERNAL_FLOAT_ELEMENTS) &&
(elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) || (elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) ||
(representation.IsDouble() && (instr->representation().IsDouble() &&
((elements_kind == EXTERNAL_FLOAT_ELEMENTS) || ((elements_kind == EXTERNAL_FLOAT_ELEMENTS) ||
(elements_kind == EXTERNAL_DOUBLE_ELEMENTS)))); (elements_kind == EXTERNAL_DOUBLE_ELEMENTS))));
ASSERT(instr->key()->representation().IsInteger32()); ASSERT(instr->key()->representation().IsInteger32());
...@@ -1982,13 +1981,12 @@ LInstruction* LChunkBuilder::DoStoreKeyedFastDoubleElement( ...@@ -1982,13 +1981,12 @@ LInstruction* LChunkBuilder::DoStoreKeyedFastDoubleElement(
LInstruction* LChunkBuilder::DoStoreKeyedSpecializedArrayElement( LInstruction* LChunkBuilder::DoStoreKeyedSpecializedArrayElement(
HStoreKeyedSpecializedArrayElement* instr) { HStoreKeyedSpecializedArrayElement* instr) {
Representation representation(instr->value()->representation());
ElementsKind elements_kind = instr->elements_kind(); ElementsKind elements_kind = instr->elements_kind();
ASSERT( ASSERT(
(representation.IsInteger32() && (instr->value()->representation().IsInteger32() &&
(elements_kind != EXTERNAL_FLOAT_ELEMENTS) && (elements_kind != EXTERNAL_FLOAT_ELEMENTS) &&
(elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) || (elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) ||
(representation.IsDouble() && (instr->value()->representation().IsDouble() &&
((elements_kind == EXTERNAL_FLOAT_ELEMENTS) || ((elements_kind == EXTERNAL_FLOAT_ELEMENTS) ||
(elements_kind == EXTERNAL_DOUBLE_ELEMENTS)))); (elements_kind == EXTERNAL_DOUBLE_ELEMENTS))));
ASSERT(instr->external_pointer()->representation().IsExternal()); ASSERT(instr->external_pointer()->representation().IsExternal());
......
test/cctest/test-api.cc
View file @ 6c85119c
...@@ -1189,7 +1189,6 @@ THREADED_TEST(GlobalPrototype) { ...@@ -1189,7 +1189,6 @@ THREADED_TEST(GlobalPrototype) {
templ->Set("x", v8_num(200)); templ->Set("x", v8_num(200));
templ->SetAccessor(v8_str("m"), GetM); templ->SetAccessor(v8_str("m"), GetM);
LocalContext env(0, templ); LocalContext env(0, templ);
v8::Handle<v8::Object> obj(env->Global());
v8::Handle<Script> script(v8_compile("dummy()")); v8::Handle<Script> script(v8_compile("dummy()"));
v8::Handle<Value> result(script->Run()); v8::Handle<Value> result(script->Run());
CHECK_EQ(13.4, result->NumberValue()); CHECK_EQ(13.4, result->NumberValue());
...@@ -1847,7 +1846,7 @@ THREADED_TEST(DeepCrossLanguageRecursion) { ...@@ -1847,7 +1846,7 @@ THREADED_TEST(DeepCrossLanguageRecursion) {
env->Global()->Set(v8_str("depth"), v8::Integer::New(0)); env->Global()->Set(v8_str("depth"), v8::Integer::New(0));
call_recursively_script = v8_compile("callScriptRecursively()"); call_recursively_script = v8_compile("callScriptRecursively()");
v8::Handle<Value> result(call_recursively_script->Run()); call_recursively_script->Run();
call_recursively_script = v8::Handle<Script>(); call_recursively_script = v8::Handle<Script>();
env->Global()->Set(v8_str("depth"), v8::Integer::New(0)); env->Global()->Set(v8_str("depth"), v8::Integer::New(0));
...@@ -4476,7 +4475,7 @@ THREADED_TEST(ExtensibleOnUndetectable) { ...@@ -4476,7 +4475,7 @@ THREADED_TEST(ExtensibleOnUndetectable) {
source = v8_str("undetectable.y = 2000;"); source = v8_str("undetectable.y = 2000;");
script = Script::Compile(source); script = Script::Compile(source);
Local<Value> result(script->Run()); script->Run();
ExpectBoolean("undetectable.y == undefined", true); ExpectBoolean("undetectable.y == undefined", true);
} }
...@@ -4829,9 +4828,10 @@ THREADED_TEST(NativeFunctionDeclarationError) { ...@@ -4829,9 +4828,10 @@ THREADED_TEST(NativeFunctionDeclarationError) {
const char* extension_names[] = { name }; const char* extension_names[] = { name };
v8::ExtensionConfiguration extensions(1, extension_names); v8::ExtensionConfiguration extensions(1, extension_names);
v8::Handle<Context> context(Context::New(&extensions)); v8::Handle<Context> context(Context::New(&extensions));
ASSERT(context.IsEmpty()); CHECK(context.IsEmpty());
} }
THREADED_TEST(NativeFunctionDeclarationErrorEscape) { THREADED_TEST(NativeFunctionDeclarationErrorEscape) {
v8::HandleScope handle_scope; v8::HandleScope handle_scope;
const char* name = "nativedeclerresc"; const char* name = "nativedeclerresc";
...@@ -4843,7 +4843,7 @@ THREADED_TEST(NativeFunctionDeclarationErrorEscape) { ...@@ -4843,7 +4843,7 @@ THREADED_TEST(NativeFunctionDeclarationErrorEscape) {
const char* extension_names[] = { name }; const char* extension_names[] = { name };
v8::ExtensionConfiguration extensions(1, extension_names); v8::ExtensionConfiguration extensions(1, extension_names);
v8::Handle<Context> context(Context::New(&extensions)); v8::Handle<Context> context(Context::New(&extensions));
ASSERT(context.IsEmpty()); CHECK(context.IsEmpty());
} }
...@@ -5009,7 +5009,7 @@ TEST(RegexpOutOfMemory) { ...@@ -5009,7 +5009,7 @@ TEST(RegexpOutOfMemory) {
Local<Script> script = Local<Script> script =
Script::Compile(String::New(js_code_causing_huge_string_flattening)); Script::Compile(String::New(js_code_causing_huge_string_flattening));
last_location = NULL; last_location = NULL;
Local<Value> result(script->Run()); script->Run();
CHECK(false); // Should not return. CHECK(false); // Should not return.
} }
...@@ -5787,7 +5787,6 @@ THREADED_TEST(ErrorConstruction) { ...@@ -5787,7 +5787,6 @@ THREADED_TEST(ErrorConstruction) {
v8::Handle<String> message = v8_str("message"); v8::Handle<String> message = v8_str("message");
v8::Handle<Value> range_error = v8::Exception::RangeError(foo); v8::Handle<Value> range_error = v8::Exception::RangeError(foo);
CHECK(range_error->IsObject()); CHECK(range_error->IsObject());
v8::Handle<v8::Object> range_obj(range_error.As<v8::Object>());
CHECK(range_error.As<v8::Object>()->Get(message)->Equals(foo)); CHECK(range_error.As<v8::Object>()->Get(message)->Equals(foo));
v8::Handle<Value> reference_error = v8::Exception::ReferenceError(foo); v8::Handle<Value> reference_error = v8::Exception::ReferenceError(foo);
CHECK(reference_error->IsObject()); CHECK(reference_error->IsObject());
...@@ -7357,7 +7356,7 @@ THREADED_TEST(CallKnownGlobalReceiver) { ...@@ -7357,7 +7356,7 @@ THREADED_TEST(CallKnownGlobalReceiver) {
// Create new environment reusing the global object. // Create new environment reusing the global object.
LocalContext env(NULL, instance_template, global_object); LocalContext env(NULL, instance_template, global_object);
env->Global()->Set(v8_str("foo"), foo); env->Global()->Set(v8_str("foo"), foo);
Local<Value> value(Script::Compile(v8_str("foo()"))->Run()); Script::Compile(v8_str("foo()"))->Run();
} }
} }
...@@ -7683,6 +7682,7 @@ THREADED_TEST(Constructor) { ...@@ -7683,6 +7682,7 @@ THREADED_TEST(Constructor) {
context->Global()->Set(v8_str("Fun"), cons); context->Global()->Set(v8_str("Fun"), cons);
Local<v8::Object> inst = cons->NewInstance(); Local<v8::Object> inst = cons->NewInstance();
i::Handle<i::JSObject> obj(v8::Utils::OpenHandle(*inst)); i::Handle<i::JSObject> obj(v8::Utils::OpenHandle(*inst));
CHECK(obj->IsJSObject());
Local<Value> value = CompileRun("(new Fun()).constructor === Fun"); Local<Value> value = CompileRun("(new Fun()).constructor === Fun");
CHECK(value->BooleanValue()); CHECK(value->BooleanValue());
} }
...@@ -8154,6 +8154,7 @@ THREADED_TEST(CallAsFunction) { ...@@ -8154,6 +8154,7 @@ THREADED_TEST(CallAsFunction) {
{ Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New(); { Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New();
Local<ObjectTemplate> instance_template(t->InstanceTemplate()); Local<ObjectTemplate> instance_template(t->InstanceTemplate());
USE(instance_template);
Local<v8::Object> instance = t->GetFunction()->NewInstance(); Local<v8::Object> instance = t->GetFunction()->NewInstance();
context->Global()->Set(v8_str("obj2"), instance); context->Global()->Set(v8_str("obj2"), instance);
v8::TryCatch try_catch; v8::TryCatch try_catch;
...@@ -8783,10 +8784,10 @@ THREADED_TEST(InterceptorStoreIC) { ...@@ -8783,10 +8784,10 @@ THREADED_TEST(InterceptorStoreIC) {
0, 0, 0, v8_str("data")); 0, 0, 0, v8_str("data"));
LocalContext context; LocalContext context;
context->Global()->Set(v8_str("o"), templ->NewInstance()); context->Global()->Set(v8_str("o"), templ->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"for (var i = 0; i < 1000; i++) {" "for (var i = 0; i < 1000; i++) {"
" o.x = 42;" " o.x = 42;"
"}")); "}");
} }
...@@ -9254,11 +9255,11 @@ THREADED_TEST(InterceptorCallICFastApi_TrivialSignature) { ...@@ -9254,11 +9255,11 @@ THREADED_TEST(InterceptorCallICFastApi_TrivialSignature) {
v8::Handle<v8::Function> fun = fun_templ->GetFunction(); v8::Handle<v8::Function> fun = fun_templ->GetFunction();
GenerateSomeGarbage(); GenerateSomeGarbage();
context->Global()->Set(v8_str("o"), fun->NewInstance()); context->Global()->Set(v8_str("o"), fun->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"var result = 0;" "var result = 0;"
"for (var i = 0; i < 100; i++) {" "for (var i = 0; i < 100; i++) {"
" result = o.method(41);" " result = o.method(41);"
"}")); "}");
CHECK_EQ(42, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(42, context->Global()->Get(v8_str("result"))->Int32Value());
CHECK_EQ(100, interceptor_call_count); CHECK_EQ(100, interceptor_call_count);
} }
...@@ -9281,14 +9282,14 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature) { ...@@ -9281,14 +9282,14 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature) {
v8::Handle<v8::Function> fun = fun_templ->GetFunction(); v8::Handle<v8::Function> fun = fun_templ->GetFunction();
GenerateSomeGarbage(); GenerateSomeGarbage();
context->Global()->Set(v8_str("o"), fun->NewInstance()); context->Global()->Set(v8_str("o"), fun->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"o.foo = 17;" "o.foo = 17;"
"var receiver = {};" "var receiver = {};"
"receiver.__proto__ = o;" "receiver.__proto__ = o;"
"var result = 0;" "var result = 0;"
"for (var i = 0; i < 100; i++) {" "for (var i = 0; i < 100; i++) {"
" result = receiver.method(41);" " result = receiver.method(41);"
"}")); "}");
CHECK_EQ(42, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(42, context->Global()->Get(v8_str("result"))->Int32Value());
CHECK_EQ(100, interceptor_call_count); CHECK_EQ(100, interceptor_call_count);
} }
...@@ -9311,7 +9312,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss1) { ...@@ -9311,7 +9312,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss1) {
v8::Handle<v8::Function> fun = fun_templ->GetFunction(); v8::Handle<v8::Function> fun = fun_templ->GetFunction();
GenerateSomeGarbage(); GenerateSomeGarbage();
context->Global()->Set(v8_str("o"), fun->NewInstance()); context->Global()->Set(v8_str("o"), fun->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"o.foo = 17;" "o.foo = 17;"
"var receiver = {};" "var receiver = {};"
"receiver.__proto__ = o;" "receiver.__proto__ = o;"
...@@ -9323,7 +9324,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss1) { ...@@ -9323,7 +9324,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss1) {
" saved_result = result;" " saved_result = result;"
" receiver = {method: function(x) { return x - 1 }};" " receiver = {method: function(x) { return x - 1 }};"
" }" " }"
"}")); "}");
CHECK_EQ(40, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(40, context->Global()->Get(v8_str("result"))->Int32Value());
CHECK_EQ(42, context->Global()->Get(v8_str("saved_result"))->Int32Value()); CHECK_EQ(42, context->Global()->Get(v8_str("saved_result"))->Int32Value());
CHECK_GE(interceptor_call_count, 50); CHECK_GE(interceptor_call_count, 50);
...@@ -9347,7 +9348,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss2) { ...@@ -9347,7 +9348,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss2) {
v8::Handle<v8::Function> fun = fun_templ->GetFunction(); v8::Handle<v8::Function> fun = fun_templ->GetFunction();
GenerateSomeGarbage(); GenerateSomeGarbage();
context->Global()->Set(v8_str("o"), fun->NewInstance()); context->Global()->Set(v8_str("o"), fun->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"o.foo = 17;" "o.foo = 17;"
"var receiver = {};" "var receiver = {};"
"receiver.__proto__ = o;" "receiver.__proto__ = o;"
...@@ -9359,7 +9360,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss2) { ...@@ -9359,7 +9360,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss2) {
" saved_result = result;" " saved_result = result;"
" o.method = function(x) { return x - 1 };" " o.method = function(x) { return x - 1 };"
" }" " }"
"}")); "}");
CHECK_EQ(40, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(40, context->Global()->Get(v8_str("result"))->Int32Value());
CHECK_EQ(42, context->Global()->Get(v8_str("saved_result"))->Int32Value()); CHECK_EQ(42, context->Global()->Get(v8_str("saved_result"))->Int32Value());
CHECK_GE(interceptor_call_count, 50); CHECK_GE(interceptor_call_count, 50);
...@@ -9384,7 +9385,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss3) { ...@@ -9384,7 +9385,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss3) {
GenerateSomeGarbage(); GenerateSomeGarbage();
context->Global()->Set(v8_str("o"), fun->NewInstance()); context->Global()->Set(v8_str("o"), fun->NewInstance());
v8::TryCatch try_catch; v8::TryCatch try_catch;
v8::Handle<Value> value(CompileRun( CompileRun(
"o.foo = 17;" "o.foo = 17;"
"var receiver = {};" "var receiver = {};"
"receiver.__proto__ = o;" "receiver.__proto__ = o;"
...@@ -9396,7 +9397,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss3) { ...@@ -9396,7 +9397,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_Miss3) {
" saved_result = result;" " saved_result = result;"
" receiver = 333;" " receiver = 333;"
" }" " }"
"}")); "}");
CHECK(try_catch.HasCaught()); CHECK(try_catch.HasCaught());
CHECK_EQ(v8_str("TypeError: Object 333 has no method 'method'"), CHECK_EQ(v8_str("TypeError: Object 333 has no method 'method'"),
try_catch.Exception()->ToString()); try_catch.Exception()->ToString());
...@@ -9423,7 +9424,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_TypeError) { ...@@ -9423,7 +9424,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_TypeError) {
GenerateSomeGarbage(); GenerateSomeGarbage();
context->Global()->Set(v8_str("o"), fun->NewInstance()); context->Global()->Set(v8_str("o"), fun->NewInstance());
v8::TryCatch try_catch; v8::TryCatch try_catch;
v8::Handle<Value> value(CompileRun( CompileRun(
"o.foo = 17;" "o.foo = 17;"
"var receiver = {};" "var receiver = {};"
"receiver.__proto__ = o;" "receiver.__proto__ = o;"
...@@ -9435,7 +9436,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_TypeError) { ...@@ -9435,7 +9436,7 @@ THREADED_TEST(InterceptorCallICFastApi_SimpleSignature_TypeError) {
" saved_result = result;" " saved_result = result;"
" receiver = {method: receiver.method};" " receiver = {method: receiver.method};"
" }" " }"
"}")); "}");
CHECK(try_catch.HasCaught()); CHECK(try_catch.HasCaught());
CHECK_EQ(v8_str("TypeError: Illegal invocation"), CHECK_EQ(v8_str("TypeError: Illegal invocation"),
try_catch.Exception()->ToString()); try_catch.Exception()->ToString());
...@@ -9453,15 +9454,16 @@ THREADED_TEST(CallICFastApi_TrivialSignature) { ...@@ -9453,15 +9454,16 @@ THREADED_TEST(CallICFastApi_TrivialSignature) {
v8::Handle<v8::ObjectTemplate> proto_templ = fun_templ->PrototypeTemplate(); v8::Handle<v8::ObjectTemplate> proto_templ = fun_templ->PrototypeTemplate();
proto_templ->Set(v8_str("method"), method_templ); proto_templ->Set(v8_str("method"), method_templ);
v8::Handle<v8::ObjectTemplate> templ(fun_templ->InstanceTemplate()); v8::Handle<v8::ObjectTemplate> templ(fun_templ->InstanceTemplate());
USE(templ);
LocalContext context; LocalContext context;
v8::Handle<v8::Function> fun = fun_templ->GetFunction(); v8::Handle<v8::Function> fun = fun_templ->GetFunction();
GenerateSomeGarbage(); GenerateSomeGarbage();
context->Global()->Set(v8_str("o"), fun->NewInstance()); context->Global()->Set(v8_str("o"), fun->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"var result = 0;" "var result = 0;"
"for (var i = 0; i < 100; i++) {" "for (var i = 0; i < 100; i++) {"
" result = o.method(41);" " result = o.method(41);"
"}")); "}");
CHECK_EQ(42, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(42, context->Global()->Get(v8_str("result"))->Int32Value());
} }
...@@ -9476,18 +9478,19 @@ THREADED_TEST(CallICFastApi_SimpleSignature) { ...@@ -9476,18 +9478,19 @@ THREADED_TEST(CallICFastApi_SimpleSignature) {
v8::Handle<v8::ObjectTemplate> proto_templ = fun_templ->PrototypeTemplate(); v8::Handle<v8::ObjectTemplate> proto_templ = fun_templ->PrototypeTemplate();
proto_templ->Set(v8_str("method"), method_templ); proto_templ->Set(v8_str("method"), method_templ);
v8::Handle<v8::ObjectTemplate> templ(fun_templ->InstanceTemplate()); v8::Handle<v8::ObjectTemplate> templ(fun_templ->InstanceTemplate());
CHECK(!templ.IsEmpty());
LocalContext context; LocalContext context;
v8::Handle<v8::Function> fun = fun_templ->GetFunction(); v8::Handle<v8::Function> fun = fun_templ->GetFunction();
GenerateSomeGarbage(); GenerateSomeGarbage();
context->Global()->Set(v8_str("o"), fun->NewInstance()); context->Global()->Set(v8_str("o"), fun->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"o.foo = 17;" "o.foo = 17;"
"var receiver = {};" "var receiver = {};"
"receiver.__proto__ = o;" "receiver.__proto__ = o;"
"var result = 0;" "var result = 0;"
"for (var i = 0; i < 100; i++) {" "for (var i = 0; i < 100; i++) {"
" result = receiver.method(41);" " result = receiver.method(41);"
"}")); "}");
CHECK_EQ(42, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(42, context->Global()->Get(v8_str("result"))->Int32Value());
} }
...@@ -9502,11 +9505,12 @@ THREADED_TEST(CallICFastApi_SimpleSignature_Miss1) { ...@@ -9502,11 +9505,12 @@ THREADED_TEST(CallICFastApi_SimpleSignature_Miss1) {
v8::Handle<v8::ObjectTemplate> proto_templ = fun_templ->PrototypeTemplate(); v8::Handle<v8::ObjectTemplate> proto_templ = fun_templ->PrototypeTemplate();
proto_templ->Set(v8_str("method"), method_templ); proto_templ->Set(v8_str("method"), method_templ);
v8::Handle<v8::ObjectTemplate> templ(fun_templ->InstanceTemplate()); v8::Handle<v8::ObjectTemplate> templ(fun_templ->InstanceTemplate());
CHECK(!templ.IsEmpty());
LocalContext context; LocalContext context;
v8::Handle<v8::Function> fun = fun_templ->GetFunction(); v8::Handle<v8::Function> fun = fun_templ->GetFunction();
GenerateSomeGarbage(); GenerateSomeGarbage();
context->Global()->Set(v8_str("o"), fun->NewInstance()); context->Global()->Set(v8_str("o"), fun->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"o.foo = 17;" "o.foo = 17;"
"var receiver = {};" "var receiver = {};"
"receiver.__proto__ = o;" "receiver.__proto__ = o;"
...@@ -9518,7 +9522,7 @@ THREADED_TEST(CallICFastApi_SimpleSignature_Miss1) { ...@@ -9518,7 +9522,7 @@ THREADED_TEST(CallICFastApi_SimpleSignature_Miss1) {
" saved_result = result;" " saved_result = result;"
" receiver = {method: function(x) { return x - 1 }};" " receiver = {method: function(x) { return x - 1 }};"
" }" " }"
"}")); "}");
CHECK_EQ(40, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(40, context->Global()->Get(v8_str("result"))->Int32Value());
CHECK_EQ(42, context->Global()->Get(v8_str("saved_result"))->Int32Value()); CHECK_EQ(42, context->Global()->Get(v8_str("saved_result"))->Int32Value());
} }
...@@ -9533,12 +9537,13 @@ THREADED_TEST(CallICFastApi_SimpleSignature_Miss2) { ...@@ -9533,12 +9537,13 @@ THREADED_TEST(CallICFastApi_SimpleSignature_Miss2) {
v8::Handle<v8::ObjectTemplate> proto_templ = fun_templ->PrototypeTemplate(); v8::Handle<v8::ObjectTemplate> proto_templ = fun_templ->PrototypeTemplate();
proto_templ->Set(v8_str("method"), method_templ); proto_templ->Set(v8_str("method"), method_templ);
v8::Handle<v8::ObjectTemplate> templ(fun_templ->InstanceTemplate()); v8::Handle<v8::ObjectTemplate> templ(fun_templ->InstanceTemplate());
CHECK(!templ.IsEmpty());
LocalContext context; LocalContext context;
v8::Handle<v8::Function> fun = fun_templ->GetFunction(); v8::Handle<v8::Function> fun = fun_templ->GetFunction();
GenerateSomeGarbage(); GenerateSomeGarbage();
context->Global()->Set(v8_str("o"), fun->NewInstance()); context->Global()->Set(v8_str("o"), fun->NewInstance());
v8::TryCatch try_catch; v8::TryCatch try_catch;
v8::Handle<Value> value(CompileRun( CompileRun(
"o.foo = 17;" "o.foo = 17;"
"var receiver = {};" "var receiver = {};"
"receiver.__proto__ = o;" "receiver.__proto__ = o;"
...@@ -9550,7 +9555,7 @@ THREADED_TEST(CallICFastApi_SimpleSignature_Miss2) { ...@@ -9550,7 +9555,7 @@ THREADED_TEST(CallICFastApi_SimpleSignature_Miss2) {
" saved_result = result;" " saved_result = result;"
" receiver = 333;" " receiver = 333;"
" }" " }"
"}")); "}");
CHECK(try_catch.HasCaught()); CHECK(try_catch.HasCaught());
CHECK_EQ(v8_str("TypeError: Object 333 has no method 'method'"), CHECK_EQ(v8_str("TypeError: Object 333 has no method 'method'"),
try_catch.Exception()->ToString()); try_catch.Exception()->ToString());
...@@ -9578,7 +9583,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChange1) { ...@@ -9578,7 +9583,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChange1) {
templ->SetNamedPropertyHandler(NoBlockGetterX); templ->SetNamedPropertyHandler(NoBlockGetterX);
LocalContext context; LocalContext context;
context->Global()->Set(v8_str("o"), templ->NewInstance()); context->Global()->Set(v8_str("o"), templ->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"proto = new Object();" "proto = new Object();"
"proto.y = function(x) { return x + 1; };" "proto.y = function(x) { return x + 1; };"
"proto.z = function(x) { return x - 1; };" "proto.z = function(x) { return x - 1; };"
...@@ -9588,7 +9593,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChange1) { ...@@ -9588,7 +9593,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChange1) {
"for (var i = 0; i < 10; i++) {" "for (var i = 0; i < 10; i++) {"
" if (i == 5) { method = 'z'; };" " if (i == 5) { method = 'z'; };"
" result += o[method](41);" " result += o[method](41);"
"}")); "}");
CHECK_EQ(42*5 + 40*5, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(42*5 + 40*5, context->Global()->Get(v8_str("result"))->Int32Value());
} }
...@@ -9604,7 +9609,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChange2) { ...@@ -9604,7 +9609,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChange2) {
context->Global()->Set(v8_str("proto1"), templ->NewInstance()); context->Global()->Set(v8_str("proto1"), templ->NewInstance());
keyed_call_ic_function = keyed_call_ic_function =
v8_compile("function f(x) { return x - 1; }; f")->Run(); v8_compile("function f(x) { return x - 1; }; f")->Run();
v8::Handle<Value> value(CompileRun( CompileRun(
"o = new Object();" "o = new Object();"
"proto2 = new Object();" "proto2 = new Object();"
"o.y = function(x) { return x + 1; };" "o.y = function(x) { return x + 1; };"
...@@ -9616,7 +9621,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChange2) { ...@@ -9616,7 +9621,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChange2) {
"for (var i = 0; i < 10; i++) {" "for (var i = 0; i < 10; i++) {"
" if (i == 5) { method = 'y'; };" " if (i == 5) { method = 'y'; };"
" result += o[method](41);" " result += o[method](41);"
"}")); "}");
CHECK_EQ(42*5 + 40*5, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(42*5 + 40*5, context->Global()->Get(v8_str("result"))->Int32Value());
} }
...@@ -9629,7 +9634,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChangeOnGlobal) { ...@@ -9629,7 +9634,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChangeOnGlobal) {
templ->SetNamedPropertyHandler(NoBlockGetterX); templ->SetNamedPropertyHandler(NoBlockGetterX);
LocalContext context; LocalContext context;
context->Global()->Set(v8_str("o"), templ->NewInstance()); context->Global()->Set(v8_str("o"), templ->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"function inc(x) { return x + 1; };" "function inc(x) { return x + 1; };"
"inc(1);" "inc(1);"
"function dec(x) { return x - 1; };" "function dec(x) { return x - 1; };"
...@@ -9642,7 +9647,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChangeOnGlobal) { ...@@ -9642,7 +9647,7 @@ THREADED_TEST(InterceptorKeyedCallICKeyChangeOnGlobal) {
"for (var i = 0; i < 10; i++) {" "for (var i = 0; i < 10; i++) {"
" if (i == 5) { method = 'y'; };" " if (i == 5) { method = 'y'; };"
" result += o[method](41);" " result += o[method](41);"
"}")); "}");
CHECK_EQ(42*5 + 40*5, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(42*5 + 40*5, context->Global()->Get(v8_str("result"))->Int32Value());
} }
...@@ -9655,7 +9660,7 @@ THREADED_TEST(InterceptorKeyedCallICFromGlobal) { ...@@ -9655,7 +9660,7 @@ THREADED_TEST(InterceptorKeyedCallICFromGlobal) {
LocalContext context; LocalContext context;
context->Global()->Set(v8_str("o"), templ_o->NewInstance()); context->Global()->Set(v8_str("o"), templ_o->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"function len(x) { return x.length; };" "function len(x) { return x.length; };"
"o.__proto__ = this;" "o.__proto__ = this;"
"var m = 'parseFloat';" "var m = 'parseFloat';"
...@@ -9666,7 +9671,7 @@ THREADED_TEST(InterceptorKeyedCallICFromGlobal) { ...@@ -9666,7 +9671,7 @@ THREADED_TEST(InterceptorKeyedCallICFromGlobal) {
" saved_result = result;" " saved_result = result;"
" };" " };"
" result = o[m]('239');" " result = o[m]('239');"
"}")); "}");
CHECK_EQ(3, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(3, context->Global()->Get(v8_str("result"))->Int32Value());
CHECK_EQ(239, context->Global()->Get(v8_str("saved_result"))->Int32Value()); CHECK_EQ(239, context->Global()->Get(v8_str("saved_result"))->Int32Value());
} }
...@@ -9679,7 +9684,7 @@ THREADED_TEST(InterceptorKeyedCallICMapChangeBefore) { ...@@ -9679,7 +9684,7 @@ THREADED_TEST(InterceptorKeyedCallICMapChangeBefore) {
LocalContext context; LocalContext context;
context->Global()->Set(v8_str("proto"), templ_o->NewInstance()); context->Global()->Set(v8_str("proto"), templ_o->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"var o = new Object();" "var o = new Object();"
"o.__proto__ = proto;" "o.__proto__ = proto;"
"o.method = function(x) { return x + 1; };" "o.method = function(x) { return x + 1; };"
...@@ -9688,7 +9693,7 @@ THREADED_TEST(InterceptorKeyedCallICMapChangeBefore) { ...@@ -9688,7 +9693,7 @@ THREADED_TEST(InterceptorKeyedCallICMapChangeBefore) {
"for (var i = 0; i < 10; i++) {" "for (var i = 0; i < 10; i++) {"
" if (i == 5) { o.method = function(x) { return x - 1; }; };" " if (i == 5) { o.method = function(x) { return x - 1; }; };"
" result += o[m](41);" " result += o[m](41);"
"}")); "}");
CHECK_EQ(42*5 + 40*5, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(42*5 + 40*5, context->Global()->Get(v8_str("result"))->Int32Value());
} }
...@@ -9701,7 +9706,7 @@ THREADED_TEST(InterceptorKeyedCallICMapChangeAfter) { ...@@ -9701,7 +9706,7 @@ THREADED_TEST(InterceptorKeyedCallICMapChangeAfter) {
LocalContext context; LocalContext context;
context->Global()->Set(v8_str("o"), templ_o->NewInstance()); context->Global()->Set(v8_str("o"), templ_o->NewInstance());
v8::Handle<Value> value(CompileRun( CompileRun(
"var proto = new Object();" "var proto = new Object();"
"o.__proto__ = proto;" "o.__proto__ = proto;"
"proto.method = function(x) { return x + 1; };" "proto.method = function(x) { return x + 1; };"
...@@ -9710,7 +9715,7 @@ THREADED_TEST(InterceptorKeyedCallICMapChangeAfter) { ...@@ -9710,7 +9715,7 @@ THREADED_TEST(InterceptorKeyedCallICMapChangeAfter) {
"for (var i = 0; i < 10; i++) {" "for (var i = 0; i < 10; i++) {"
" if (i == 5) { proto.method = function(x) { return x - 1; }; };" " if (i == 5) { proto.method = function(x) { return x - 1; }; };"
" result += o[m](41);" " result += o[m](41);"
"}")); "}");
CHECK_EQ(42*5 + 40*5, context->Global()->Get(v8_str("result"))->Int32Value()); CHECK_EQ(42*5 + 40*5, context->Global()->Get(v8_str("result"))->Int32Value());
} }
...@@ -10627,6 +10632,7 @@ THREADED_TEST(NestedHandleScopeAndContexts) { ...@@ -10627,6 +10632,7 @@ THREADED_TEST(NestedHandleScopeAndContexts) {
env->Enter(); env->Enter();
v8::Handle<Value> value = NestedScope(env); v8::Handle<Value> value = NestedScope(env);
v8::Handle<String> str(value->ToString()); v8::Handle<String> str(value->ToString());
CHECK(!str.IsEmpty());
env->Exit(); env->Exit();
env.Dispose(); env.Dispose();
} }
...@@ -10635,6 +10641,7 @@ THREADED_TEST(NestedHandleScopeAndContexts) { ...@@ -10635,6 +10641,7 @@ THREADED_TEST(NestedHandleScopeAndContexts) {
THREADED_TEST(ExternalAllocatedMemory) { THREADED_TEST(ExternalAllocatedMemory) {
v8::HandleScope outer; v8::HandleScope outer;
v8::Persistent<Context> env(Context::New()); v8::Persistent<Context> env(Context::New());
CHECK(!env.IsEmpty());
const int kSize = 1024*1024; const int kSize = 1024*1024;
CHECK_EQ(v8::V8::AdjustAmountOfExternalAllocatedMemory(kSize), kSize); CHECK_EQ(v8::V8::AdjustAmountOfExternalAllocatedMemory(kSize), kSize);
CHECK_EQ(v8::V8::AdjustAmountOfExternalAllocatedMemory(-kSize), 0); CHECK_EQ(v8::V8::AdjustAmountOfExternalAllocatedMemory(-kSize), 0);
...@@ -10973,6 +10980,7 @@ THREADED_TEST(AccessControlRepeatedContextCreation) { ...@@ -10973,6 +10980,7 @@ THREADED_TEST(AccessControlRepeatedContextCreation) {
i::FunctionTemplateInfo::cast(internal_template->constructor())); i::FunctionTemplateInfo::cast(internal_template->constructor()));
CHECK(!constructor->access_check_info()->IsUndefined()); CHECK(!constructor->access_check_info()->IsUndefined());
v8::Persistent<Context> context0(Context::New(NULL, global_template)); v8::Persistent<Context> context0(Context::New(NULL, global_template));
CHECK(!context0.IsEmpty());
CHECK(!constructor->access_check_info()->IsUndefined()); CHECK(!constructor->access_check_info()->IsUndefined());
} }
...@@ -13048,11 +13056,6 @@ static void ExternalArrayTestHelper(v8::ExternalArrayType array_type, ...@@ -13048,11 +13056,6 @@ static void ExternalArrayTestHelper(v8::ExternalArrayType array_type,
const int kLargeElementCount = kXSize * kYSize * 4; const int kLargeElementCount = kXSize * kYSize * 4;
ElementType* large_array_data = ElementType* large_array_data =
static_cast<ElementType*>(malloc(kLargeElementCount * element_size)); static_cast<ElementType*>(malloc(kLargeElementCount * element_size));
i::Handle<ExternalArrayClass> large_array(
i::Handle<ExternalArrayClass>::cast(
FACTORY->NewExternalArray(kLargeElementCount,
array_type,
array_data)));
v8::Handle<v8::Object> large_obj = v8::Object::New(); v8::Handle<v8::Object> large_obj = v8::Object::New();
// Set the elements to be the external array. // Set the elements to be the external array.
large_obj->SetIndexedPropertiesToExternalArrayData(large_array_data, large_obj->SetIndexedPropertiesToExternalArrayData(large_array_data,
...@@ -13453,8 +13456,8 @@ TEST(CaptureStackTrace) { ...@@ -13453,8 +13456,8 @@ TEST(CaptureStackTrace) {
v8::Handle<v8::String> overview_src = v8::String::New(overview_source); v8::Handle<v8::String> overview_src = v8::String::New(overview_source);
v8::Handle<Value> overview_result( v8::Handle<Value> overview_result(
v8::Script::New(overview_src, origin)->Run()); v8::Script::New(overview_src, origin)->Run());
ASSERT(!overview_result.IsEmpty()); CHECK(!overview_result.IsEmpty());
ASSERT(overview_result->IsObject()); CHECK(overview_result->IsObject());
// Test getting DETAILED information. // Test getting DETAILED information.
const char *detailed_source = const char *detailed_source =
...@@ -13473,8 +13476,8 @@ TEST(CaptureStackTrace) { ...@@ -13473,8 +13476,8 @@ TEST(CaptureStackTrace) {
v8::Handle<v8::Script> detailed_script( v8::Handle<v8::Script> detailed_script(
v8::Script::New(detailed_src, &detailed_origin)); v8::Script::New(detailed_src, &detailed_origin));
v8::Handle<Value> detailed_result(detailed_script->Run()); v8::Handle<Value> detailed_result(detailed_script->Run());
ASSERT(!detailed_result.IsEmpty()); CHECK(!detailed_result.IsEmpty());
ASSERT(detailed_result->IsObject()); CHECK(detailed_result->IsObject());
} }
...@@ -13894,6 +13897,7 @@ static v8::Handle<Value> SpaghettiIncident(const v8::Arguments& args) { ...@@ -13894,6 +13897,7 @@ static v8::Handle<Value> SpaghettiIncident(const v8::Arguments& args) {
v8::HandleScope scope; v8::HandleScope scope;
v8::TryCatch tc; v8::TryCatch tc;
v8::Handle<v8::String> str(args[0]->ToString()); v8::Handle<v8::String> str(args[0]->ToString());
USE(str);
if (tc.HasCaught()) if (tc.HasCaught())
return tc.ReThrow(); return tc.ReThrow();
return v8::Undefined(); return v8::Undefined();
...@@ -15192,7 +15196,7 @@ TEST(RegExp) { ...@@ -15192,7 +15196,7 @@ TEST(RegExp) {
// RegExps are objects on which you can set properties. // RegExps are objects on which you can set properties.
re->Set(v8_str("property"), v8::Integer::New(32)); re->Set(v8_str("property"), v8::Integer::New(32));
v8::Handle<v8::Value> value(CompileRun("re.property")); v8::Handle<v8::Value> value(CompileRun("re.property"));
ASSERT_EQ(32, value->Int32Value()); CHECK_EQ(32, value->Int32Value());
v8::TryCatch try_catch; v8::TryCatch try_catch;
re = v8::RegExp::New(v8_str("foo["), v8::RegExp::kNone); re = v8::RegExp::New(v8_str("foo["), v8::RegExp::kNone);
......
test/cctest/test-compiler.cc
View file @ 6c85119c
// Copyright 2011 the V8 project authors. All rights reserved. // Copyright 2012 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
// met: // met:
...@@ -270,8 +270,7 @@ TEST(UncaughtThrow) { ...@@ -270,8 +270,7 @@ TEST(UncaughtThrow) {
CHECK(!fun.is_null()); CHECK(!fun.is_null());
bool has_pending_exception; bool has_pending_exception;
Handle<JSObject> global(Isolate::Current()->context()->global()); Handle<JSObject> global(Isolate::Current()->context()->global());
Handle<Object> result( Execution::Call(fun, global, 0, NULL, &has_pending_exception);
Execution::Call(fun, global, 0, NULL, &has_pending_exception));
CHECK(has_pending_exception); CHECK(has_pending_exception);
CHECK_EQ(42.0, Isolate::Current()->pending_exception()-> CHECK_EQ(42.0, Isolate::Current()->pending_exception()->
ToObjectChecked()->Number()); ToObjectChecked()->Number());
......
test/cctest/test-debug.cc
View file @ 6c85119c
// Copyright 2011 the V8 project authors. All rights reserved. // Copyright 2012 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
// met: // met:
...@@ -856,7 +856,7 @@ static void DebugEventRemoveBreakPoint(v8::DebugEvent event, ...@@ -856,7 +856,7 @@ static void DebugEventRemoveBreakPoint(v8::DebugEvent event,
if (event == v8::Break) { if (event == v8::Break) {
break_point_hit_count++; break_point_hit_count++;
v8::Handle<v8::Function> fun(v8::Handle<v8::Function>::Cast(data)); CHECK(data->IsFunction());
ClearBreakPoint(debug_event_remove_break_point); ClearBreakPoint(debug_event_remove_break_point);
} }
} }
...@@ -1447,8 +1447,7 @@ TEST(BreakPointSurviveGC) { ...@@ -1447,8 +1447,7 @@ TEST(BreakPointSurviveGC) {
// Test IC store break point with garbage collection. // Test IC store break point with garbage collection.
{ {
v8::Local<v8::Function> bar( CompileFunction(&env, "function foo(){}", "foo");
CompileFunction(&env, "function foo(){}", "foo"));
foo = CompileFunction(&env, "function foo(){bar=0;}", "foo"); foo = CompileFunction(&env, "function foo(){bar=0;}", "foo");
SetBreakPoint(foo, 0); SetBreakPoint(foo, 0);
} }
...@@ -1456,8 +1455,7 @@ TEST(BreakPointSurviveGC) { ...@@ -1456,8 +1455,7 @@ TEST(BreakPointSurviveGC) {
// Test IC load break point with garbage collection. // Test IC load break point with garbage collection.
{ {
v8::Local<v8::Function> bar( CompileFunction(&env, "function foo(){}", "foo");
CompileFunction(&env, "function foo(){}", "foo"));
foo = CompileFunction(&env, "bar=1;function foo(){var x=bar;}", "foo"); foo = CompileFunction(&env, "bar=1;function foo(){var x=bar;}", "foo");
SetBreakPoint(foo, 0); SetBreakPoint(foo, 0);
} }
...@@ -1465,8 +1463,7 @@ TEST(BreakPointSurviveGC) { ...@@ -1465,8 +1463,7 @@ TEST(BreakPointSurviveGC) {
// Test IC call break point with garbage collection. // Test IC call break point with garbage collection.
{ {
v8::Local<v8::Function> bar( CompileFunction(&env, "function foo(){}", "foo");
CompileFunction(&env, "function foo(){}", "foo"));
foo = CompileFunction(&env, foo = CompileFunction(&env,
"function bar(){};function foo(){bar();}", "function bar(){};function foo(){bar();}",
"foo"); "foo");
...@@ -1476,8 +1473,7 @@ TEST(BreakPointSurviveGC) { ...@@ -1476,8 +1473,7 @@ TEST(BreakPointSurviveGC) {
// Test return break point with garbage collection. // Test return break point with garbage collection.
{ {
v8::Local<v8::Function> bar( CompileFunction(&env, "function foo(){}", "foo");
CompileFunction(&env, "function foo(){}", "foo"));
foo = CompileFunction(&env, "function foo(){}", "foo"); foo = CompileFunction(&env, "function foo(){}", "foo");
SetBreakPoint(foo, 0); SetBreakPoint(foo, 0);
} }
...@@ -1485,8 +1481,7 @@ TEST(BreakPointSurviveGC) { ...@@ -1485,8 +1481,7 @@ TEST(BreakPointSurviveGC) {
// Test non IC break point with garbage collection. // Test non IC break point with garbage collection.
{ {
v8::Local<v8::Function> bar( CompileFunction(&env, "function foo(){}", "foo");
CompileFunction(&env, "function foo(){}", "foo"));
foo = CompileFunction(&env, "function foo(){var bar=0;}", "foo"); foo = CompileFunction(&env, "function foo(){var bar=0;}", "foo");
SetBreakPoint(foo, 0); SetBreakPoint(foo, 0);
} }
...@@ -3751,8 +3746,7 @@ TEST(BreakOnException) { ...@@ -3751,8 +3746,7 @@ TEST(BreakOnException) {
v8::internal::Isolate::Current()->TraceException(false); v8::internal::Isolate::Current()->TraceException(false);
// Create functions for testing break on exception. // Create functions for testing break on exception.
v8::Local<v8::Function> throws( CompileFunction(&env, "function throws(){throw 1;}", "throws");
CompileFunction(&env, "function throws(){throw 1;}", "throws"));
v8::Local<v8::Function> caught = v8::Local<v8::Function> caught =
CompileFunction(&env, CompileFunction(&env,
"function caught(){try {throws();} catch(e) {};}", "function caught(){try {throws();} catch(e) {};}",
...@@ -5549,8 +5543,6 @@ TEST(DebuggerUnload) { ...@@ -5549,8 +5543,6 @@ TEST(DebuggerUnload) {
// Get the test functions again. // Get the test functions again.
v8::Local<v8::Function> foo(v8::Local<v8::Function>::Cast( v8::Local<v8::Function> foo(v8::Local<v8::Function>::Cast(
env->Global()->Get(v8::String::New("foo")))); env->Global()->Get(v8::String::New("foo"))));
v8::Local<v8::Function> bar(v8::Local<v8::Function>::Cast(
env->Global()->Get(v8::String::New("foo"))));
foo->Call(env->Global(), 0, NULL); foo->Call(env->Global(), 0, NULL);
CHECK_EQ(0, break_point_hit_count); CHECK_EQ(0, break_point_hit_count);
...@@ -6028,6 +6020,8 @@ TEST(DebugGetLoadedScripts) { ...@@ -6028,6 +6020,8 @@ TEST(DebugGetLoadedScripts) {
EmptyExternalStringResource source_ext_str; EmptyExternalStringResource source_ext_str;
v8::Local<v8::String> source = v8::String::NewExternal(&source_ext_str); v8::Local<v8::String> source = v8::String::NewExternal(&source_ext_str);
v8::Handle<v8::Script> evil_script(v8::Script::Compile(source)); v8::Handle<v8::Script> evil_script(v8::Script::Compile(source));
// "use" evil_script to make the compiler happy.
(void) evil_script;
Handle<i::ExternalTwoByteString> i_source( Handle<i::ExternalTwoByteString> i_source(
i::ExternalTwoByteString::cast(*v8::Utils::OpenHandle(*source))); i::ExternalTwoByteString::cast(*v8::Utils::OpenHandle(*source)));
// This situation can happen if source was an external string disposed // This situation can happen if source was an external string disposed
...@@ -6675,7 +6669,7 @@ static void BreakMessageHandler(const v8::Debug::Message& message) { ...@@ -6675,7 +6669,7 @@ static void BreakMessageHandler(const v8::Debug::Message& message) {
break_point_hit_count++; break_point_hit_count++;
v8::HandleScope scope; v8::HandleScope scope;
v8::Handle<v8::String> json(message.GetJSON()); message.GetJSON();
SendContinueCommand(); SendContinueCommand();
} else if (message.IsEvent() && message.GetEvent() == v8::AfterCompile) { } else if (message.IsEvent() && message.GetEvent() == v8::AfterCompile) {
...@@ -6686,7 +6680,7 @@ static void BreakMessageHandler(const v8::Debug::Message& message) { ...@@ -6686,7 +6680,7 @@ static void BreakMessageHandler(const v8::Debug::Message& message) {
isolate->stack_guard()->DebugBreak(); isolate->stack_guard()->DebugBreak();
// Force serialization to trigger some internal JS execution. // Force serialization to trigger some internal JS execution.
v8::Handle<v8::String> json(message.GetJSON()); message.GetJSON();
// Restore previous state. // Restore previous state.
if (is_debug_break) { if (is_debug_break) {
......
test/cctest/test-deoptimization.cc
View file @ 6c85119c
// Copyright 2007-2010 the V8 project authors. All rights reserved. // Copyright 2012 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
// met: // met:
...@@ -237,7 +237,7 @@ TEST(DeoptimizeRecursive) { ...@@ -237,7 +237,7 @@ TEST(DeoptimizeRecursive) {
v8::Local<v8::Function> fun = v8::Local<v8::Function> fun =
v8::Local<v8::Function>::Cast(env->Global()->Get(v8::String::New("f"))); v8::Local<v8::Function>::Cast(env->Global()->Get(v8::String::New("f")));
Handle<v8::internal::JSFunction> f(v8::Utils::OpenHandle(*fun)); CHECK(!fun.IsEmpty());
} }
......
test/cctest/test-parsing.cc
View file @ 6c85119c
// Copyright 2011 the V8 project authors. All rights reserved. // Copyright 2012 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
// met: // met:
...@@ -230,7 +230,7 @@ TEST(Preparsing) { ...@@ -230,7 +230,7 @@ TEST(Preparsing) {
CHECK_EQ(11, error_location.end_pos); CHECK_EQ(11, error_location.end_pos);
// Should not crash. // Should not crash.
const char* message = pre_impl->BuildMessage(); const char* message = pre_impl->BuildMessage();
i::Vector<const char*> args(pre_impl->BuildArgs()); pre_impl->BuildArgs();
CHECK_GT(strlen(message), 0); CHECK_GT(strlen(message), 0);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment