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/contexts.cc b/src/contexts.cc
index 79a9e92..7549d20 100644
--- a/src/contexts.cc
+++ b/src/contexts.cc
@@ -79,6 +79,15 @@
return current;
}
+Context* Context::closure_context() {
+ Context* current = this;
+ while (!current->IsFunctionContext() && !current->IsScriptContext() &&
+ !current->IsNativeContext()) {
+ current = current->previous();
+ DCHECK(current->closure() == closure());
+ }
+ return current;
+}
JSObject* Context::extension_object() {
DCHECK(IsNativeContext() || IsFunctionContext() || IsBlockContext());
@@ -542,16 +551,6 @@
#undef COMPARE_NAME
-bool Context::IsJSBuiltin(Handle<Context> native_context,
- Handle<JSFunction> function) {
-#define COMPARE_FUNCTION(index, type, name) \
- if (*function == native_context->get(index)) return true;
- NATIVE_CONTEXT_JS_BUILTINS(COMPARE_FUNCTION);
-#undef COMPARE_FUNCTION
- return false;
-}
-
-
#ifdef DEBUG
bool Context::IsBootstrappingOrNativeContext(Isolate* isolate, Object* object) {