Skip to content

V
V8
Commit 63f35c26 authored by kozyatinskiy's avatar kozyatinskiy Committed by Commit bot
Browse files
Options

[debugger] Removed unused GetStepInPositions method 

This method was added as part of DevTools experiment.
Experiment UI was removed in https://codereview.chromium.org/201293007 2 years ago.
Experiment backend was removed in https://codereview.chromium.org/1785533002/.

R=yangguo@chromium.org
LOG=N

Review URL: https://codereview.chromium.org/1770383006

Cr-Commit-Position: refs/heads/master@{#34688}
parent 4566531c
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 344 deletions
src/debug/debug.cc
View file @ 63f35c26
......@@ -271,21 +271,6 @@ BreakLocation BreakLocation::FromFrame(Handle<DebugInfo> debug_info,
return FromCodeOffset(debug_info, call_offset);
}
// Find the break point at the supplied address, or the closest one before
// the address.
void BreakLocation::FromCodeOffsetSameStatement(
Handle<DebugInfo> debug_info, int offset, List<BreakLocation>* result_out) {
int break_index = BreakIndexFromCodeOffset(debug_info, offset);
base::SmartPointer<Iterator> it(GetIterator(debug_info));
it->SkipTo(break_index);
int statement_position = it->statement_position();
while (!it->Done() && it->statement_position() == statement_position) {
result_out->Add(it->GetBreakLocation());
it->Next();
}
}
void BreakLocation::AllForStatementPosition(Handle<DebugInfo> debug_info,
int statement_position,
List<BreakLocation>* result_out) {
......@@ -1668,45 +1653,6 @@ Handle<FixedArray> Debug::GetLoadedScripts() {
}
void Debug::GetStepinPositions(JavaScriptFrame* frame, StackFrame::Id frame_id,
List<int>* results_out) {
FrameSummary summary = GetFirstFrameSummary(frame);
Handle<JSFunction> fun = Handle<JSFunction>(summary.function());
Handle<SharedFunctionInfo> shared = Handle<SharedFunctionInfo>(fun->shared());
if (!EnsureDebugInfo(shared, fun)) return;
Handle<DebugInfo> debug_info(shared->GetDebugInfo());
// Refresh frame summary if the code has been recompiled for debugging.
if (AbstractCode::cast(shared->code()) != *summary.abstract_code()) {
summary = GetFirstFrameSummary(frame);
}
int call_offset =
CallOffsetFromCodeOffset(summary.code_offset(), frame->is_interpreted());
List<BreakLocation> locations;
BreakLocation::FromCodeOffsetSameStatement(debug_info, call_offset,
&locations);
for (BreakLocation location : locations) {
if (location.code_offset() <= summary.code_offset()) {
// The break point is near our pc. Could be a step-in possibility,
// that is currently taken by active debugger call.
if (break_frame_id() == StackFrame::NO_ID) {
continue; // We are not stepping.
} else {
JavaScriptFrameIterator frame_it(isolate_, break_frame_id());
// If our frame is a top frame and we are stepping, we can do step-in
// at this place.
if (frame_it.frame()->id() != frame_id) continue;
}
}
if (location.IsCall()) results_out->Add(location.position());
}
}
void Debug::RecordEvalCaller(Handle<Script> script) {
script->set_compilation_type(Script::COMPILATION_TYPE_EVAL);
// For eval scripts add information on the function from which eval was
......
src/debug/debug.h
View file @ 63f35c26
......@@ -70,10 +70,6 @@ class BreakLocation {
static BreakLocation FromFrame(Handle<DebugInfo> debug_info,
JavaScriptFrame* frame);
static void FromCodeOffsetSameStatement(Handle<DebugInfo> debug_info,
int offset,
List<BreakLocation>* result_out);
static void AllForStatementPosition(Handle<DebugInfo> debug_info,
int statement_position,
List<BreakLocation>* result_out);
......@@ -460,9 +456,6 @@ class Debug {
void ClearStepOut();
void EnableStepIn();
void GetStepinPositions(JavaScriptFrame* frame, StackFrame::Id frame_id,
List<int>* results_out);
bool PrepareFunctionForBreakPoints(Handle<SharedFunctionInfo> shared);
// Returns whether the operation succeeded. Compilation can only be triggered
......
src/debug/mirrors.js
View file @ 63f35c26
......@@ -1801,11 +1801,6 @@ FrameDetails.prototype.scopeCount = function() {
};
FrameDetails.prototype.stepInPositionsImpl = function() {
return %GetStepInPositions(this.break_id_, this.frameId());
};
/**
* Mirror object for stack frames.
* @param {number} break_id The break id in the VM for which this frame is
......@@ -1985,29 +1980,6 @@ FrameMirror.prototype.allScopes = function(opt_ignore_nested_scopes) {
};
FrameMirror.prototype.stepInPositions = function() {
var script = this.func().script();
var funcOffset = this.func().sourcePosition_();
var stepInRaw = this.details_.stepInPositionsImpl();
var result = [];
if (stepInRaw) {
for (var i = 0; i < stepInRaw.length; i++) {
var posStruct = {};
var offset = script.locationFromPosition(funcOffset + stepInRaw[i],
true);
serializeLocationFields(offset, posStruct);
var item = {
position: posStruct
};
result.push(item);
}
}
return result;
};
FrameMirror.prototype.evaluate = function(source, disable_break,
opt_context_object) {
return MakeMirror(%DebugEvaluate(this.break_id_,
......
src/runtime/runtime-debug.cc
View file @ 63f35c26
......@@ -740,33 +740,6 @@ RUNTIME_FUNCTION(Runtime_GetScopeCount) {
}
// Returns the list of step-in positions (text offset) in a function of the
// stack frame in a range from the current debug break position to the end
// of the corresponding statement.
RUNTIME_FUNCTION(Runtime_GetStepInPositions) {
HandleScope scope(isolate);
DCHECK(args.length() == 2);
CONVERT_NUMBER_CHECKED(int, break_id, Int32, args[0]);
RUNTIME_ASSERT(isolate->debug()->CheckExecutionState(break_id));
CONVERT_SMI_ARG_CHECKED(wrapped_id, 1);
// Get the frame where the debugging is performed.
StackFrame::Id id = DebugFrameHelper::UnwrapFrameId(wrapped_id);
JavaScriptFrameIterator frame_it(isolate, id);
RUNTIME_ASSERT(!frame_it.done());
List<int> positions;
isolate->debug()->GetStepinPositions(frame_it.frame(), id, &positions);
Factory* factory = isolate->factory();
Handle<FixedArray> array = factory->NewFixedArray(positions.length());
for (int i = 0; i < positions.length(); ++i) {
array->set(i, Smi::FromInt(positions[i]));
}
return *factory->NewJSArrayWithElements(array, FAST_SMI_ELEMENTS);
}
// Return an array with scope details
// args[0]: number: break id
// args[1]: number: frame index
......
src/runtime/runtime.h
View file @ 63f35c26
......@@ -156,7 +156,6 @@ namespace internal {
F(GetFrameCount, 1, 1) \
F(GetFrameDetails, 2, 1) \
F(GetScopeCount, 2, 1) \
F(GetStepInPositions, 2, 1) \
F(GetScopeDetails, 4, 1) \
F(GetAllScopesDetails, 4, 1) \
F(GetFunctionScopeCount, 1, 1) \
......
test/mjsunit/debug-stepin-positions.js deleted 100644 → 0
View file @ 4566531c
// 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 --nocrankshaft
// Get the Debug object exposed from the debug context global object.
Debug = debug.Debug
function DebuggerStatement() {
debugger; /*pause*/
}
function TestCase(fun, frame_number, line_number) {
var exception = false;
var codeSnippet = undefined;
var resultPositions = undefined;
var step = 0;
function listener(event, exec_state, event_data, data) {
try {
if (event == Debug.DebugEvent.Break ||
event == Debug.DebugEvent.Exception) {
if (step++ > 0) return;
assertHasLineMark(/pause/, exec_state.frame(0));
assertHasLineMark(/positions/, exec_state.frame(frame_number));
var frame = exec_state.frame(frame_number);
codeSnippet = frame.sourceLineText();
resultPositions = frame.stepInPositions();
}
} catch (e) {
exception = e
}
function assertHasLineMark(mark, frame) {
var line = frame.sourceLineText();
if (!mark.exec(frame.sourceLineText())) {
throw new Error("Line " + line + " should contain mark " + mark);
}
}
}
Debug.setListener(listener);
var breakpointId;
if (line_number) breakpointId = Debug.setBreakPoint(fun, line_number);
fun();
if (line_number) Debug.clearBreakPoint(breakpointId);
Debug.setListener(null);
assertTrue(!exception, exception);
var expectedPositions = {};
var markPattern = new RegExp("/\\*#\\*/", "g");
var matchResult;
while ( (matchResult = markPattern.exec(codeSnippet)) ) {
expectedPositions[matchResult.index] = true;
}
print(codeSnippet);
var decoratedResult = codeSnippet;
function replaceStringRange(s, pos, substitute) {
return s.substring(0, pos) + substitute +
s.substring(pos + substitute.length);
}
var markLength = 5;
var unexpectedPositionFound = false;
for (var i = 0; i < resultPositions.length; i++) {
var col = resultPositions[i].position.column - markLength;
if (expectedPositions[col]) {
delete expectedPositions[col];
decoratedResult = replaceStringRange(decoratedResult, col, "*YES*");
} else {
decoratedResult = replaceStringRange(decoratedResult, col, "!BAD!");
unexpectedPositionFound = true;
}
}
print(decoratedResult);
for (var n in expectedPositions) {
assertTrue(false, "Some positions are not reported: " + decoratedResult);
break;
}
assertFalse(unexpectedPositionFound, "Found unexpected position: " +
decoratedResult);
}
function TestCaseWithDebugger(fun) {
TestCase(fun, 1);
}
function TestCaseWithBreakpoint(fun, line_number, frame_number) {
TestCase(fun, frame_number, line_number);
}
function TestCaseWithException(fun, frame_number) {
Debug.setBreakOnException();
TestCase(fun, frame_number);
Debug.clearBreakOnException();
}
// Test cases.
// Step in position, when the function call that we are standing at is already
// being executed.
var fun = function() {
function g(p) {
throw String(p); /*pause*/
}
try {
var res = [ g(1), /*#*/g(2) ]; /*positions*/
} catch (e) {
}
};
TestCaseWithBreakpoint(fun, 2, 1);
TestCaseWithException(fun, 1);
// Step in position, when the function call that we are standing at is raising
// an exception.
var fun = function() {
var o = {
g: function(p) {
throw p;
}
};
try {
var res = [ /*#*/f(1), /*#*/g(2) ]; /*pause, positions*/
} catch (e) {
}
};
TestCaseWithException(fun, 0);
// Step-in position, when already paused almost on the first call site.
var fun = function() {
function g(p) {
throw p;
}
try {
var res = [ /*#*/g(Math.rand), /*#*/g(2) ]; /*pause, positions*/
} catch (e) {
}
};
TestCaseWithBreakpoint(fun, 5, 0);
// Step-in position, when already paused on the first call site.
var fun = function() {
function g() {
throw "Debug";
}
try {
var res = [ /*#*/g(), /*#*/g() ]; /*pause, positions*/
} catch (e) {
}
};
TestCaseWithBreakpoint(fun, 5, 0);
// Method calls.
var fun = function() {
var data = {
a: function() {}
};
var res = [ DebuggerStatement(), data./*#*/a(), data[/*#*/String("a")]/*#*/(), data["a"]/*#*/(), data.a, data["a"] ]; /*positions*/
};
TestCaseWithDebugger(fun);
// Function call on a value.
var fun = function() {
function g(p) {
return g;
}
var res = [ DebuggerStatement(), /*#*/g(2), /*#*/g(2)/*#*/(3), /*#*/g(0)/*#*/(0)/*#*/(g) ]; /*positions*/
};
TestCaseWithDebugger(fun);
// Local function call, closure function call,
// local function construction call.
var fun = (function(p) {
return function() {
function f(a, b) {
}
var res = /*#*/f(DebuggerStatement(), /*#*/p(/*#*/new f())); /*positions*/
};
})(Object);
TestCaseWithDebugger(fun);
// Global function, global object construction, calls before pause point.
var fun = (function(p) {
return function() {
var res = [ Math.abs(new Object()), DebuggerStatement(), Math./*#*/abs(4), /*#*/new Object()./*#*/toString() ]; /*positions*/
};
})(Object);
TestCaseWithDebugger(fun);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment