deps: V8: cherry-pick 86991d0587a1

Adds methods for fetching stack trace information about enclosing function. Refs #36042 Original commit message: Reland "stack-trace-api: implement getEnclosingLine/Column" This reverts commit 5557a63beb5a53c93e9b590eaf2933e21bcb3768. Reason for revert: Sheriff's mistake, failing test was previously flaking. Original change's description: > Revert "stack-trace-api: implement getEnclosingLine/Column" > > This reverts commit c48ae2d96cbfdc2216706a5e9a79ae1dce5a638b. > > 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} [email protected],[email protected],[email protected],[email protected] # Not skipping CQ checks because this is a reland. Bug: v8:11157 Change-Id: I8dba19ceb29a24594469d2cf79626f741dc4cad3 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2555499 Reviewed-by: Bill Budge <[email protected]> Commit-Queue: Bill Budge <[email protected]> Cr-Commit-Position: refs/heads/master@{#71348} Refs: v8/v8@86991d0 PR-URL: #36254 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]>

Author: Benjamin Coe

deps/v8/src/builtins/builtins-callsite.cc

@@ -53,6 +53,22 @@ BUILTIN(CallSitePrototypeGetColumnNumber){
 returnPositiveNumberOrNull(it.Frame()->GetColumnNumber(), isolate);
 }
 
+BUILTIN(CallSitePrototypeGetEnclosingColumnNumber){
+ HandleScope scope(isolate);
+CHECK_CALLSITE(recv, "getEnclosingColumnNumber");
+ FrameArrayIterator it(isolate, GetFrameArray(isolate, recv),
+GetFrameIndex(isolate, recv));
+returnPositiveNumberOrNull(it.Frame()->GetEnclosingColumnNumber(), isolate);
+}
+
+BUILTIN(CallSitePrototypeGetEnclosingLineNumber){
+ HandleScope scope(isolate);
+CHECK_CALLSITE(recv, "getEnclosingLineNumber");
+ FrameArrayIterator it(isolate, GetFrameArray(isolate, recv),
+GetFrameIndex(isolate, recv));
+returnPositiveNumberOrNull(it.Frame()->GetEnclosingLineNumber(), isolate);
+}
+
 BUILTIN(CallSitePrototypeGetEvalOrigin){
  HandleScope scope(isolate);
 CHECK_CALLSITE(recv, "getEvalOrigin");

deps/v8/src/builtins/builtins-definitions.h

@@ -365,6 +365,8 @@ namespace internal{
  \
 /* CallSite */ \
 CPP(CallSitePrototypeGetColumnNumber) \
+CPP(CallSitePrototypeGetEnclosingColumnNumber) \
+CPP(CallSitePrototypeGetEnclosingLineNumber) \
 CPP(CallSitePrototypeGetEvalOrigin) \
 CPP(CallSitePrototypeGetFileName) \
 CPP(CallSitePrototypeGetFunction) \

deps/v8/src/execution/messages.cc

@@ -514,6 +514,26 @@ int JSStackFrame::GetColumnNumber(){
 returnkNone;
 }
 
+intJSStackFrame::GetEnclosingLineNumber(){
+if (HasScript()){
+ Handle<SharedFunctionInfo> shared = handle(function_->shared(), isolate_);
+returnScript::GetLineNumber(GetScript(),
+ shared->function_token_position()) + 1;
+ } else{
+returnkNone;
+ }
+}
+
+intJSStackFrame::GetEnclosingColumnNumber(){
+if (HasScript()){
+ Handle<SharedFunctionInfo> shared = handle(function_->shared(), isolate_);
+returnScript::GetColumnNumber(GetScript(),
+ shared->function_token_position()) + 1;
+ } else{
+returnkNone;
+ }
+}
+
 intJSStackFrame::GetPromiseIndex() const{
 return (is_promise_all_ || is_promise_any_) ? offset_ : kNone;
 }
@@ -602,6 +622,12 @@ int WasmStackFrame::GetPosition() const{
 
 intWasmStackFrame::GetColumnNumber(){returnGetModuleOffset()}
 
+intWasmStackFrame::GetEnclosingColumnNumber(){
+constint function_offset =
+GetWasmFunctionOffset(wasm_instance_->module(), wasm_func_index_);
+return function_offset;
+}
+
 intWasmStackFrame::GetModuleOffset() const{
 constint function_offset =
 GetWasmFunctionOffset(wasm_instance_->module(), wasm_func_index_);
@@ -672,6 +698,26 @@ int AsmJsWasmStackFrame::GetColumnNumber(){
 returnScript::GetColumnNumber(script, GetPosition()) + 1;
 }
 
+intAsmJsWasmStackFrame::GetEnclosingLineNumber(){
+DCHECK_LE(0, GetPosition());
+ Handle<Script> script(wasm_instance_->module_object().script(), isolate_);
+DCHECK(script->IsUserJavaScript());
+int byte_offset = GetSourcePosition(wasm_instance_->module(),
+ wasm_func_index_, 0,
+ is_at_number_conversion_);
+returnScript::GetLineNumber(script, byte_offset) + 1;
+}
+
+intAsmJsWasmStackFrame::GetEnclosingColumnNumber(){
+DCHECK_LE(0, GetPosition());
+ Handle<Script> script(wasm_instance_->module_object().script(), isolate_);
+DCHECK(script->IsUserJavaScript());
+int byte_offset = GetSourcePosition(wasm_instance_->module(),
+ wasm_func_index_, 0,
+ is_at_number_conversion_);
+returnScript::GetColumnNumber(script, byte_offset) + 1;
+}
+
 FrameArrayIterator::FrameArrayIterator(Isolate* isolate,
  Handle<FrameArray> array, int frame_ix)
  : isolate_(isolate), array_(array), frame_ix_(frame_ix){}

deps/v8/src/execution/messages.h

@@ -87,6 +87,9 @@ class StackFrameBase{
 // Return 0-based Wasm function index. Returns -1 for non-Wasm frames.
 virtualintGetWasmFunctionIndex();
 
+virtualintGetEnclosingColumnNumber() = 0;
+virtualintGetEnclosingLineNumber() = 0;
+
 // Returns the index of the rejected promise in the Promise combinator input,
 // or -1 if this frame is not a Promise combinator frame.
 virtualintGetPromiseIndex() const = 0;
@@ -133,6 +136,9 @@ class JSStackFrame : public StackFrameBase{
 intGetLineNumber() override;
 intGetColumnNumber() override;
 
+intGetEnclosingColumnNumber() override;
+intGetEnclosingLineNumber() override;
+
 intGetPromiseIndex() constoverride;
 
 boolIsNative() override;
@@ -183,6 +189,8 @@ class WasmStackFrame : public StackFrameBase{
 intGetPosition() constoverride;
 intGetLineNumber() override{return0}
 intGetColumnNumber() override;
+intGetEnclosingColumnNumber() override;
+intGetEnclosingLineNumber() override{return0}
 intGetWasmFunctionIndex() override{return wasm_func_index_}
 
 intGetPromiseIndex() constoverride{returnGetPosition()}
@@ -231,6 +239,9 @@ class AsmJsWasmStackFrame : public WasmStackFrame{
 intGetLineNumber() override;
 intGetColumnNumber() override;
 
+intGetEnclosingColumnNumber() override;
+intGetEnclosingLineNumber() override;
+
 private:
 friendclassFrameArrayIterator;
 AsmJsWasmStackFrame() = default;

deps/v8/src/init/bootstrapper.cc

@@ -4090,6 +4090,10 @@ void Genesis::InitializeCallSiteBuiltins(){
 
  FunctionInfo infos[] ={
 {"getColumnNumber", Builtins::kCallSitePrototypeGetColumnNumber},
+{"getEnclosingColumnNumber",
+ Builtins::kCallSitePrototypeGetEnclosingColumnNumber},
+{"getEnclosingLineNumber",
+ Builtins::kCallSitePrototypeGetEnclosingLineNumber},
 {"getEvalOrigin", Builtins::kCallSitePrototypeGetEvalOrigin},
 {"getFileName", Builtins::kCallSitePrototypeGetFileName},
 {"getFunction", Builtins::kCallSitePrototypeGetFunction},

deps/v8/test/mjsunit/stack-traces.js

@@ -439,3 +439,23 @@ var constructor = new Error().stack[0].constructor;
 assertThrows(()=>constructor.call());
 assertThrows(()=>constructor.call(
 null,{},()=>undefined,{valueOf(){return0}},false));
+
+// Test stack frames populated with line/column information for both call site
+// and enclosing function:
+Error.prepareStackTrace=function(e,frames){
+assertMatches(/stack-traces\.js/,frames[0].getFileName());
+assertEquals(3,frames[0].getEnclosingColumnNumber());
+assertEquals(11,frames[0].getColumnNumber());
+assertTrue(frames[0].getEnclosingLineNumber()<frames[0].getLineNumber());
+}
+try{
+functiona(){
+b();
+}
+functionb(){
+throwError('hello world');
+}
+a();
+}catch(err){
+err.stack;
+}

deps/v8/test/mjsunit/wasm/asm-wasm-stack.js

@@ -154,3 +154,18 @@ function generateOverflowWasmFromAsmJs(){
 ['f',135,12]// --
 ]);
 })();
+
+(functionEnclosingFunctionOffsets(){
+constfun=generateWasmFromAsmJs(this,{throwFunc: throwException});
+assertTrue(%IsWasmCode(fun));
+lete=null;
+try{
+fun(0);
+}catch(ex){
+e=ex;
+}
+assertEquals(68,e.stack[2].getLineNumber());
+assertEquals(15,e.stack[2].getColumnNumber());
+assertEquals(65,e.stack[2].getEnclosingLineNumber());
+assertEquals(3,e.stack[2].getEnclosingColumnNumber());
+})();