Don't step in function.call/apply if the function is builtin one.
Chromium bug: http://code.google.com/p/chromium/issues/detail?id=17886 Review URL: http://codereview.chromium.org/159508 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@2568 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
8a82d61722
commit
cda6146266
@ -1310,7 +1310,9 @@ void Debug::HandleStepIn(Handle<JSFunction> function,
|
||||
// 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)->context()->global() !=
|
||||
Top::context()->builtins()) {
|
||||
Handle<SharedFunctionInfo> shared_info(
|
||||
JSFunction::cast(*holder)->shared());
|
||||
Debug::FloodWithOneShot(shared_info);
|
||||
|
78
test/mjsunit/debug-stepin-builtin.js
Normal file
78
test/mjsunit/debug-stepin-builtin.js
Normal file
@ -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);
|
@ -59,6 +59,7 @@ debug-multiple-breakpoints: CRASH || FAIL
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user