[dev.typeparams] all: merge master (46fd547) into dev.typeparams

[gostls13.git] / src / runtime / time.go

diff --git a/src/runtime/time.go b/src/runtime/time.go
index 666b2423164162fd96d1beed5ba6544fe0f6fe71..ad267c336564f68c78e65d4236421710eb568f8a 100644 (file)
--- a/src/runtime/time.go
+++ b/src/runtime/time.go
@@ -7,6 +7,7 @@
 package runtime
 
 import (
+       "internal/abi"
        "runtime/internal/atomic"
        "runtime/internal/sys"
        "unsafe"
@@ -819,7 +820,7 @@ func runOneTimer(pp *p, t *timer, now int64) {
        if raceenabled {
                ppcur := getg().m.p.ptr()
                if ppcur.timerRaceCtx == 0 {
-                       ppcur.timerRaceCtx = racegostart(funcPC(runtimer) + sys.PCQuantum)
+                       ppcur.timerRaceCtx = racegostart(abi.FuncPCABIInternal(runtimer) + sys.PCQuantum)
                }
                raceacquirectx(ppcur.timerRaceCtx, unsafe.Pointer(t))
        }