tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-21 04:49:04 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

compiler: return a FunctionType (not a PointerType) in getRawFuncType

Browse Source 
This is necessary for opaque pointer support (in LLVM 15).
This commit is contained in:
Ayke van Laethem
2022-09-20 23:59:22 +02:00
committed by Ron Evans
parent 65d65c1313
commit b79bf29c11
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/func.go
+2 -2
View File
@@ -62,7 +62,7 @@ func (b *builder) decodeFuncValue(funcValue llvm.Value, sig *types.Signature) (f
funcPtr = bitcast.Operand(0) funcPtr = bitcast.Operand(0)
return return
} }
llvmSig := b.getRawFuncType(sig) llvmSig := llvm.PointerType(b.getRawFuncType(sig), b.funcPtrAddrSpace)
funcPtr = b.CreateBitCast(bitcast, llvmSig, "") funcPtr = b.CreateBitCast(bitcast, llvmSig, "")
return return
} }
@@ -117,7 +117,7 @@ func (c *compilerContext) getRawFuncType(typ *types.Signature) llvm.Type {
paramTypes = append(paramTypes, c.i8ptrType) // context paramTypes = append(paramTypes, c.i8ptrType) // context
// Make a func type out of the signature. // Make a func type out of the signature.
return llvm.PointerType(llvm.FunctionType(returnType, paramTypes, false), c.funcPtrAddrSpace) return llvm.FunctionType(returnType, paramTypes, false)
} }
// parseMakeClosure makes a function value (with context) from the given // parseMakeClosure makes a function value (with context) from the given
compiler/interface.go
+1 -1
View File
@@ -465,7 +465,7 @@ func (c *compilerContext) getInvokeFunction(instr *ssa.CallCommon) llvm.Value {
paramTuple = append(paramTuple, sig.Params().At(i)) paramTuple = append(paramTuple, sig.Params().At(i))
} }
paramTuple = append(paramTuple, types.NewVar(token.NoPos, nil, "$typecode", types.Typ[types.Uintptr])) paramTuple = append(paramTuple, types.NewVar(token.NoPos, nil, "$typecode", types.Typ[types.Uintptr]))
llvmFnType := c.getRawFuncType(types.NewSignature(sig.Recv(), types.NewTuple(paramTuple...), sig.Results(), false)).ElementType() llvmFnType := c.getRawFuncType(types.NewSignature(sig.Recv(), types.NewTuple(paramTuple...), sig.Results(), false))
llvmFn = llvm.AddFunction(c.mod, fnName, llvmFnType) llvmFn = llvm.AddFunction(c.mod, fnName, llvmFnType)
c.addStandardDeclaredAttributes(llvmFn) c.addStandardDeclaredAttributes(llvmFn)
llvmFn.AddFunctionAttr(c.ctx.CreateStringAttribute("tinygo-invoke", c.getMethodSignatureName(instr.Method))) llvmFn.AddFunctionAttr(c.ctx.CreateStringAttribute("tinygo-invoke", c.getMethodSignatureName(instr.Method)))