runtime: Include call column into position key, in addition to line.

This prevents pc collision when minified and virtually all calls and
functions are on the same line.

This change resolves `testing.TestTBHelper` test failure in Go 1.18.

Author: nevkontakte

compiler/natives/src/runtime/runtime.go

@@ -107,8 +107,8 @@ var (
 	positionCounters = []*Func{}
 )
 
-func registerPosition(funcName string, file string, line int) uintptr {
-	key := file + ":" + itoa(line)
+func registerPosition(funcName string, file string, line int, col int) uintptr {
+	key := file + ":" + itoa(line) + ":" + itoa(col)
 	if pc, found := knownPositions[key]; found {
 		return pc
 	}
@@ -135,6 +135,7 @@ type basicFrame struct {
 	FuncName string
 	File     string
 	Line     int
+	Col      int
 }
 
 func callstack(skip, limit int) []basicFrame {
@@ -189,6 +190,7 @@ func ParseCallFrame(info *js.Object) basicFrame {
 		return basicFrame{
 			File:     parts.Call("slice", 1, parts.Length()-2).Call("join", ":").String(),
 			Line:     parts.Index(parts.Length() - 2).Int(),
+			Col:      parts.Index(parts.Length() - 1).Int(),
 			FuncName: parts.Index(0).String(),
 		}
 	}
@@ -202,12 +204,13 @@ func ParseCallFrame(info *js.Object) basicFrame {
 			File: parts.Call("slice", 0, parts.Length()-2).Call("join", ":").
 				Call("replace", js.Global.Get("RegExp").New(`^\s*at `), "").String(),
 			Line:     parts.Index(parts.Length() - 2).Int(),
+			Col:      parts.Index(parts.Length() - 1).Int(),
 			FuncName: "<none>",
 		}
 	}
 
 	var file, funcName string
-	var line int
+	var line, col int
 
 	pos := info.Call("substring", openIdx+1, info.Call("indexOf", ")").Int())
 	parts := pos.Call("split", ":")
@@ -217,6 +220,7 @@ func ParseCallFrame(info *js.Object) basicFrame {
 	} else {
 		file = parts.Call("slice", 0, parts.Length()-2).Call("join", ":").String()
 		line = parts.Index(parts.Length() - 2).Int()
+		col = parts.Index(parts.Length() - 1).Int()
 	}
 	fn := info.Call("substring", info.Call("indexOf", "at ").Int()+3, info.Call("indexOf", " (").Int())
 	if idx := fn.Call("indexOf", "[as ").Int(); idx > 0 {
@@ -227,6 +231,7 @@ func ParseCallFrame(info *js.Object) basicFrame {
 	return basicFrame{
 		File:     file,
 		Line:     line,
+		Col:      col,
 		FuncName: funcName,
 	}
 }
@@ -237,7 +242,7 @@ func Caller(skip int) (pc uintptr, file string, line int, ok bool) {
 	if len(frames) != 1 {
 		return 0, "", 0, false
 	}
-	pc = registerPosition(frames[0].FuncName, frames[0].File, frames[0].Line)
+	pc = registerPosition(frames[0].FuncName, frames[0].File, frames[0].Line, frames[0].Col)
 	return pc, frames[0].File, frames[0].Line, true
 }
 
@@ -261,7 +266,7 @@ func Caller(skip int) (pc uintptr, file string, line int, ok bool) {
 func Callers(skip int, pc []uintptr) int {
 	frames := callstack(skip, len(pc))
 	for i, frame := range frames {
-		pc[i] = registerPosition(frame.FuncName, frame.File, frame.Line)
+		pc[i] = registerPosition(frame.FuncName, frame.File, frame.Line, frame.Col)
 	}
 	return len(frames)
 }

tests/runtime_test.go

@@ -20,50 +20,50 @@ func Test_parseCallFrame(t *testing.T) {
 		{
 			name:  "Chrome 96.0.4664.110 on Linux #1",
 			input: "at foo (eval at $b (https://gopherjs.github.io/playground/playground.js:102:11836), <anonymous>:25887:60)",
-			want:  "foo https://gopherjs.github.io/playground/playground.js 102",
+			want:  "foo https://gopherjs.github.io/playground/playground.js 102 11836",
 		},
 		{
 			name: "Chrome 96, anonymous eval",
 			input: "	at eval (<anonymous>)",
-			want: "eval <anonymous> 0",
+			want: "eval <anonymous> 0 0",
 		},
 		{
 			name: "Chrome 96, anonymous Array.forEach",
 			input: "	at Array.forEach (<anonymous>)",
-			want: "Array.forEach <anonymous> 0",
+			want: "Array.forEach <anonymous> 0 0",
 		},
 		{
 			name:  "Chrome 96, file location only",
 			input: "at https://ajax.googleapis.com/ajax/libs/angularjs/1.2.18/angular.min.js:31:225",
-			want:  "<none> https://ajax.googleapis.com/ajax/libs/angularjs/1.2.18/angular.min.js 31",
+			want:  "<none> https://ajax.googleapis.com/ajax/libs/angularjs/1.2.18/angular.min.js 31 225",
 		},
 		{
 			name:  "Chrome 96, aliased function",
 			input: "at k.e.$externalizeWrapper.e.$externalizeWrapper [as run] (https://gopherjs.github.io/playground/playground.js:5:30547)",
-			want:  "run https://gopherjs.github.io/playground/playground.js 5",
+			want:  "run https://gopherjs.github.io/playground/playground.js 5 30547",
 		},
 		{
 			name:  "Node.js v12.22.5",
 			input: "    at Script.runInThisContext (vm.js:120:18)",
-			want:  "Script.runInThisContext vm.js 120",
+			want:  "Script.runInThisContext vm.js 120 18",
 		},
 		{
 			name:  "Node.js v12.22.5, aliased function",
 			input: "at REPLServer.runBound [as eval] (domain.js:440:12)",
-			want:  "eval domain.js 440",
+			want:  "eval domain.js 440 12",
 		},
 		{
 			name:  "Firefox 78.15.0esr Linux",
 			input: "getEvalResult@resource://devtools/server/actors/webconsole/eval-with-debugger.js:231:24",
-			want:  "getEvalResult resource://devtools/server/actors/webconsole/eval-with-debugger.js 231",
+			want:  "getEvalResult resource://devtools/server/actors/webconsole/eval-with-debugger.js 231 24",
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			lines := js.Global.Get("String").New(tt.input)
 			frame := runtime.ParseCallFrame(lines)
-			got := fmt.Sprintf("%v %v %v", frame.FuncName, frame.File, frame.Line)
+			got := fmt.Sprintf("%v %v %v %v", frame.FuncName, frame.File, frame.Line, frame.Col)
 			if tt.want != got {
 				t.Errorf("Unexpected result: %s", got)
 			}