Commit b99ca1ab authored by yangguo@chromium.org's avatar yangguo@chromium.org

Do not implicitly convert receivers for builtin functions when inspecting frames.

R=jkummerow@chromium.org
BUG=

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15574 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent a1dfbc46
...@@ -11061,7 +11061,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_GetFrameDetails) { ...@@ -11061,7 +11061,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_GetFrameDetails) {
Handle<Object> receiver(it.frame()->receiver(), isolate); Handle<Object> receiver(it.frame()->receiver(), isolate);
if (!receiver->IsJSObject() && if (!receiver->IsJSObject() &&
shared->is_classic_mode() && shared->is_classic_mode() &&
!shared->native()) { !function->IsBuiltin()) {
// If the receiver is not a JSObject and the function is not a // If the receiver is not a JSObject and the function is not a
// builtin or strict-mode we have hit an optimization where a // builtin or strict-mode we have hit an optimization where a
// value object is not converted into a wrapped JS objects. To // value object is not converted into a wrapped JS objects. To
...@@ -11071,6 +11071,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_GetFrameDetails) { ...@@ -11071,6 +11071,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_GetFrameDetails) {
it.Advance(); it.Advance();
Handle<Context> calling_frames_native_context( Handle<Context> calling_frames_native_context(
Context::cast(Context::cast(it.frame()->context())->native_context())); Context::cast(Context::cast(it.frame()->context())->native_context()));
ASSERT(!receiver->IsUndefined() && !receiver->IsNull());
receiver = receiver =
isolate->factory()->ToObject(receiver, calling_frames_native_context); isolate->factory()->ToObject(receiver, calling_frames_native_context);
} }
......
// Copyright 2013 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 --allow-natives-syntax
Debug = debug.Debug;
var listened = false;
function listener(event, exec_state, event_data, data) {
if (event == Debug.DebugEvent.Exception) {
for (var i = 0; i < exec_state.frameCount(); i++) {
print(exec_state.frame(i).receiver());
print(exec_state.frame(i).func().name());
}
}
listened = true;
}
Debug.setListener(listener);
Debug.setBreakOnException();
assertThrows(function() { delete null['foo']; });
Debug.clearBreakOnException();
Debug.setListener(null);
assertTrue(listened);
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