diff options
| -rw-r--r-- | compiler/llvmutil/llvm.go | 19 | ||||
| -rw-r--r-- | transform/stacksize.go | 22 |
2 files changed, 21 insertions, 20 deletions
diff --git a/compiler/llvmutil/llvm.go b/compiler/llvmutil/llvm.go index ca2777654..342746881 100644 --- a/compiler/llvmutil/llvm.go +++ b/compiler/llvmutil/llvm.go @@ -195,3 +195,22 @@ func SplitBasicBlock(builder llvm.Builder, afterInst llvm.Value, insertAfter llv return newBlock } + +// Append the given values to the llvm.used array. The values can be any pointer +// type, they will be bitcast to i8*. +func AppendToUsedGlobals(mod llvm.Module, values ...llvm.Value) { + if !mod.NamedGlobal("llvm.used").IsNil() { + // Sanity check. TODO: we don't emit such a global at the moment, but + // when we do we should append to it instead. + panic("todo: append to existing llvm.used") + } + i8ptrType := llvm.PointerType(mod.Context().Int8Type(), 0) + var castValues []llvm.Value + for _, value := range values { + castValues = append(castValues, llvm.ConstBitCast(value, i8ptrType)) + } + usedInitializer := llvm.ConstArray(i8ptrType, castValues) + used := llvm.AddGlobal(mod, usedInitializer.Type(), "llvm.used") + used.SetInitializer(usedInitializer) + used.SetLinkage(llvm.AppendingLinkage) +} diff --git a/transform/stacksize.go b/transform/stacksize.go index 169f1454c..44409c5f8 100644 --- a/transform/stacksize.go +++ b/transform/stacksize.go @@ -2,6 +2,7 @@ package transform import ( "github.com/tinygo-org/tinygo/compileopts" + "github.com/tinygo-org/tinygo/compiler/llvmutil" "tinygo.org/x/go-llvm" ) @@ -52,7 +53,7 @@ func CreateStackSizeLoads(mod llvm.Module, config *compileopts.Config) []string stackSizesGlobal.SetInitializer(llvm.ConstArray(functions[0].Type(), defaultStackSizes)) // Add all relevant values to llvm.used (for LTO). - appendToUsedGlobals(mod, append([]llvm.Value{stackSizesGlobal}, functionValues...)...) + llvmutil.AppendToUsedGlobals(mod, append([]llvm.Value{stackSizesGlobal}, functionValues...)...) // Replace the calls with loads from the new global with stack sizes. irbuilder := ctx.NewBuilder() @@ -72,22 +73,3 @@ func CreateStackSizeLoads(mod llvm.Module, config *compileopts.Config) []string return functionNames } - -// Append the given values to the llvm.used array. The values can be any pointer -// type, they will be bitcast to i8*. -func appendToUsedGlobals(mod llvm.Module, values ...llvm.Value) { - if !mod.NamedGlobal("llvm.used").IsNil() { - // Sanity check. TODO: we don't emit such a global at the moment, but - // when we do we should append to it instead. - panic("todo: append to existing llvm.used") - } - i8ptrType := llvm.PointerType(mod.Context().Int8Type(), 0) - var castValues []llvm.Value - for _, value := range values { - castValues = append(castValues, llvm.ConstBitCast(value, i8ptrType)) - } - usedInitializer := llvm.ConstArray(i8ptrType, castValues) - used := llvm.AddGlobal(mod, usedInitializer.Type(), "llvm.used") - used.SetInitializer(usedInitializer) - used.SetLinkage(llvm.AppendingLinkage) -} |