Index: src/runtime.cc |
=================================================================== |
--- src/runtime.cc (revision 1738) |
+++ src/runtime.cc (working copy) |
@@ -4159,10 +4159,12 @@ |
JSFunction* function = JSFunction::cast(constructor); |
// Handle stepping into constructors if step into is active. |
+#ifdef ENABLE_DEBUGGER_SUPPORT |
if (Debug::StepInActive()) { |
HandleScope scope; |
Debug::HandleStepIn(Handle<JSFunction>(function), 0, true); |
} |
+#endif |
if (function->has_initial_map() && |
function->initial_map()->instance_type() == JS_FUNCTION_TYPE) { |
@@ -4526,12 +4528,6 @@ |
} |
-static Object* Runtime_DebugBreak(Arguments args) { |
- ASSERT(args.length() == 0); |
- return Execution::DebugBreakHelper(); |
-} |
- |
- |
static Object* Runtime_StackGuard(Arguments args) { |
ASSERT(args.length() == 1); |
@@ -5317,6 +5313,13 @@ |
} |
+#ifdef ENABLE_DEBUGGER_SUPPORT |
+static Object* Runtime_DebugBreak(Arguments args) { |
+ ASSERT(args.length() == 0); |
+ return Execution::DebugBreakHelper(); |
+} |
+ |
+ |
// Helper functions for wrapping and unwrapping stack frame ids. |
static Smi* WrapFrameId(StackFrame::Id id) { |
ASSERT(IsAligned(OffsetFrom(id), 4)); |
@@ -6797,6 +6800,21 @@ |
} |
+static Object* Runtime_FunctionGetAssemblerCode(Arguments args) { |
+#ifdef DEBUG |
+ HandleScope scope; |
+ ASSERT(args.length() == 1); |
+ // Get the function and make sure it is compiled. |
+ CONVERT_ARG_CHECKED(JSFunction, func, 0); |
+ if (!func->is_compiled() && !CompileLazy(func, KEEP_EXCEPTION)) { |
+ return Failure::Exception(); |
+ } |
+ func->code()->PrintLn(); |
+#endif // DEBUG |
+ return Heap::undefined_value(); |
+} |
+#endif // ENABLE_DEBUGGER_SUPPORT |
+ |
// Finds the script object from the script data. NOTE: This operation uses |
// heap traversal to find the function generated for the source position |
// for the requested break point. For lazily compiled functions several heap |
@@ -6846,21 +6864,6 @@ |
} |
-static Object* Runtime_FunctionGetAssemblerCode(Arguments args) { |
-#ifdef DEBUG |
- HandleScope scope; |
- ASSERT(args.length() == 1); |
- // Get the function and make sure it is compiled. |
- CONVERT_ARG_CHECKED(JSFunction, func, 0); |
- if (!func->is_compiled() && !CompileLazy(func, KEEP_EXCEPTION)) { |
- return Failure::Exception(); |
- } |
- func->code()->PrintLn(); |
-#endif // DEBUG |
- return Heap::undefined_value(); |
-} |
- |
- |
static Object* Runtime_Abort(Arguments args) { |
ASSERT(args.length() == 2); |
OS::PrintError("abort: %s\n", reinterpret_cast<char*>(args[0]) + |