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/debug/debug-scopes.cc b/src/debug/debug-scopes.cc
index 15a0594..e785384 100644
--- a/src/debug/debug-scopes.cc
+++ b/src/debug/debug-scopes.cc
@@ -28,7 +28,7 @@
return;
}
- context_ = Handle<Context>(Context::cast(frame_inspector->GetContext()));
+ context_ = Handle<Context>::cast(frame_inspector->GetContext());
// Catch the case when the debugger stops in an internal function.
Handle<JSFunction> function = GetFunction();
@@ -58,12 +58,8 @@
// return, which requires a debug info to be available.
Handle<DebugInfo> debug_info(shared_info->GetDebugInfo());
- // PC points to the instruction after the current one, possibly a break
- // location as well. So the "- 1" to exclude it from the search.
- Address call_pc = GetFrame()->pc() - 1;
-
// Find the break point where execution has stopped.
- BreakLocation location = BreakLocation::FromAddress(debug_info, call_pc);
+ BreakLocation location = BreakLocation::FromFrame(debug_info, GetFrame());
ignore_nested_scopes = location.IsReturn();
}
@@ -462,7 +458,8 @@
isolate_->factory()->NewJSObject(isolate_->object_function());
frame_inspector_->MaterializeStackLocals(local_scope, function);
- Handle<Context> frame_context(Context::cast(frame_inspector_->GetContext()));
+ Handle<Context> frame_context =
+ Handle<Context>::cast(frame_inspector_->GetContext());
HandleScope scope(isolate_);
Handle<SharedFunctionInfo> shared(function->shared());
@@ -471,7 +468,7 @@
if (!scope_info->HasContext()) return local_scope;
// Third fill all context locals.
- Handle<Context> function_context(frame_context->declaration_context());
+ Handle<Context> function_context(frame_context->closure_context());
CopyContextLocalsToScopeObject(scope_info, function_context, local_scope);
// Finally copy any properties from the function context extension.
@@ -480,8 +477,8 @@
function_context->has_extension() &&
!function_context->IsNativeContext()) {
bool success = CopyContextExtensionToScopeObject(
- handle(function_context->extension_object(), isolate_),
- local_scope, JSReceiver::INCLUDE_PROTOS);
+ handle(function_context->extension_object(), isolate_), local_scope,
+ INCLUDE_PROTOS);
if (!success) return MaybeHandle<JSObject>();
}
@@ -510,8 +507,7 @@
// be variables introduced by eval.
if (context->has_extension()) {
bool success = CopyContextExtensionToScopeObject(
- handle(context->extension_object(), isolate_), closure_scope,
- JSReceiver::OWN_ONLY);
+ handle(context->extension_object(), isolate_), closure_scope, OWN_ONLY);
DCHECK(success);
USE(success);
}
@@ -559,8 +555,7 @@
// Fill all extension variables.
if (context->extension_object() != nullptr) {
bool success = CopyContextExtensionToScopeObject(
- handle(context->extension_object()), block_scope,
- JSReceiver::OWN_ONLY);
+ handle(context->extension_object()), block_scope, OWN_ONLY);
DCHECK(success);
USE(success);
}
@@ -798,10 +793,9 @@
}
}
-
bool ScopeIterator::CopyContextExtensionToScopeObject(
Handle<JSObject> extension, Handle<JSObject> scope_object,
- JSReceiver::KeyCollectionType type) {
+ KeyCollectionType type) {
Handle<FixedArray> keys;
ASSIGN_RETURN_ON_EXCEPTION_VALUE(
isolate_, keys, JSReceiver::GetKeys(extension, type, ENUMERABLE_STRINGS),