Skip to content

V
V8
Commit 353e1152 authored by yangguo's avatar yangguo Committed by Commit bot
Browse files
Options

[liveedit] remove bogus test case. 

Removing a bad test case because:
- The test case makes wrong assumptions about compilation. We now
  may run bytecode with the interpreter.
- The test exposes internal implementation details such as pc offset
  of JIT code.
- The test uses a runtime function specially written to cater to, and
  used only by this test. Being unmaintained, this runtime function
  is already returning bogus results, making this test useless.

R=jgruber@chromium.org

Review-Url: https://codereview.chromium.org/2101223002
Cr-Commit-Position: refs/heads/master@{#37312}
parent 41f5f0c0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 174 deletions
src/debug/liveedit.js
View file @ 353e1152
......@@ -1014,11 +1014,6 @@
details.position = position_struct;
}
// A testing entry.
function GetPcFromSourcePos(func, source_pos) {
return %GetFunctionCodePositionFromSource(func, source_pos);
}
// LiveEdit main entry point: changes a script text to a new string.
function SetScriptSource(script, new_source, preview_only, change_log) {
var old_source = script.source;
......@@ -1119,7 +1114,6 @@
LiveEdit.SetScriptSource = SetScriptSource;
LiveEdit.ApplyPatchMultiChunk = ApplyPatchMultiChunk;
LiveEdit.Failure = Failure;
LiveEdit.GetPcFromSourcePos = GetPcFromSourcePos;
LiveEdit.TestApi = {
PosTranslator: PosTranslator,
......
src/runtime/runtime-debug.cc
View file @ 353e1152
......@@ -1358,44 +1358,6 @@ RUNTIME_FUNCTION(Runtime_FunctionGetDebugName) {
}
// A testing entry. Returns statement position which is the closest to
// source_position.
RUNTIME_FUNCTION(Runtime_GetFunctionCodePositionFromSource) {
HandleScope scope(isolate);
CHECK(isolate->debug()->live_edit_enabled());
DCHECK(args.length() == 2);
RUNTIME_ASSERT(isolate->debug()->is_active());
CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
CONVERT_NUMBER_CHECKED(int32_t, source_position, Int32, args[1]);
Handle<Code> code(function->code(), isolate);
if (code->kind() != Code::FUNCTION &&
code->kind() != Code::OPTIMIZED_FUNCTION) {
return isolate->heap()->undefined_value();
}
RelocIterator it(*code, RelocInfo::ModeMask(RelocInfo::STATEMENT_POSITION));
int closest_pc = 0;
int distance = kMaxInt;
while (!it.done()) {
int statement_position = static_cast<int>(it.rinfo()->data());
// Check if this break point is closer that what was previously found.
if (source_position <= statement_position &&
statement_position - source_position < distance) {
closest_pc =
static_cast<int>(it.rinfo()->pc() - code->instruction_start());
distance = statement_position - source_position;
// Check whether we can't get any closer.
if (distance == 0) break;
}
it.next();
}
return Smi::FromInt(closest_pc);
}
// Calls specified function with or without entering the debugger.
// This is used in unit tests to run code as if debugger is entered or simply
// to have a stack with C++ frame in the middle.
......
src/runtime/runtime.h
View file @ 353e1152
......@@ -173,7 +173,6 @@ namespace internal {
F(DebugSetScriptSource, 2, 1) \
F(FunctionGetInferredName, 1, 1) \
F(FunctionGetDebugName, 1, 1) \
F(GetFunctionCodePositionFromSource, 2, 1) \
F(ExecuteInDebugContext, 1, 1) \
F(GetDebugContext, 0, 1) \
F(CollectGarbage, 1, 1) \
......
test/mjsunit/debug-liveedit-patch-positions.js deleted 100644 → 0
View file @ 41f5f0c0
// Copyright 2010 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.
// Scenario: some function is being edited; the outer function has to have its
// positions patched. Accoring to a special markup of function text
// corresponding byte-code PCs should coincide before change and after it.
Debug = debug.Debug
Debug.setListener(function() {});
eval(
"function F1() { return 5; }\n" +
"function ChooseAnimal(/*$*/ ) {\n" +
"/*$*/ var x = F1(/*$*/ );\n" +
"/*$*/ var res/*$*/ =/*$*/ (function() { return 'Cat'; } )();\n" +
"/*$*/ var y/*$*/ = F2(/*$*/ F1()/*$*/ , F1(/*$*/ )/*$*/ );\n" +
"/*$*/ if (/*$*/ x.toString(/*$*/ )) { /*$*/ y = 3;/*$*/ } else {/*$*/ y = 8;/*$*/ }\n" +
"/*$*/ var z = /*$*/ x * y;\n" +
"/*$*/ return/*$*/ res/*$*/ + z;/*$*/ }\n" +
"function F2(x, y) { return x + y; }"
);
// Find all *$* markers in text of the function and read corresponding statement
// PCs.
function ReadMarkerPositions(func) {
var text = func.toString();
var positions = new Array();
var match;
var pattern = /\/\*\$\*\//g;
while ((match = pattern.exec(text)) != null) {
positions.push(match.index);
}
return positions;
}
function ReadPCMap(func, positions) {
var res = new Array();
for (var i = 0; i < positions.length; i++) {
var pc = Debug.LiveEdit.GetPcFromSourcePos(func, positions[i]);
if (typeof pc === 'undefined') {
// Function was marked for recompilation and it's code was replaced with a
// stub. This can happen at any time especially if we are running with
// --stress-opt. There is no way to get PCs now.
return;
}
res.push(pc);
}
return res;
}
function ApplyPatch(orig_animal, new_animal) {
var res = ChooseAnimal();
assertEquals(orig_animal + "15", res);
var script = Debug.findScript(ChooseAnimal);
var orig_string = "'" + orig_animal + "'";
var patch_string = "'" + new_animal + "'";
var patch_pos = script.source.indexOf(orig_string);
var change_log = new Array();
Debug.LiveEdit.TestApi.ApplySingleChunkPatch(script,
patch_pos,
orig_string.length,
patch_string,
change_log);
print("Change log: " + JSON.stringify(change_log) + "\n");
var markerPositions = ReadMarkerPositions(ChooseAnimal);
var pcArray = ReadPCMap(ChooseAnimal, markerPositions);
var res = ChooseAnimal();
assertEquals(new_animal + "15", res);
return pcArray;
}
var pcArray1 = ApplyPatch('Cat', 'Dog');
// When we patched function for the first time it was deoptimized.
// Check that after the second patch maping between sources position and
// pcs will not change.
var pcArray2 = ApplyPatch('Dog', 'Capybara');
print(pcArray1);
print(pcArray2);
// Function can be marked for recompilation at any point (especially if we are
// running with --stress-opt). When we mark function for recompilation we
// replace it's code with stub. So there is no reliable way to get PCs for
// function.
if (pcArray1 && pcArray2) {
assertArrayEquals(pcArray1, pcArray2);
}
Debug.setListener(null);
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