ssa: toLLVMFunc by NameValist

This commit is contained in:
visualfc
2024-11-25 13:28:18 +08:00
parent bab5c0589f
commit 4552691aed
3 changed files with 13 additions and 5 deletions

View File

@@ -34,6 +34,15 @@ func VArg() *types.Var {
return types.NewParam(0, nil, NameValist, types.NewSlice(tyAny)) return types.NewParam(0, nil, NameValist, types.NewSlice(tyAny))
} }
func hasNameValist(sig *types.Signature) bool {
if sig.Variadic() {
if params := sig.Params(); params.At(params.Len()-1).Name() == NameValist {
return true
}
}
return false
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
type aNamedConst struct { type aNamedConst struct {
@@ -228,7 +237,7 @@ func newParams(fn Type, prog Program) (params []Type, hasVArg bool) {
sig := fn.raw.Type.(*types.Signature) sig := fn.raw.Type.(*types.Signature)
in := sig.Params() in := sig.Params()
if n := in.Len(); n > 0 { if n := in.Len(); n > 0 {
if hasVArg = sig.Variadic(); hasVArg { if hasVArg = hasNameValist(sig); hasVArg {
n-- n--
} }
params = make([]Type, n) params = make([]Type, n)

View File

@@ -452,7 +452,7 @@ func (p Program) toLLVMTypes(t *types.Tuple, n int) (ret []llvm.Type) {
func (p Program) toLLVMFunc(sig *types.Signature) llvm.Type { func (p Program) toLLVMFunc(sig *types.Signature) llvm.Type {
tParams := sig.Params() tParams := sig.Params()
n := tParams.Len() n := tParams.Len()
hasVArg := sig.Variadic() hasVArg := hasNameValist(sig)
if hasVArg { if hasVArg {
n-- n--
} }

View File

@@ -189,9 +189,8 @@ func (p goTypes) cvtFunc(sig *types.Signature, recv *types.Var) (raw *types.Sign
} }
params, cvt1 := p.cvtTuple(sig.Params()) params, cvt1 := p.cvtTuple(sig.Params())
results, cvt2 := p.cvtTuple(sig.Results()) results, cvt2 := p.cvtTuple(sig.Results())
if cvt1 || cvt2 || sig.Variadic() { if cvt1 || cvt2 {
// variadic always is false in raw type for Go function return types.NewSignatureType(nil, nil, nil, params, results, sig.Variadic())
return types.NewSignatureType(nil, nil, nil, params, results, false)
} }
return sig return sig
} }