Revision: 2746 Author: [email protected] Date: Mon Aug 24 09:08:44 2009 Log: Revert change 2745 because of assertion failures in debug mode.
[email protected] Review URL: http://codereview.chromium.org/173268 http://code.google.com/p/v8/source/detail?r=2746 Deleted: /branches/bleeding_edge/test/mjsunit/debug-stepin-call-function-stub.js Modified: /branches/bleeding_edge/src/debug.cc /branches/bleeding_edge/src/x64/codegen-x64.cc /branches/bleeding_edge/test/mjsunit/debug-step-stub-callfunction.js /branches/bleeding_edge/test/mjsunit/mjsunit.status ======================================= --- /branches/bleeding_edge/test/mjsunit/debug-stepin-call-function-stub.js Mon Aug 24 08:21:49 2009 +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright 2009 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 = 0; -var expected_function_name = null; -var expected_source_line_text = null; -var expected_caller_source_line = null; -var step_in_count = 2; - -// Simple debug event handler which first time will cause 'step in' action -// to get into g.call and than check that execution is pauesed inside -// function 'g'. -function listener(event, exec_state, event_data, data) { - try { - if (event == Debug.DebugEvent.Break) { - if (state == 0) { - // Step into f(). - exec_state.prepareStep(Debug.StepAction.StepIn, step_in_count); - state = 2; - } else if (state == 2) { - assertEquals(expected_source_line_text, - event_data.sourceLineText()); - assertEquals(expected_function_name, event_data.func().name()); - state = 3; - } - } - } catch(e) { - exception = e; - } -}; - -// Add the debug event listener. -Debug.setListener(listener); - - -function g() { - return "s"; // expected line -} - -function testFunction() { - var f = g; - var s = 1 +f(10); -} - -function g2() { - return "s2"; // expected line -} - -function testFunction2() { - var f = g2; - var s = 1 +f(10, 20); -} - -// Run twice: first time function will be compiled lazily, second time -// cached version will be used. -for (var i = 0; i < 2; i++) { - state = 0; - expected_function_name = 'g'; - expected_source_line_text = ' return "s"; // expected line'; - step_in_count = 2; - // Set a break point and call to invoke the debug event listener. - Debug.setBreakPoint(testFunction, 1, 0); - testFunction(); - assertNull(exception); - assertEquals(3, state); -} - -// Test stepping into function call when a breakpoint is set at the place -// of call. Use different pair of functions so that g2 is compiled lazily. -// Run twice: first time function will be compiled lazily, second time -// cached version will be used. -for (var i = 0; i < 2; i++) { - state = 0; - expected_function_name = 'g2'; - expected_source_line_text = ' return "s2"; // expected line'; - step_in_count = 1; - // Set a break point and call to invoke the debug event listener. - Debug.setBreakPoint(testFunction2, 2, 0); - testFunction2(); - assertNull(exception); - assertEquals(3, state); -} - - -// Get rid of the debug event listener. -Debug.setListener(null); ======================================= --- /branches/bleeding_edge/src/debug.cc Mon Aug 24 08:21:49 2009 +++ /branches/bleeding_edge/src/debug.cc Mon Aug 24 09:08:44 2009 @@ -317,10 +317,10 @@ void BreakLocationIterator::PrepareStepIn() { HandleScope scope; - // Step in can only be prepared if currently positioned on an IC call, - // construct call or CallFunction stub call. + // Step in can only be prepared if currently positioned on an IC call or + // construct call. Address target = rinfo()->target_address(); - Handle<Code> code(Code::GetCodeFromTargetAddress(target)); + Code* code = Code::GetCodeFromTargetAddress(target); if (code->is_call_stub()) { // Step in through IC call is handled by the runtime system. Therefore make // sure that the any current IC is cleared and the runtime system is @@ -334,27 +334,11 @@ rinfo()->set_target_address(stub->entry()); } } else { -#ifdef DEBUG - Handle<Code> maybe_call_function_stub = code; - if (IsDebugBreak()) { - Address original_target = original_rinfo()->target_address(); - maybe_call_function_stub = - Handle<Code>(Code::GetCodeFromTargetAddress(original_target)); - } - bool is_call_function_stub = - (maybe_call_function_stub->kind() == Code::STUB && - maybe_call_function_stub->major_key() == CodeStub::CallFunction); - // Step in through construct call requires no changes to the running code. // Step in through getters/setters should already be prepared as well // because caller of this function (Debug::PrepareStep) is expected to // flood the top frame's function with one shot breakpoints. - // Step in through CallFunction stub should also be prepared by caller of - // this function (Debug::PrepareStep) which should flood target function - // with breakpoints. - ASSERT(RelocInfo::IsConstructCall(rmode()) || code->is_inline_cache_stub() - || is_call_function_stub); -#endif + ASSERT(RelocInfo::IsConstructCall(rmode()) || code->is_inline_cache_stub()); } } @@ -1108,7 +1092,6 @@ bool is_call_target = false; bool is_load_or_store = false; bool is_inline_cache_stub = false; - Handle<Code> call_function_stub; if (RelocInfo::IsCodeTarget(it.rinfo()->rmode())) { Address target = it.rinfo()->target_address(); Code* code = Code::GetCodeFromTargetAddress(target); @@ -1119,22 +1102,6 @@ is_inline_cache_stub = true; is_load_or_store = !is_call_target; } - - // Check if target code is CallFunction stub. - Code* maybe_call_function_stub = code; - // If there is a breakpoint at this line look at the original code to - // check if it is a CallFunction stub. - if (it.IsDebugBreak()) { - Address original_target = it.original_rinfo()->target_address(); - maybe_call_function_stub = - Code::GetCodeFromTargetAddress(original_target); - } - if (maybe_call_function_stub->kind() == Code::STUB && - maybe_call_function_stub->major_key() == CodeStub::CallFunction) { - // Save reference to the code as we may need it to find out arguments - // count for 'step in' later. - call_function_stub = Handle<Code>(maybe_call_function_stub); - } } // If this is the last break code target step out is the only possibility. @@ -1147,8 +1114,7 @@ JSFunction* function = JSFunction::cast(frames_it.frame()->function()); FloodWithOneShot(Handle<SharedFunctionInfo>(function->shared())); } - } else if (!(is_inline_cache_stub || RelocInfo::IsConstructCall(it.rmode()) || - !call_function_stub.is_null()) + } else if (!(is_inline_cache_stub || RelocInfo::IsConstructCall(it.rmode())) || step_action == StepNext || step_action == StepMin) { // Step next or step min. @@ -1160,43 +1126,6 @@ debug_info->code()->SourceStatementPosition(frame->pc()); thread_local_.last_fp_ = frame->fp(); } else { - // If it's CallFunction stub ensure target function is compiled and flood - // it with one shot breakpoints. - if (!call_function_stub.is_null()) { - // Find out number of arguments from the stub minor key. - // Reverse lookup required as the minor key cannot be retrieved - // from the code object. - Handle<Object> obj( - Heap::code_stubs()->SlowReverseLookup(*call_function_stub)); - ASSERT(*obj != Heap::undefined_value()); - ASSERT(obj->IsSmi()); - // Get the STUB key and extract major and minor key. - uint32_t key = Smi::cast(*obj)->value(); - int call_function_arg_count = CodeStub::MinorKeyFromKey(key); - ASSERT(call_function_stub->major_key() == - CodeStub::MajorKeyFromKey(key)); - - // Find target function on the expression stack. - // Expression stack lools like this (top to bottom): - // argN - // ... - // arg0 - // Receiver - // Function to call - int expressions_count = frame->ComputeExpressionsCount(); - ASSERT(expressions_count - 2 - call_function_arg_count >= 0); - Object* fun = frame->GetExpression( - expressions_count - 2 - call_function_arg_count); - if (fun->IsJSFunction()) { - Handle<JSFunction> js_function(JSFunction::cast(fun)); - // Don't step into builtins. - if (!js_function->IsBuiltin()) { - // It will also compile target function if it's not compiled yet. - FloodWithOneShot(Handle<SharedFunctionInfo>(js_function->shared())); - } - } - } - // Fill the current function with one-shot break points even for step in on // a call target as the function called might be a native function for // which step in will not stop. It also prepares for stepping in ======================================= --- /branches/bleeding_edge/src/x64/codegen-x64.cc Mon Aug 24 04:56:29 2009 +++ /branches/bleeding_edge/src/x64/codegen-x64.cc Mon Aug 24 09:08:44 2009 @@ -4586,7 +4586,7 @@ : RelocInfo::CODE_TARGET_CONTEXT; Result answer = frame_->CallLoadIC(mode); // A test rax instruction following the call signals that the inobject - // property case was inlined. Ensure that there is not a test eax + // property case was inlined. Ensure that there is not a test rax // instruction here. masm_->nop(); // Discard the global object. The result is in answer. ======================================= --- /branches/bleeding_edge/test/mjsunit/debug-step-stub-callfunction.js Mon Aug 24 08:21:49 2009 +++ /branches/bleeding_edge/test/mjsunit/debug-step-stub-callfunction.js Mon Aug 24 09:08:44 2009 @@ -54,7 +54,7 @@ break_break_point_hit_count = 0; f(); -assertEquals(6, break_break_point_hit_count); +assertEquals(5, break_break_point_hit_count); // Use an inner function to ensure that the function call is through CodeStub // CallFunction see Ia32CodeGenerator::VisitCall and @@ -67,7 +67,7 @@ break_break_point_hit_count = 0; g(); -assertEquals(5, break_break_point_hit_count); +assertEquals(4, break_break_point_hit_count); // Get rid of the debug event listener. Debug.setListener(null); ======================================= --- /branches/bleeding_edge/test/mjsunit/mjsunit.status Mon Aug 24 08:21:49 2009 +++ /branches/bleeding_edge/test/mjsunit/mjsunit.status Mon Aug 24 09:08:44 2009 @@ -60,7 +60,6 @@ debug-step-stub-callfunction: SKIP debug-stepin-accessor: CRASH || FAIL debug-stepin-builtin: CRASH || FAIL -debug-stepin-call-function-stub: 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 -~----------~----~----~----~------~----~------~--~---
