Revision: 2576
Author: [email protected]
Date: Wed Jul 29 05:04:55 2009
Log: Merge r2568, r2573, and r2575 to branches/1.2.
Review URL: http://codereview.chromium.org/159582
http://code.google.com/p/v8/source/detail?r=2576
Added:
/branches/1.2/test/mjsunit/debug-stepin-builtin.js
Modified:
/branches/1.2/src/debug.cc
/branches/1.2/src/execution.cc
/branches/1.2/src/objects-inl.h
/branches/1.2/src/objects.h
/branches/1.2/src/version.cc
/branches/1.2/test/mjsunit/mjsunit.status
=======================================
--- /dev/null
+++ /branches/1.2/test/mjsunit/debug-stepin-builtin.js Wed Jul 29 05:04:55
2009
@@ -0,0 +1,78 @@
+// Copyright 2008 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Flags: --expose-debug-as debug
+
+// Get the Debug object exposed from the debug context global object.
+Debug = debug.Debug
+
+var exception = null;
+var state = 1;
+var expected_source_line_text = null;
+var expected_function_name = null;
+
+// Simple debug event handler which first time will cause 'step in' action
+// and than check that execution is paused inside function
+// expected_function_name.
+function listener(event, exec_state, event_data, data) {
+ try {
+ if (event == Debug.DebugEvent.Break) {
+ if (state == 1) {
+ exec_state.prepareStep(Debug.StepAction.StepIn, 2);
+ state = 2;
+ } else if (state == 2) {
+ assertEquals(expected_function_name, event_data.func().name());
+ assertEquals(expected_source_line_text,
+ event_data.sourceLineText());
+ state = 3;
+ }
+ }
+ } catch(e) {
+ exception = e;
+ }
+};
+
+// Add the debug event listener.
+Debug.setListener(listener);
+
+var a = [1,2,3,4,5];
+
+// Test step into function call from a function without local variables.
+function testStepInArraySlice() {
+ expected_function_name = 'testStepInArraySlice';
+ expected_source_line_text = '} // expected line';
+ debugger;
+ var s = Array.prototype.slice.call(a, 2,3);
+} // expected line
+
+state = 1;
+testStepInArraySlice();
+assertNull(exception);
+assertEquals(3, state);
+
+// Get rid of the debug event listener.
+Debug.setListener(null);
=======================================
--- /branches/1.2/src/debug.cc Tue Jul 28 01:37:22 2009
+++ /branches/1.2/src/debug.cc Wed Jul 29 05:04:55 2009
@@ -1301,7 +1301,7 @@
// 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() ==
@@ -1310,7 +1310,8 @@
// function to be called and not the code for
Builtins::FunctionApply or
// Builtins::FunctionCall. The receiver of call/apply is the target
// function.
- if (!holder.is_null() && holder->IsJSFunction()) {
+ if (!holder.is_null() && holder->IsJSFunction() &&
+ !JSFunction::cast(*holder)->IsBuiltin()) {
Handle<SharedFunctionInfo> shared_info(
JSFunction::cast(*holder)->shared());
Debug::FloodWithOneShot(shared_info);
=======================================
--- /branches/1.2/src/execution.cc Tue Jul 28 01:37:22 2009
+++ /branches/1.2/src/execution.cc Wed Jul 29 05:04:55 2009
@@ -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();
}
}
}
=======================================
--- /branches/1.2/src/objects-inl.h Tue Jul 28 04:43:17 2009
+++ /branches/1.2/src/objects-inl.h Wed Jul 29 05:04:55 2009
@@ -2339,6 +2339,11 @@
bool JSFunction::IsBoilerplate() {
return map() == Heap::boilerplate_function_map();
}
+
+
+bool JSFunction::IsBuiltin() {
+ return context()->global()->IsJSBuiltinsObject();
+}
bool JSObject::IsLoaded() {
=======================================
--- /branches/1.2/src/objects.h Wed Jul 29 01:22:06 2009
+++ /branches/1.2/src/objects.h Wed Jul 29 05:04:55 2009
@@ -3167,6 +3167,9 @@
// 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
=======================================
--- /branches/1.2/src/version.cc Wed Jul 29 01:22:06 2009
+++ /branches/1.2/src/version.cc Wed Jul 29 05:04:55 2009
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 1
#define MINOR_VERSION 2
#define BUILD_NUMBER 14
-#define PATCH_LEVEL 12
+#define PATCH_LEVEL 13
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
=======================================
--- /branches/1.2/test/mjsunit/mjsunit.status Tue Jul 28 01:37:22 2009
+++ /branches/1.2/test/mjsunit/mjsunit.status Wed Jul 29 05:04:55 2009
@@ -59,6 +59,7 @@
debug-setbreakpoint: CRASH || FAIL || PASS
debug-step-stub-callfunction: SKIP
debug-stepin-accessor: CRASH || FAIL
+debug-stepin-builtin: CRASH || FAIL
debug-stepin-constructor: CRASH, FAIL
debug-stepin-function-call: CRASH || FAIL
debug-step: SKIP
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
