Browse Source

compiler: remove unnecessary main.main call workaround

Since https://github.com/tinygo-org/tinygo/pull/1571 (in particular, the first
commit that sets the main package path), the main package is always named
"main". This makes the callMain() workaround in the runtime unnecessary and
allows directly calling the main.main function with a //go:linkname pragma.
pull/1593/head
Ayke van Laethem 4 years ago
committed by Ron Evans
parent
commit
92ed645a11
  1. 8
      compiler/compiler.go
  2. 3
      src/runtime/runtime.go

8
compiler/compiler.go

@ -297,14 +297,6 @@ func CompileProgram(pkgName string, lprogram *loader.Program, machine llvm.Targe
} }
irbuilder.CreateRetVoid() irbuilder.CreateRetVoid()
// Conserve for goroutine lowering. Without marking these as external, they
// would be optimized away.
realMain := c.mod.NamedFunction(lprogram.MainPkg().Pkg.Path() + ".main")
realMain.SetLinkage(llvm.ExternalLinkage) // keep alive until goroutine lowering
// Replace callMain placeholder with actual main function.
c.mod.NamedFunction("runtime.callMain").ReplaceAllUsesWith(realMain)
// Load some attributes // Load some attributes
getAttr := func(attrName string) llvm.Attribute { getAttr := func(attrName string) llvm.Attribute {
attrKind := llvm.AttributeKindID(attrName) attrKind := llvm.AttributeKindID(attrName)

3
src/runtime/runtime.go

@ -10,8 +10,7 @@ const Compiler = "tinygo"
// package. // package.
func initAll() func initAll()
// callMain is a placeholder for the program main function. //go:linkname callMain main.main
// All references to this are replaced with references to the program main function by the compiler.
func callMain() func callMain()
func GOMAXPROCS(n int) int { func GOMAXPROCS(n int) int {

Loading…
Cancel
Save