cmd/compile: move FuncPC intrinsic handling to common helper

[gostls13.git] / src / cmd / compile / internal / walk / expr.go

diff --git a/src/cmd/compile/internal/walk/expr.go b/src/cmd/compile/internal/walk/expr.go
index 6c3d9fcd37aa7a85e9ffdcc00bf0c4a1cb05fa25..64d20b555e41e849ae99cdb7598d08541c672d81 100644 (file)
--- a/src/cmd/compile/internal/walk/expr.go
+++ b/src/cmd/compile/internal/walk/expr.go
@@ -559,30 +559,11 @@ func walkCall(n *ir.CallExpr, init *ir.Nodes) ir.Node {
                case "FuncPCABIInternal":
                        wantABI = obj.ABIInternal
                }
-               if isIfaceOfFunc(arg) {
-                       fn := arg.(*ir.ConvExpr).X.(*ir.Name)
-                       abi := fn.Func.ABI
-                       if abi != wantABI {
-                               base.ErrorfAt(n.Pos(), 0, "internal/abi.%s expects an %v function, %s is defined as %v", name, wantABI, fn.Sym().Name, abi)
-                       }
-                       var e ir.Node = ir.NewLinksymExpr(n.Pos(), fn.Sym().LinksymABI(abi), types.Types[types.TUINTPTR])
-                       e = ir.NewAddrExpr(n.Pos(), e)
-                       e.SetType(types.Types[types.TUINTPTR].PtrTo())
-                       return typecheck.Expr(ir.NewConvExpr(n.Pos(), ir.OCONVNOP, n.Type(), e))
-               }
-               // fn is not a defined function. It must be ABIInternal.
-               // Read the address from func value, i.e. *(*uintptr)(idata(fn)).
-               if wantABI != obj.ABIInternal {
-                       base.ErrorfAt(n.Pos(), 0, "internal/abi.%s does not accept func expression, which is ABIInternal", name)
+               if n.Type() != types.Types[types.TUINTPTR] {
+                       base.FatalfAt(n.Pos(), "FuncPC intrinsic should return uintptr, got %v", n.Type()) // as expected by typecheck.FuncPC.
                }
-               arg = walkExpr(arg, init)
-               var e ir.Node = ir.NewUnaryExpr(n.Pos(), ir.OIDATA, arg)
-               e.SetType(n.Type().PtrTo())
-               e.SetTypecheck(1)
-               e = ir.NewStarExpr(n.Pos(), e)
-               e.SetType(n.Type())
-               e.SetTypecheck(1)
-               return e
+               n := ir.FuncPC(n.Pos(), arg, wantABI)
+               return walkExpr(n, init)
        }
 
        if name, ok := n.Fun.(*ir.Name); ok {