Revert "runtime: rename getcallerfp to getfp"

This reverts CL 481617.

Reason for revert: breaks test build on Windows

Change-Id: Ifc1a323b0cc521e7a5a1f7de7b3da667f5fee375
Reviewed-on: https://go-review.googlesource.com/c/go/+/494377
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Auto-Submit: Michael Pratt <mpratt@google.com>
Run-TryBot: Michael Pratt <mpratt@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>

src/runtime/asm_amd64.s

@@ -2060,6 +2060,6 @@ TEXT runtime·retpolineR13(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(13)
 TEXT runtime·retpolineR14(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(14)
 TEXT runtime·retpolineR15(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(15)
 
-TEXT ·getfp<ABIInternal>(SB),NOSPLIT|NOFRAME,$0
+TEXT ·getcallerfp<ABIInternal>(SB),NOSPLIT|NOFRAME,$0
 	MOVQ BP, AX
 	RET

src/runtime/asm_arm64.s

@@ -1544,6 +1544,6 @@ TEXT runtime·panicSliceConvert<ABIInternal>(SB),NOSPLIT,$0-16
 	MOVD	R3, R1
 	JMP	runtime·goPanicSliceConvert<ABIInternal>(SB)
 
-TEXT ·getfp<ABIInternal>(SB),NOSPLIT|NOFRAME,$0
+TEXT ·getcallerfp<ABIInternal>(SB),NOSPLIT|NOFRAME,$0
 	MOVD R29, R0
 	RET

src/runtime/export_test.go

@@ -1820,5 +1820,5 @@ func PersistentAlloc(n uintptr) unsafe.Pointer {
 // FPCallers works like Callers and uses frame pointer unwinding to populate
 // pcBuf with the return addresses of the physical frames on the stack.
 func FPCallers(skip int, pcBuf []uintptr) int {
-	return fpTracebackPCs(unsafe.Pointer(getfp()), skip, pcBuf)
+	return fpTracebackPCs(unsafe.Pointer(getcallerfp()), skip, pcBuf)
 }

src/runtime/os_wasm.go

@@ -137,9 +137,8 @@ func preemptM(mp *m) {
 	// No threads, so nothing to do.
 }
 
-// getfp returns the frame pointer register of its caller or 0 if not implemented.
-// TODO: Make this a compiler intrinsic
-func getfp() uintptr { return 0 }
+// getcallerfp returns the address of the frame pointer in the callers frame or 0 if not implemented.
+func getcallerfp() uintptr { return 0 }
 
 func setProcessCPUProfiler(hz int32) {}
 func setThreadCPUProfiler(hz int32)  {}

src/runtime/stubs_386.go

@@ -19,6 +19,5 @@ func emptyfunc()
 //go:noescape
 func asmcgocall_no_g(fn, arg unsafe.Pointer)
 
-// getfp returns the frame pointer register of its caller or 0 if not implemented.
-// TODO: Make this a compiler intrinsic
-func getfp() uintptr { return 0 }
+// getcallerfp returns the address of the frame pointer in the callers frame or 0 if not implemented.
+func getcallerfp() uintptr { return 0 }

src/runtime/stubs_amd64.go

@@ -48,6 +48,6 @@ func asmcgocall_no_g(fn, arg unsafe.Pointer)
 func spillArgs()
 func unspillArgs()
 
-// getfp returns the frame pointer register of its caller or 0 if not implemented.
+// getcallerfp returns the address of the frame pointer in the callers frame or 0 if not implemented.
 // TODO: Make this a compiler intrinsic
-func getfp() uintptr
+func getcallerfp() uintptr

src/runtime/stubs_arm.go

@@ -24,6 +24,5 @@ func read_tls_fallback()
 //go:noescape
 func asmcgocall_no_g(fn, arg unsafe.Pointer)
 
-// getfp returns the frame pointer register of its caller or 0 if not implemented.
-// TODO: Make this a compiler intrinsic
-func getfp() uintptr { return 0 }
+// getcallerfp returns the address of the frame pointer in the callers frame or 0 if not implemented.
+func getcallerfp() uintptr { return 0 }

src/runtime/stubs_arm64.go

@@ -22,6 +22,6 @@ func emptyfunc()
 func spillArgs()
 func unspillArgs()
 
-// getfp returns the frame pointer register of its caller or 0 if not implemented.
+// getcallerfp returns the address of the frame pointer in the callers frame or 0 if not implemented.
 // TODO: Make this a compiler intrinsic
-func getfp() uintptr
+func getcallerfp() uintptr

src/runtime/stubs_loong64.go

@@ -10,6 +10,5 @@ package runtime
 func load_g()
 func save_g()
 
-// getfp returns the frame pointer register of its caller or 0 if not implemented.
-// TODO: Make this a compiler intrinsic
-func getfp() uintptr { return 0 }
+// getcallerfp returns the address of the frame pointer in the callers frame or 0 if not implemented.
+func getcallerfp() uintptr { return 0 }

src/runtime/stubs_mips64x.go

@@ -15,6 +15,5 @@ func save_g()
 //go:noescape
 func asmcgocall_no_g(fn, arg unsafe.Pointer)
 
-// getfp returns the frame pointer register of its caller or 0 if not implemented.
-// TODO: Make this a compiler intrinsic
-func getfp() uintptr { return 0 }
+// getcallerfp returns the address of the frame pointer in the callers frame or 0 if not implemented.
+func getcallerfp() uintptr { return 0 }

src/runtime/stubs_mipsx.go

@@ -10,6 +10,5 @@ package runtime
 func load_g()
 func save_g()
 
-// getfp returns the frame pointer register of its caller or 0 if not implemented.
-// TODO: Make this a compiler intrinsic
-func getfp() uintptr { return 0 }
+// getcallerfp returns the address of the frame pointer in the callers frame or 0 if not implemented.
+func getcallerfp() uintptr { return 0 }

src/runtime/stubs_ppc64x.go

@@ -16,6 +16,5 @@ func reginit()
 func spillArgs()
 func unspillArgs()
 
-// getfp returns the frame pointer register of its caller or 0 if not implemented.
-// TODO: Make this a compiler intrinsic
-func getfp() uintptr { return 0 }
+// getcallerfp returns the address of the frame pointer in the callers frame or 0 if not implemented.
+func getcallerfp() uintptr { return 0 }

src/runtime/stubs_riscv64.go

@@ -15,6 +15,5 @@ func save_g()
 func spillArgs()
 func unspillArgs()
 
-// getfp returns the frame pointer register of its caller or 0 if not implemented.
-// TODO: Make this a compiler intrinsic
-func getfp() uintptr { return 0 }
+// getcallerfp returns the address of the frame pointer in the callers frame or 0 if not implemented.
+func getcallerfp() uintptr { return 0 }

src/runtime/stubs_s390x.go

@@ -8,6 +8,5 @@ package runtime
 func load_g()
 func save_g()
 
-// getfp returns the frame pointer register of its caller or 0 if not implemented.
-// TODO: Make this a compiler intrinsic
-func getfp() uintptr { return 0 }
+// getcallerfp returns the address of the frame pointer in the callers frame or 0 if not implemented.
+func getcallerfp() uintptr { return 0 }

src/runtime/trace.go

@@ -906,7 +906,7 @@ func traceStackID(mp *m, pcBuf []uintptr, skip int) uint64 {
 		// Fast path: Unwind using frame pointers.
 		pcBuf[0] = uintptr(skip)
 		if curgp == gp {
-			nstk += fpTracebackPCs(unsafe.Pointer(getfp()), skip, pcBuf[1:])
+			nstk += fpTracebackPCs(unsafe.Pointer(getcallerfp()), skip, pcBuf[1:])
 		} else if curgp != nil {
 			// We're called on the g0 stack through mcall(fn) or systemstack(fn). To
 			// behave like gcallers above, we start unwinding from sched.bp, which