Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/src/execution.cc b/src/execution.cc
index d4efb76..e6a569f 100644
--- a/src/execution.cc
+++ b/src/execution.cc
@@ -144,8 +144,8 @@
if (receiver->IsUndefined() || receiver->IsNull()) {
receiver = handle(function->global_proxy(), isolate);
} else {
- ASSIGN_RETURN_ON_EXCEPTION(
- isolate, receiver, Execution::ToObject(isolate, receiver), Object);
+ ASSIGN_RETURN_ON_EXCEPTION(isolate, receiver,
+ Object::ToObject(isolate, receiver), Object);
}
}
DCHECK(function->context()->global_object()->IsJSGlobalObject());
@@ -421,18 +421,6 @@
// --- C a l l s t o n a t i v e s ---
-MaybeHandle<JSReceiver> Execution::ToObject(Isolate* isolate,
- Handle<Object> obj) {
- Handle<JSReceiver> receiver;
- if (JSReceiver::ToObject(isolate, obj).ToHandle(&receiver)) {
- return receiver;
- }
- THROW_NEW_ERROR(isolate,
- NewTypeError(MessageTemplate::kUndefinedOrNullToObject),
- JSReceiver);
-}
-
-
Handle<String> Execution::GetStackTraceLine(Handle<Object> recv,
Handle<JSFunction> fun,
Handle<Object> pos,
@@ -492,7 +480,7 @@
isolate_->counters()->stack_interrupts()->Increment();
isolate_->counters()->runtime_profiler_ticks()->Increment();
- isolate_->runtime_profiler()->OptimizeNow();
+ isolate_->runtime_profiler()->MarkCandidatesForOptimization();
return isolate_->heap()->undefined_value();
}