Change the check for builtin functions to not be based on identity,

which seems shaky in the presence of multiple builtin objects.
Review URL: http://codereview.chromium.org/159583

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@2573 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/debug.cc b/src/debug.cc
index be18cbffd94e69ee695319d4d9824985079ab92e..18536f5c7a9fe6cba3403d4cf98546db41c4143e 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -1301,7 +1301,7 @@ void Debug::HandleStepIn(Handle<JSFunction> function,
   // step into was requested.
   if (fp == Debug::step_in_fp()) {
     // Don't allow step into functions in the native context.
-    if (function->context()->global() != Top::context()->builtins()) {
+    if (!function->IsBuiltin()) {
       if (function->shared()->code() ==
           Builtins::builtin(Builtins::FunctionApply) ||
           function->shared()->code() ==
@@ -1311,8 +1311,7 @@ void Debug::HandleStepIn(Handle<JSFunction> function,
         // Builtins::FunctionCall. The receiver of call/apply is the target
         // function.
         if (!holder.is_null() && holder->IsJSFunction() &&
-            JSFunction::cast(*holder)->context()->global() !=
-            Top::context()->builtins()) {
+            !JSFunction::cast(*holder)->IsBuiltin()) {
           Handle<SharedFunctionInfo> shared_info(
               JSFunction::cast(*holder)->shared());
           Debug::FloodWithOneShot(shared_info);

diff --git a/src/objects-inl.h b/src/objects-inl.h
index 0b5e073405692e52692bb56acc97c2e8e70e5bb6..b000dcf73fc817015b11a425cdc5e38e8b0a0efb 100644 (file)
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -2341,6 +2341,11 @@ bool JSFunction::IsBoilerplate() {
 }
 
 
+bool JSFunction::IsBuiltin() {
+  return context()->global()->IsJSBuiltinsObject();
+}
+
+
 bool JSObject::IsLoaded() {
   return !map()->needs_loading();
 }

diff --git a/src/objects.h b/src/objects.h
index 64e6b36c55397c6d0d9e7cc98a9d5148c318b359..7c30517e8eed5c67c1cd76b2f757981af938d0b3 100644 (file)
--- a/src/objects.h
+++ b/src/objects.h
@@ -3175,6 +3175,9 @@ class JSFunction: public JSObject {
   // function.
   inline bool IsBoilerplate();
 
+  // Tells whether this function is builtin.
+  inline bool IsBuiltin();
+
   // [literals]: Fixed array holding the materialized literals.
   //
   // If the function contains object, regexp or array literals, the