ssa: detect needAbiInit moved into builder.call

Author: visualfc

ssa/decl.go

@@ -198,29 +198,11 @@ func (p Package) NewFunc(name string, sig *types.Signature, bg Background) Funct
 	return p.NewFuncEx(name, sig, bg, false, false)
 }
 
-type none struct{}
-
-var (
-	reflectFunc = map[string]none{
-		"reflect.ArrayOf":  none{},
-		"reflect.ChanOf":   none{},
-		"reflect.FuncOf":   none{},
-		"reflect.MapOf":    none{},
-		"reflect.SliceOf":  none{},
-		"reflect.StructOf": none{},
-	}
-)
-
 // NewFuncEx creates a new function.
 func (p Package) NewFuncEx(name string, sig *types.Signature, bg Background, hasFreeVars bool, instantiated bool) Function {
 	if v, ok := p.fns[name]; ok {
 		return v
 	}
-	if !p.NeedAbiInit && p.Path() != "reflect" {
-		if _, ok := reflectFunc[name]; ok {
-			p.NeedAbiInit = true
-		}
-	}
 	t := p.Prog.FuncDecl(sig, bg)
 	if debugInstr {
 		log.Println("NewFunc", name, t.raw.Type, "hasFreeVars:", hasFreeVars)

ssa/expr.go

@@ -1055,11 +1055,30 @@ func (b Builder) Call(fn Expr, args ...Expr) (ret Expr) {
 	default:
 		log.Panicf("unreachable: %d(%T), %v\n", kind, raw, fn.RawType())
 	}
+	pkg := b.Pkg
+	if !pkg.NeedAbiInit && pkg.Path() != "reflect" {
+		if _, ok := reflectFunc[fn.Name()]; ok {
+			pkg.NeedAbiInit = true
+		}
+	}
 	ret.Type = b.Prog.retType(sig)
 	ret.impl = llvm.CreateCall(b.impl, ll, fn.impl, llvmParamsEx(data, args, sig.Params(), b))
 	return
 }
 
+var (
+	reflectFunc = map[string]struct{}{
+		"reflect.ArrayOf":            {},
+		"reflect.ChanOf":             {},
+		"reflect.FuncOf":             {},
+		"reflect.MapOf":              {},
+		"reflect.SliceOf":            {},
+		"reflect.StructOf":           {},
+		"reflect.Value.Method":       {},
+		"reflect.Value.MethodByName": {},
+	}
+)
+
 func logCall(da string, fn Expr, args []Expr) {
 	if fn.kind == vkBuiltin {
 		return