all: rip out actually calling wizer; just leave runtime patches

Author: dgryski

builder/build.go

@@ -854,37 +854,6 @@ func Build(pkgName, outpath, tmpdir string, config *compileopts.Config) (BuildRe
 				}
 			}
 
-			if config.Options.WizerInit {
-				var args []string
-
-				resultWizer := result.Executable + "-wizer"
-
-				args = append(args,
-					"--allow-wasi",
-					"--wasm-bulk-memory=true",
-					"-f", "runtime.wizerInit",
-					result.Executable,
-					"-o", resultWizer,
-				)
-
-				if config.Options.PrintCommands != nil {
-					config.Options.PrintCommands(goenv.Get("WIZER"), args...)
-				}
-
-				cmd := exec.Command(goenv.Get("WIZER"), args...)
-				cmd.Stdout = os.Stdout
-				cmd.Stderr = os.Stderr
-
-				err := cmd.Run()
-				if err != nil {
-					return fmt.Errorf("wizer failed: %w", err)
-				}
-
-				if err := os.Rename(resultWizer, result.Executable); err != nil {
-					return fmt.Errorf("rename failed: %w", err)
-				}
-			}
-
 			// Print code size if requested.
 			if config.Options.PrintSizes == "short" || config.Options.PrintSizes == "full" {
 				packagePathMap := make(map[string]string, len(lprogram.Packages))

compileopts/options.go

@@ -53,7 +53,6 @@ type Options struct {
 	Monitor         bool
 	BaudRate        int
 	Timeout         time.Duration
-	WizerInit       bool
 }
 
 // Verify performs a validation on the given options, raising an error if options are not valid.

goenv/goenv.go

@@ -159,35 +159,6 @@ func Get(name string) string {
 		}
 
 		return findWasmOpt()
-
-	case "WIZER":
-		if path := os.Getenv("WIZER"); path != "" {
-			wizerBin := "wizer"
-			if runtime.GOOS == "windows" {
-				wizerBin += ".exe"
-			}
-
-			_, err := exec.LookPath(wizerBin)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "cannot use %q as wasm-opt (from WASMOPT environment variable): %s", path, err.Error())
-				os.Exit(1)
-			}
-
-			return path
-		}
-
-		wizerBin := "wizer"
-		if runtime.GOOS == "windows" {
-			wizerBin += ".exe"
-		}
-
-		path, err := exec.LookPath(wizerBin)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "cannot use %q as wizer: %s", path, err.Error())
-			os.Exit(1)
-		}
-		return path
-
 	default:
 		return ""
 	}

main.go

@@ -1440,7 +1440,6 @@ func main() {
 	cpuprofile := flag.String("cpuprofile", "", "cpuprofile output")
 	monitor := flag.Bool("monitor", false, "enable serial monitor")
 	baudrate := flag.Int("baudrate", 115200, "baudrate of serial monitor")
-	wizerInit := flag.Bool("wizer-init", false, "use wizer for package initialization")
 
 	// Internal flags, that are only intended for TinyGo development.
 	printIR := flag.Bool("internal-printir", false, "print LLVM IR")
@@ -1513,11 +1512,6 @@ func main() {
 		ocdCommands = strings.Split(*ocdCommandsString, ",")
 	}
 
-	if *wizerInit && *target != "wasip1" {
-		fmt.Fprintf(os.Stderr, "-wizer-init only makes sense with -target=wasip1, got -target=%q\n", *target)
-		os.Exit(1)
-	}
-
 	options := &compileopts.Options{
 		GOOS:            goenv.Get("GOOS"),
 		GOARCH:          goenv.Get("GOARCH"),
@@ -1550,7 +1544,6 @@ func main() {
 		Monitor:         *monitor,
 		BaudRate:        *baudrate,
 		Timeout:         *timeout,
-		WizerInit:       *wizerInit,
 	}
 
 	if *printCommands {

src/runtime/runtime_wasip1.go

@@ -19,7 +19,7 @@ func _start() {
 	run()
 }
 
-//export runtime.wizerInit
+//export runtime.initialize
 func runtimeInitialize() {
 	if runtimeInitialized {
 		// Second time initialization is happening. Refresh environment
@@ -32,10 +32,9 @@ func runtimeInitialize() {
 	heapStart = uintptr(unsafe.Pointer(&heapStartSymbol))
 	heapEnd = uintptr(wasm_memory_size(0) * wasmPageSize)
 	initHeap()
+	initAll()
 	if hasScheduler {
-		go initAll()
-	} else {
-		initAll()
+		go func() {}()
 	}
 	runtimeInitialized = true
 }