Skip to content

Commit 5557a63

Browse files
Bill BudgeCommit Bot
Bill Budge
authored and
Commit Bot
committed
Revert "stack-trace-api: implement getEnclosingLine/Column"
This reverts commit c48ae2d. Reason for revert: Breaks a profiling test: https://ci.chromium.org/p/v8/builders/ci/V8%20Win32/30010 Original change's description: > stack-trace-api: implement getEnclosingLine/Column > > Introduces getEnclosingColumn and getEnclosingLine on CallSite > so that the position can be used to lookup the original symbol > for function when source maps are used. > > BUG=v8:11157 > > Change-Id: I06c4c374d172d206579abb170c7b7a2bd3bb159f > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2547218 > Reviewed-by: Jakob Kummerow <[email protected]> > Commit-Queue: Benjamin Coe <[email protected]> > Cr-Commit-Position: refs/heads/master@{#71343} [email protected],[email protected],[email protected] Change-Id: Iab5c250c1c4fbdab86971f4a7e40abc8f87cf79c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: v8:11157 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2555384 Reviewed-by: Bill Budge <[email protected]> Commit-Queue: Bill Budge <[email protected]> Cr-Commit-Position: refs/heads/master@{#71345}
1 parent 9820f02 commit 5557a63

7 files changed

Lines changed: 0 additions & 114 deletions

File tree

‎src/builtins/builtins-callsite.cc‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,6 @@ BUILTIN(CallSitePrototypeGetColumnNumber) {
5353
return PositiveNumberOrNull(it.Frame()->GetColumnNumber(), isolate);
5454
}
5555

56-
BUILTIN(CallSitePrototypeGetEnclosingColumnNumber) {
57-
HandleScope scope(isolate);
58-
CHECK_CALLSITE(recv, "getEnclosingColumnNumber");
59-
FrameArrayIterator it(isolate, GetFrameArray(isolate, recv),
60-
GetFrameIndex(isolate, recv));
61-
return PositiveNumberOrNull(it.Frame()->GetEnclosingColumnNumber(), isolate);
62-
}
63-
64-
BUILTIN(CallSitePrototypeGetEnclosingLineNumber) {
65-
HandleScope scope(isolate);
66-
CHECK_CALLSITE(recv, "getEnclosingLineNumber");
67-
FrameArrayIterator it(isolate, GetFrameArray(isolate, recv),
68-
GetFrameIndex(isolate, recv));
69-
return PositiveNumberOrNull(it.Frame()->GetEnclosingLineNumber(), isolate);
70-
}
71-
7256
BUILTIN(CallSitePrototypeGetEvalOrigin) {
7357
HandleScope scope(isolate);
7458
CHECK_CALLSITE(recv, "getEvalOrigin");

‎src/builtins/builtins-definitions.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,6 @@ namespace internal {
367367
\
368368
/* CallSite */ \
369369
CPP(CallSitePrototypeGetColumnNumber) \
370-
CPP(CallSitePrototypeGetEnclosingColumnNumber) \
371-
CPP(CallSitePrototypeGetEnclosingLineNumber) \
372370
CPP(CallSitePrototypeGetEvalOrigin) \
373371
CPP(CallSitePrototypeGetFileName) \
374372
CPP(CallSitePrototypeGetFunction) \

‎src/execution/messages.cc‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -514,26 +514,6 @@ int JSStackFrame::GetColumnNumber() {
514514
return kNone;
515515
}
516516

517-
int JSStackFrame::GetEnclosingLineNumber() {
518-
if (HasScript()) {
519-
Handle<SharedFunctionInfo> shared = handle(function_->shared(), isolate_);
520-
return Script::GetLineNumber(GetScript(),
521-
shared->function_token_position()) + 1;
522-
} else {
523-
return kNone;
524-
}
525-
}
526-
527-
int JSStackFrame::GetEnclosingColumnNumber() {
528-
if (HasScript()) {
529-
Handle<SharedFunctionInfo> shared = handle(function_->shared(), isolate_);
530-
return Script::GetColumnNumber(GetScript(),
531-
shared->function_token_position()) + 1;
532-
} else {
533-
return kNone;
534-
}
535-
}
536-
537517
int JSStackFrame::GetPromiseIndex() const {
538518
return (is_promise_all_ || is_promise_any_) ? offset_ : kNone;
539519
}
@@ -622,12 +602,6 @@ int WasmStackFrame::GetPosition() const {
622602

623603
int WasmStackFrame::GetColumnNumber() { return GetModuleOffset(); }
624604

625-
int WasmStackFrame::GetEnclosingColumnNumber() {
626-
const int function_offset =
627-
GetWasmFunctionOffset(wasm_instance_->module(), wasm_func_index_);
628-
return function_offset;
629-
}
630-
631605
int WasmStackFrame::GetModuleOffset() const {
632606
const int function_offset =
633607
GetWasmFunctionOffset(wasm_instance_->module(), wasm_func_index_);
@@ -698,26 +672,6 @@ int AsmJsWasmStackFrame::GetColumnNumber() {
698672
return Script::GetColumnNumber(script, GetPosition()) + 1;
699673
}
700674

701-
int AsmJsWasmStackFrame::GetEnclosingLineNumber() {
702-
DCHECK_LE(0, GetPosition());
703-
Handle<Script> script(wasm_instance_->module_object().script(), isolate_);
704-
DCHECK(script->IsUserJavaScript());
705-
int byte_offset = GetSourcePosition(wasm_instance_->module(),
706-
wasm_func_index_, 0,
707-
is_at_number_conversion_);
708-
return Script::GetLineNumber(script, byte_offset) + 1;
709-
}
710-
711-
int AsmJsWasmStackFrame::GetEnclosingColumnNumber() {
712-
DCHECK_LE(0, GetPosition());
713-
Handle<Script> script(wasm_instance_->module_object().script(), isolate_);
714-
DCHECK(script->IsUserJavaScript());
715-
int byte_offset = GetSourcePosition(wasm_instance_->module(),
716-
wasm_func_index_, 0,
717-
is_at_number_conversion_);
718-
return Script::GetColumnNumber(script, byte_offset) + 1;
719-
}
720-
721675
FrameArrayIterator::FrameArrayIterator(Isolate* isolate,
722676
Handle<FrameArray> array, int frame_ix)
723677
: isolate_(isolate), array_(array), frame_ix_(frame_ix) {}

‎src/execution/messages.h‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ class StackFrameBase {
8787
// Return 0-based Wasm function index. Returns -1 for non-Wasm frames.
8888
virtual int GetWasmFunctionIndex();
8989

90-
virtual int GetEnclosingColumnNumber() = 0;
91-
virtual int GetEnclosingLineNumber() = 0;
92-
9390
// Returns the index of the rejected promise in the Promise combinator input,
9491
// or -1 if this frame is not a Promise combinator frame.
9592
virtual int GetPromiseIndex() const = 0;
@@ -136,9 +133,6 @@ class JSStackFrame : public StackFrameBase {
136133
int GetLineNumber() override;
137134
int GetColumnNumber() override;
138135

139-
int GetEnclosingColumnNumber() override;
140-
int GetEnclosingLineNumber() override;
141-
142136
int GetPromiseIndex() const override;
143137

144138
bool IsNative() override;
@@ -189,8 +183,6 @@ class WasmStackFrame : public StackFrameBase {
189183
int GetPosition() const override;
190184
int GetLineNumber() override { return 0; }
191185
int GetColumnNumber() override;
192-
int GetEnclosingColumnNumber() override;
193-
int GetEnclosingLineNumber() override { return 0; }
194186
int GetWasmFunctionIndex() override { return wasm_func_index_; }
195187

196188
int GetPromiseIndex() const override { return GetPosition(); }
@@ -239,9 +231,6 @@ class AsmJsWasmStackFrame : public WasmStackFrame {
239231
int GetLineNumber() override;
240232
int GetColumnNumber() override;
241233

242-
int GetEnclosingColumnNumber() override;
243-
int GetEnclosingLineNumber() override;
244-
245234
private:
246235
friend class FrameArrayIterator;
247236
AsmJsWasmStackFrame() = default;

‎src/init/bootstrapper.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4202,10 +4202,6 @@ void Genesis::InitializeCallSiteBuiltins() {
42024202

42034203
FunctionInfo infos[] = {
42044204
{"getColumnNumber", Builtins::kCallSitePrototypeGetColumnNumber},
4205-
{"getEnclosingColumnNumber",
4206-
Builtins::kCallSitePrototypeGetEnclosingColumnNumber},
4207-
{"getEnclosingLineNumber",
4208-
Builtins::kCallSitePrototypeGetEnclosingLineNumber},
42094205
{"getEvalOrigin", Builtins::kCallSitePrototypeGetEvalOrigin},
42104206
{"getFileName", Builtins::kCallSitePrototypeGetFileName},
42114207
{"getFunction", Builtins::kCallSitePrototypeGetFunction},

‎test/mjsunit/stack-traces.js‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -439,23 +439,3 @@ var constructor = new Error().stack[0].constructor;
439439
assertThrows(() => constructor.call());
440440
assertThrows(() => constructor.call(
441441
null, {}, () => undefined, {valueOf() { return 0 }}, false));
442-
443-
// Test stack frames populated with line/column information for both call site
444-
// and enclosing function:
445-
Error.prepareStackTrace = function(e, frames) {
446-
assertMatches(/stack-traces\.js/, frames[0].getFileName());
447-
assertEquals(3, frames[0].getEnclosingColumnNumber());
448-
assertEquals(11, frames[0].getColumnNumber());
449-
assertTrue(frames[0].getEnclosingLineNumber() < frames[0].getLineNumber());
450-
}
451-
try {
452-
function a() {
453-
b();
454-
}
455-
function b() {
456-
throw Error('hello world');
457-
}
458-
a();
459-
} catch (err) {
460-
err.stack;
461-
}

‎test/mjsunit/wasm/asm-wasm-stack.js‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -154,18 +154,3 @@ function generateOverflowWasmFromAsmJs() {
154154
['f', 135, 12] // --
155155
]);
156156
})();
157-
158-
(function EnclosingFunctionOffsets() {
159-
const fun = generateWasmFromAsmJs(this, {throwFunc: throwException});
160-
assertTrue(%IsWasmCode(fun));
161-
let e = null;
162-
try {
163-
fun(0);
164-
} catch (ex) {
165-
e = ex;
166-
}
167-
assertEquals(68, e.stack[2].getLineNumber());
168-
assertEquals(15, e.stack[2].getColumnNumber());
169-
assertEquals(65, e.stack[2].getEnclosingLineNumber());
170-
assertEquals(3, e.stack[2].getEnclosingColumnNumber());
171-
})();

0 commit comments

Comments
 (0)