Merge r2568 to branches/1.2.

src/execution.cc

Index: src/execution.cc
===================================================================
--- src/execution.cc	(revision 2567)
+++ src/execution.cc	(working copy)
@@ -592,14 +592,14 @@
     ASSERT(!it.done());
     Object* fun = it.frame()->function();
     if (fun && fun->IsJSFunction()) {
-      GlobalObject* global = JSFunction::cast(fun)->context()->global();
       // Don't stop in builtin functions.
-      if (global == Top::context()->builtins()) {
-       return Heap::undefined_value();
+      if (JSFunction::cast(fun)->IsBuiltin()) {
+        return Heap::undefined_value();
       }
+      GlobalObject* global = JSFunction::cast(fun)->context()->global();
       // Don't stop in debugger functions.
       if (Debug::IsDebugGlobal(global)) {
-       return Heap::undefined_value();
+        return Heap::undefined_value();
       }
     }
   }