Skip to content

Commit

Permalink
Debugger: add ability to set script source from within OnBeforeCompile.
Browse files Browse the repository at this point in the history
  • Loading branch information
pfeldman@chromium.org committed Mar 15, 2012
1 parent 878005c commit 3ac8a7f
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/compiler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,9 @@ static Handle<SharedFunctionInfo> MakeFunctionInfo(CompilationInfo* info) {
// the instances of the function.
SetExpectedNofPropertiesFromEstimate(result, lit->expected_property_count());

script->set_compilation_state(
Smi::FromInt(Script::COMPILATION_STATE_COMPILED));

#ifdef ENABLE_DEBUGGER_SUPPORT
// Notify debugger
isolate->debugger()->OnAfterCompile(
Expand Down
2 changes: 2 additions & 0 deletions src/factory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,8 @@ Handle<Script> Factory::NewScript(Handle<String> source) {
script->set_context_data(heap->undefined_value());
script->set_type(Smi::FromInt(Script::TYPE_NORMAL));
script->set_compilation_type(Smi::FromInt(Script::COMPILATION_TYPE_HOST));
script->set_compilation_state(
Smi::FromInt(Script::COMPILATION_STATE_INITIAL));
script->set_wrapper(*wrapper);
script->set_line_ends(heap->undefined_value());
script->set_eval_from_shared(heap->undefined_value());
Expand Down
5 changes: 5 additions & 0 deletions src/mirror-debugger.js
Original file line number Diff line number Diff line change
Expand Up @@ -1832,6 +1832,11 @@ ScriptMirror.prototype.source = function() {
};


ScriptMirror.prototype.setSource = function(source) {
%DebugSetScriptSource(this.script_, source);
};


ScriptMirror.prototype.lineOffset = function() {
return this.script_.line_offset;
};
Expand Down
1 change: 1 addition & 0 deletions src/objects-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -3525,6 +3525,7 @@ ACCESSORS(Script, context_data, Object, kContextOffset)
ACCESSORS(Script, wrapper, Foreign, kWrapperOffset)
ACCESSORS_TO_SMI(Script, type, kTypeOffset)
ACCESSORS_TO_SMI(Script, compilation_type, kCompilationTypeOffset)
ACCESSORS_TO_SMI(Script, compilation_state, kCompilationStateOffset)
ACCESSORS(Script, line_ends, Object, kLineEndsOffset)
ACCESSORS(Script, eval_from_shared, Object, kEvalFromSharedOffset)
ACCESSORS_TO_SMI(Script, eval_from_instructions_offset,
Expand Down
13 changes: 12 additions & 1 deletion src/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -4978,6 +4978,12 @@ class Script: public Struct {
COMPILATION_TYPE_EVAL = 1
};

// Script compilation state.
enum CompilationState {
COMPILATION_STATE_INITIAL = 0,
COMPILATION_STATE_COMPILED = 1
};

// [source]: the script source.
DECL_ACCESSORS(source, Object)

Expand Down Expand Up @@ -5009,6 +5015,9 @@ class Script: public Struct {
// [compilation]: how the the script was compiled.
DECL_ACCESSORS(compilation_type, Smi)

// [is_compiled]: determines whether the script has already been compiled.
DECL_ACCESSORS(compilation_state, Smi)

// [line_ends]: FixedArray of line ends positions.
DECL_ACCESSORS(line_ends, Object)

Expand Down Expand Up @@ -5045,7 +5054,9 @@ class Script: public Struct {
static const int kWrapperOffset = kContextOffset + kPointerSize;
static const int kTypeOffset = kWrapperOffset + kPointerSize;
static const int kCompilationTypeOffset = kTypeOffset + kPointerSize;
static const int kLineEndsOffset = kCompilationTypeOffset + kPointerSize;
static const int kCompilationStateOffset =
kCompilationTypeOffset + kPointerSize;
static const int kLineEndsOffset = kCompilationStateOffset + kPointerSize;
static const int kIdOffset = kLineEndsOffset + kPointerSize;
static const int kEvalFromSharedOffset = kIdOffset + kPointerSize;
static const int kEvalFrominstructionsOffsetOffset =
Expand Down
19 changes: 19 additions & 0 deletions src/runtime.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12277,6 +12277,25 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_DebugGetPrototype) {
}


// Patches script source (should be called upon BeforeCompile event).
RUNTIME_FUNCTION(MaybeObject*, Runtime_DebugSetScriptSource) {
HandleScope scope(isolate);
ASSERT(args.length() == 2);

CONVERT_ARG_HANDLE_CHECKED(JSValue, script_wrapper, 0);
Handle<String> source(String::cast(args[1]));

RUNTIME_ASSERT(script_wrapper->value()->IsScript());
Handle<Script> script(Script::cast(script_wrapper->value()));

int compilation_state = Smi::cast(script->compilation_state())->value();
RUNTIME_ASSERT(compilation_state == Script::COMPILATION_STATE_INITIAL);
script->set_source(*source);

return isolate->heap()->undefined_value();
}


RUNTIME_FUNCTION(MaybeObject*, Runtime_SystemBreak) {
ASSERT(args.length() == 0);
CPU::DebugBreak();
Expand Down
1 change: 1 addition & 0 deletions src/runtime.h
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ namespace internal {
F(DebugReferencedBy, 3, 1) \
F(DebugConstructedBy, 2, 1) \
F(DebugGetPrototype, 1, 1) \
F(DebugSetScriptSource, 2, 1) \
F(SystemBreak, 0, 1) \
F(DebugDisassembleFunction, 1, 1) \
F(DebugDisassembleConstructor, 1, 1) \
Expand Down
64 changes: 64 additions & 0 deletions test/mjsunit/debug-set-script-source.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Copyright 2012 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 script_number = 0;
var script_names = [];
var exception = null;

function listener(event, exec_state, event_data, data) {
if (event == Debug.DebugEvent.BeforeCompile) {
event_data.script().setSource(event_data.script().source() +
" //@ sourceURL=proper_location_" + (++script_number));
} else if (event == Debug.DebugEvent.AfterCompile) {
try {
event_data.script().setSource("a=1 //@ sourceURL=wrong_location");
} catch(e) {
exception = e;
}
script_names.push(event_data.script().name());
}
};


// Add the debug event listener.
Debug.setListener(listener);

// Compile different sources.
eval('a=1');
eval('(function(){})');

assertEquals(2, script_names.length);
assertEquals("proper_location_1", script_names[0]);
assertEquals("proper_location_2", script_names[1]);

assertEquals("illegal access", exception);

Debug.setListener(null);

0 comments on commit 3ac8a7f

Please sign in to comment.