Upgrade V8 to 5.1.281.57 DO NOT MERGE
FPIIM-449
Change-Id: Id981b686b4d587ac31697662eb98bb34be42ad90
(cherry picked from commit 3b9bc31999c9787eb726ecdbfd5796bfdec32a18)
diff --git a/test/cctest/test-compiler.cc b/test/cctest/test-compiler.cc
index db2ccb2..32d720e 100644
--- a/test/cctest/test-compiler.cc
+++ b/test/cctest/test-compiler.cc
@@ -39,8 +39,8 @@
static Handle<Object> GetGlobalProperty(const char* name) {
Isolate* isolate = CcTest::i_isolate();
- return Object::GetProperty(
- isolate, isolate->global_object(), name).ToHandleChecked();
+ return JSReceiver::GetProperty(isolate, isolate->global_object(), name)
+ .ToHandleChecked();
}
@@ -59,12 +59,12 @@
Isolate* isolate = CcTest::i_isolate();
Handle<String> source_code = isolate->factory()->NewStringFromUtf8(
CStrVector(source)).ToHandleChecked();
- Handle<SharedFunctionInfo> shared_function = Compiler::CompileScript(
+ Handle<SharedFunctionInfo> shared = Compiler::GetSharedFunctionInfoForScript(
source_code, Handle<String>(), 0, 0, v8::ScriptOriginOptions(),
Handle<Object>(), Handle<Context>(isolate->native_context()), NULL, NULL,
v8::ScriptCompiler::kNoCompileOptions, NOT_NATIVES_CODE, false);
return isolate->factory()->NewFunctionFromSharedFunctionInfo(
- shared_function, isolate->native_context());
+ shared, isolate->native_context());
}
@@ -227,10 +227,9 @@
Handle<JSObject> global(isolate->context()->global_object());
Execution::Call(isolate, fun0, global, 0, NULL).Check();
- Handle<String> foo_string =
- isolate->factory()->InternalizeOneByteString(STATIC_CHAR_VECTOR("foo"));
- Handle<Object> fun1 = Object::GetProperty(
- isolate->global_object(), foo_string).ToHandleChecked();
+ Handle<Object> fun1 =
+ JSReceiver::GetProperty(isolate, isolate->global_object(), "foo")
+ .ToHandleChecked();
CHECK(fun1->IsJSFunction());
Handle<Object> argv[] = {isolate->factory()->InternalizeOneByteString(
@@ -328,7 +327,10 @@
TEST(FeedbackVectorUnaffectedByScopeChanges) {
- if (i::FLAG_always_opt || !i::FLAG_lazy) return;
+ if (i::FLAG_always_opt || !i::FLAG_lazy ||
+ (FLAG_ignition && FLAG_ignition_eager)) {
+ return;
+ }
CcTest::InitializeVM();
v8::HandleScope scope(CcTest::isolate());
v8::Local<v8::Context> context = CcTest::isolate()->GetCurrentContext();
@@ -350,7 +352,8 @@
->Get(context, v8_str("morphing_call"))
.ToLocalChecked())));
- // Not compiled, and so no feedback vector allocated yet.
+ // If we are compiling lazily then it should not be compiled, and so no
+ // feedback vector allocated yet.
CHECK(!f->shared()->is_compiled());
CHECK(f->shared()->feedback_vector()->is_empty());