WIP: support rp2040

.circleci/config.yml

@@ -22,12 +22,12 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - llvm-source-14-v3
+            - llvm-source-14-v2
       - run:
           name: "Fetch LLVM source"
           command: make llvm-source
       - save_cache:
-          key: llvm-source-14-v3
+          key: llvm-source-14-v2
           paths:
             - llvm-project/clang/lib/Headers
             - llvm-project/clang/include
@@ -45,32 +45,29 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - binaryen-linux-v2
+            - binaryen-linux-v1
       - run:
           name: "Build Binaryen"
           command: |
             make binaryen
       - save_cache:
-          key: binaryen-linux-v2
+          key: binaryen-linux-v1
           paths:
             - build/wasm-opt
   test-linux:
     parameters:
       llvm:
         type: string
-      fmt-check:
-        type: boolean
-        default: true
     steps:
       - checkout
       - submodules
       - run:
           name: "Install apt dependencies"
           command: |
-            echo 'deb https://apt.llvm.org/buster/ llvm-toolchain-buster-<<parameters.llvm>> main' > /etc/apt/sources.list.d/llvm.list
-            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-            apt-get update
-            apt-get install --no-install-recommends -y \
+            echo 'deb https://apt.llvm.org/buster/ llvm-toolchain-buster-<<parameters.llvm>> main' | sudo tee /etc/apt/sources.list.d/llvm.list
+            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+            sudo apt-get update
+            sudo apt-get install --no-install-recommends \
                 llvm-<<parameters.llvm>>-dev \
                 clang-<<parameters.llvm>> \
                 libclang-<<parameters.llvm>>-dev \
@@ -83,48 +80,34 @@ commands:
       - build-binaryen-linux
       - restore_cache:
           keys:
-            - go-cache-v3-{{ checksum "go.mod" }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}
-            - go-cache-v3-{{ checksum "go.mod" }}
+            - go-cache-v2-{{ checksum "go.mod" }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}
+            - go-cache-v2-{{ checksum "go.mod" }}
       - llvm-source-linux
       - run: go install -tags=llvm<<parameters.llvm>> .
       - restore_cache:
           keys:
-            - wasi-libc-sysroot-systemclang-v6
+            - wasi-libc-sysroot-systemclang-v5
       - run: make wasi-libc
       - save_cache:
-          key: wasi-libc-sysroot-systemclang-v6
+          key: wasi-libc-sysroot-systemclang-v5
           paths:
             - lib/wasi-libc/sysroot
-      - when:
-          condition: <<parameters.fmt-check>>
-          steps:
-          - run:
-              # Do this before gen-device so that it doesn't check the
-              # formatting of generated files.
-              name: Check Go code formatting
-              command: make fmt-check
       - run: make gen-device -j4
       - run: make smoketest XTENSA=0
       - save_cache:
-          key: go-cache-v3-{{ checksum "go.mod" }}-{{ .Environment.CIRCLE_BUILD_NUM }}
+          key: go-cache-v2-{{ checksum "go.mod" }}-{{ .Environment.CIRCLE_BUILD_NUM }}
           paths:
             - ~/.cache/go-build
             - /go/pkg/mod
+      - run: make fmt-check
 
 jobs:
   test-llvm13-go116:
     docker:
-      - image: golang:1.16-buster
+      - image: circleci/golang:1.16-buster
     steps:
       - test-linux:
           llvm: "13"
-  test-llvm14-go119:
-    docker:
-      - image: golang:1.19beta1-buster
-    steps:
-      - test-linux:
-          llvm: "14"
-          fmt-check: false
 
 workflows:
   test-all:
@@ -132,6 +115,3 @@ workflows:
       # This tests our lowest supported versions of Go and LLVM, to make sure at
       # least the smoke tests still pass.
       - test-llvm13-go116
-      # This tests a beta version of Go. It should be removed once regular
-      # release builds are built using this version.
-      - test-llvm14-go119

.github/workflows/build-macos.yml

@@ -7,10 +7,6 @@ on:
       - dev
       - release
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build-macos:
     name: build-macos
@@ -71,7 +67,7 @@ jobs:
         uses: actions/cache@v2
         id: cache-wasi-libc
         with:
-          key: wasi-libc-sysroot-v4
+          key: wasi-libc-sysroot-v3
           path: lib/wasi-libc/sysroot
       - name: Build wasi-libc
         if: steps.cache-wasi-libc.outputs.cache-hit != 'true'

.github/workflows/docker.yml

@@ -7,10 +7,6 @@ on:
   push:
     branches: [ dev, fix-docker-llvm-build ]
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   push_to_registry:
     name: build-push-dev
@@ -55,20 +51,18 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-      - name: Trigger Drivers repo build on Github Actions
+      - name: Trigger Drivers repo build on CircleCI
         run: |
-          curl -X POST \
-          -H "Authorization: Bearer ${{secrets.GHA_ACCESS_TOKEN}}" \
-          -H "Accept: application/vnd.github.v3+json" \
-          https://api.github.com/repos/tinygo-org/drivers/actions/workflows/build.yml/dispatches \
-          -d '{"ref": "dev"}'
-      - name: Trigger Bluetooth repo build on Github Actions
+          curl --location --request POST 'https://circleci.com/api/v2/project/github/tinygo-org/drivers/pipeline' \
+            --header 'Content-Type: application/json' \
+            -d '{"branch": "dev"}' \
+            -u "${{ secrets.CIRCLECI_API_TOKEN }}"
+      - name: Trigger Bluetooth repo build on CircleCI
         run: |
-          curl -X POST \
-          -H "Authorization: Bearer ${{secrets.GHA_ACCESS_TOKEN}}" \
-          -H "Accept: application/vnd.github.v3+json" \
-          https://api.github.com/repos/tinygo-org/bluetooth/actions/workflows/linux.yml/dispatches \
-          -d '{"ref": "dev"}'
+          curl --location --request POST 'https://circleci.com/api/v2/project/github/tinygo-org/bluetooth/pipeline' \
+            --header 'Content-Type: application/json' \
+            -d '{"branch": "dev"}' \
+            -u "${{ secrets.CIRCLECI_API_TOKEN }}"
       - name: Trigger TinyFS repo build on CircleCI
         run: |
           curl --location --request POST 'https://circleci.com/api/v2/project/github/tinygo-org/tinyfs/pipeline' \

.github/workflows/linux.yml

@@ -7,32 +7,22 @@ on:
       - dev
       - release
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build-linux:
     # Build Linux binaries, ready for release.
-    # This runs inside an Alpine Linux container so we can more easily create a
-    # statically linked binary.
-    runs-on: ubuntu-latest
-    container:
-      image: alpine:3.16
+    # This intentionally uses an older Linux image, so that we compile against
+    # an older glibc version and therefore are compatible with a wide range of
+    # Linux distributions.
+    runs-on: ubuntu-18.04
     steps:
-      - name: Install apk dependencies
-        # tar: needed for actions/cache@v2
-        # git+openssh: needed for checkout (I think?)
-        # gcompat: needed for go binary
-        # ruby: needed to install fpm
-        run: apk add tar git openssh gcompat make g++ ruby
-      - name: Work around CVE-2022-24765
-        # We're not on a multi-user machine, so this is safe.
-        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Checkout
         uses: actions/checkout@v2
         with:
           submodules: true
+      - name: Install apt dependencies
+        run: |
+          sudo apt-get install --no-install-recommends \
+              ninja-build
       - name: Install Go
         uses: actions/setup-go@v2
         with:
@@ -40,7 +30,7 @@ jobs:
       - name: Cache Go
         uses: actions/cache@v2
         with:
-          key: go-cache-linux-alpine-v1-${{ hashFiles('go.mod') }}
+          key: go-cache-linux-v1-${{ hashFiles('go.mod') }}
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
@@ -48,7 +38,7 @@ jobs:
         uses: actions/cache@v2
         id: cache-llvm-source
         with:
-          key: llvm-source-14-linux-alpine-v1
+          key: llvm-source-14-linux-v2
           path: |
             llvm-project/clang/lib/Headers
             llvm-project/clang/include
@@ -62,7 +52,7 @@ jobs:
         uses: actions/cache@v2
         id: cache-llvm-build
         with:
-          key: llvm-build-14-linux-alpine-v1
+          key: llvm-build-14-linux-v1
           path: llvm-build
       - name: Build LLVM
         if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -70,8 +60,6 @@ jobs:
           # fetch LLVM source
           rm -rf llvm-project
           make llvm-source
-          # install dependencies
-          apk add cmake samurai python3
           # build!
           make llvm-build
           # Remove unnecessary object files (to reduce cache size).
@@ -80,29 +68,26 @@ jobs:
         uses: actions/cache@v2
         id: cache-binaryen
         with:
-          key: binaryen-linux-alpine-v1
+          key: binaryen-linux-v1
           path: build/wasm-opt
       - name: Build Binaryen
         if: steps.cache-binaryen.outputs.cache-hit != 'true'
-        run: |
-          apk add cmake samurai python3
-          make binaryen STATIC=1
+        run: make binaryen
       - name: Cache wasi-libc
         uses: actions/cache@v2
         id: cache-wasi-libc
         with:
-          key: wasi-libc-sysroot-linux-alpine-v1
+          key: wasi-libc-sysroot-linux-asserts-v4
           path: lib/wasi-libc/sysroot
       - name: Build wasi-libc
         if: steps.cache-wasi-libc.outputs.cache-hit != 'true'
         run: make wasi-libc
       - name: Install fpm
         run: |
-          gem install --version 2.7.6 dotenv
-          gem install --no-document fpm
+          sudo gem install --no-document fpm
       - name: Build TinyGo release
         run: |
-          make release deb -j3 STATIC=1
+          make release deb -j3
           cp -p build/release.tar.gz /tmp/tinygo.linux-amd64.tar.gz
           cp -p build/release.deb    /tmp/tinygo_amd64.deb
       - name: Publish release artifact
@@ -178,7 +163,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '12'
       - name: Install wasmtime
         run: |
           curl https://wasmtime.dev/install.sh -sSf | bash
@@ -233,7 +218,7 @@ jobs:
         uses: actions/cache@v2
         id: cache-wasi-libc
         with:
-          key: wasi-libc-sysroot-linux-asserts-v5
+          key: wasi-libc-sysroot-linux-asserts-v4
           path: lib/wasi-libc/sysroot
       - name: Build wasi-libc
         if: steps.cache-wasi-libc.outputs.cache-hit != 'true'
@@ -272,7 +257,6 @@ jobs:
         uses: actions/checkout@v2
       - name: Install apt dependencies
         run: |
-          sudo apt-get update
           sudo apt-get install --no-install-recommends \
               qemu-user \
               g++-arm-linux-gnueabihf \
@@ -334,7 +318,6 @@ jobs:
           make CROSS=arm-linux-gnueabihf binaryen
       - name: Install fpm
         run: |
-          sudo gem install --version 2.7.6 dotenv
           sudo gem install --no-document fpm
       - name: Build TinyGo binary
         run: |
@@ -376,7 +359,6 @@ jobs:
         uses: actions/checkout@v2
       - name: Install apt dependencies
         run: |
-          sudo apt-get update
           sudo apt-get install --no-install-recommends \
               qemu-user \
               g++-aarch64-linux-gnu \
@@ -436,7 +418,6 @@ jobs:
           make CROSS=aarch64-linux-gnu binaryen
       - name: Install fpm
         run: |
-          sudo gem install --version 2.7.6 dotenv
           sudo gem install --no-document fpm
       - name: Build TinyGo binary
         run: |

.github/workflows/windows.yml

@@ -7,10 +7,6 @@ on:
       - dev
       - release
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build-windows:
     runs-on: windows-2022
@@ -55,7 +51,7 @@ jobs:
         uses: actions/cache@v2
         id: cache-llvm-build
         with:
-          key: llvm-build-14-windows-v2
+          key: llvm-build-14-windows-v1
           path: llvm-build
       - name: Build LLVM
         if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -65,14 +61,14 @@ jobs:
           rm -rf llvm-project
           make llvm-source
           # build!
-          make llvm-build CCACHE=OFF
+          make llvm-build
           # Remove unnecessary object files (to reduce cache size).
           find llvm-build -name CMakeFiles -prune -exec rm -r '{}' \;
       - name: Cache wasi-libc sysroot
         uses: actions/cache@v2
         id: cache-wasi-libc
         with:
-          key: wasi-libc-sysroot-v4
+          key: wasi-libc-sysroot-v3
           path: lib/wasi-libc/sysroot
       - name: Build wasi-libc
         if: steps.cache-wasi-libc.outputs.cache-hit != 'true'
@@ -84,7 +80,6 @@ jobs:
         shell: bash
         run: make test GOTESTFLAGS="-v -short"
       - name: Build TinyGo release tarball
-        shell: bash
         run: make build/release -j4
       - name: Make release artifact
         shell: bash

.gitignore

@@ -23,7 +23,6 @@ llvm-project
 build/*
 
 # Ignore files generated by smoketest
-test
 test.bin
 test.elf
 test.exe
@@ -31,4 +30,4 @@ test.gba
 test.hex
 test.nro
 test.wasm
-wasm.wasm
+wasm.wasm

CHANGELOG.md

@@ -1,55 +1,3 @@
-0.24.0
----
-
-* **command line**
-  - remove support for go 1.15
-  - remove support for LLVM 11 and LLVM 12
-  - add initial Go 1.19 beta support
-  - `test`: fix package/... syntax
-* **compiler**
-  - add support for the embed package
-  - `builder`: improve error message for "command not found"
-  - `builder`: add support for ThinLTO on MacOS and Windows
-  - `builder`: free LLVM objects after use, to reduce memory leaking
-  - `builder`: improve `-no-debug` error messages
-  - `cgo`: be more strict: CGo now requires every Go file to import the headers it needs
-  - `compiler`: alignof(func) is 1 pointer, not 2
-  - `compiler`: add support for type parameters (aka generics)
-  - `compiler`: implement `recover()` built-in function
-  - `compiler`: support atomic, volatile, and LLVM memcpy-like functions in defer
-  - `compiler`: drop support for macos syscalls via inline assembly
-  - `interp`: do not try to interpret past task.Pause()
-  - `interp`: fix some buggy localValue handling
-  - `interp`: do not unroll loops
-  - `transform`: fix MakeGCStackSlots that caused a possible GC bug on WebAssembly
-* **standard library**
-  - `os`: enable os.Stdin for baremetal target
-  - `reflect`: add `Value.UnsafePointer` method
-  - `runtime`: scan GC globals conservatively on Windows, MacOS, Linux and Nintendo Switch
-  - `runtime`: add per-map hash seeds
-  - `runtime`: handle nil map write panics
-  - `runtime`: add stronger hash functions
-  - `syscall`: implement `Getpagesize`
-* **targets**
-  - `atmega2560`: support UART1-3 + example for uart
-  - `avr`: use compiler-rt for improved float64 support
-  - `avr`: simplify timer-based time
-  - `avr`: fix race condition in stack write
-  - `darwin`: add support for `GOARCH=arm64` (aka Apple Silicon)
-  - `darwin`: support `-size=short` and `-size=full` flag
-  - `rp2040`: replace sleep 'busy loop' with timer alarm
-  - `rp2040`: align api for `PortMaskSet`, `PortMaskClear`
-  - `rp2040`: fix GPIO interrupts
-  - `samd21`, `samd51`, `nrf52840`: add support for USBHID (keyboard / mouse)
-  - `wasm`: update wasi-libc version
-  - `wasm`: use newer WebAssembly features
-* **boards**
-  - add Badger 2040
-  - `matrixportal-m4`: attach USB DP to the correct pin
-  - `teensy40`: add I2C support
-  - `wioterminal`: fix I2C definition
-
-
 0.23.0
 ---
 

Makefile

@@ -38,16 +38,10 @@ MD5SUM = md5sum
 # tinygo binary for tests
 TINYGO ?= $(call detect,tinygo,tinygo $(CURDIR)/build/tinygo)
 
-# Check for ccache if the user hasn't set it to on or off.
-ifeq (, $(CCACHE))
-    # Use CCACHE for LLVM if possible
-    ifneq (, $(shell command -v ccache 2> /dev/null))
-        CCACHE := ON
-    else
-        CCACHE := OFF
-    endif
+# Use CCACHE for LLVM if possible
+ifneq (, $(shell command -v ccache 2> /dev/null))
+    LLVM_OPTION += '-DLLVM_CCACHE_BUILD=ON'
 endif
-LLVM_OPTION += '-DLLVM_CCACHE_BUILD=$(CCACHE)'
 
 # Allow enabling LLVM assertions
 ifeq (1, $(ASSERT))
@@ -56,23 +50,6 @@ else
     LLVM_OPTION += '-DLLVM_ENABLE_ASSERTIONS=OFF'
 endif
 
-ifeq (1, $(STATIC))
-    # Build TinyGo as a fully statically linked binary (no dynamically loaded
-    # libraries such as a libc). This is not supported with glibc which is used
-    # on most major Linux distributions. However, it is supported in Alpine
-    # Linux with musl.
-    CGO_LDFLAGS += -static
-    # Also set the thread stack size to 1MB. This is necessary on musl as the
-    # default stack size is 128kB and LLVM uses more than that.
-    # For more information, see:
-    # https://wiki.musl-libc.org/functional-differences-from-glibc.html#Thread-stack-size
-    CGO_LDFLAGS += -Wl,-z,stack-size=1048576
-    # Build wasm-opt with static linking.
-    # For details, see:
-    # https://github.com/WebAssembly/binaryen/blob/version_102/.github/workflows/ci.yml#L181
-    BINARYEN_OPTION += -DCMAKE_CXX_FLAGS="-static" -DCMAKE_C_FLAGS="-static"
-endif
-
 # Cross compiling support.
 ifneq ($(CROSS),)
     CC = $(CROSS)-gcc
@@ -173,7 +150,7 @@ endif
 clean:
 	@rm -rf build
 
-FMT_PATHS = ./*.go builder cgo/*.go compiler interp loader src transform
+FMT_PATHS = ./*.go builder cgo compiler interp loader src/device/arm src/examples src/machine src/os src/reflect src/runtime src/sync src/syscall src/testing src/internal/reflectlite transform
 fmt:
 	@gofmt -l -w $(FMT_PATHS)
 fmt-check:
@@ -257,15 +234,15 @@ endif
 wasi-libc: lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a
 lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a:
 	@if [ ! -e lib/wasi-libc/Makefile ]; then echo "Submodules have not been downloaded. Please download them using:\n  git submodule update --init"; exit 1; fi
-	cd lib/wasi-libc && make -j4 WASM_CFLAGS="-O2 -g -DNDEBUG -mnontrapping-fptoint -msign-ext" MALLOC_IMPL=none CC=$(CLANG) AR=$(LLVM_AR) NM=$(LLVM_NM)
+	cd lib/wasi-libc && make -j4 WASM_CFLAGS="-O2 -g -DNDEBUG" MALLOC_IMPL=none WASM_CC=$(CLANG) WASM_AR=$(LLVM_AR) WASM_NM=$(LLVM_NM)
 
 
 # Build the Go compiler.
 tinygo:
 	@if [ ! -f "$(LLVM_BUILDDIR)/bin/llvm-config" ]; then echo "Fetch and build LLVM first by running:"; echo "  make llvm-source"; echo "  make $(LLVM_BUILDDIR)"; exit 1; fi
-	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GOENVFLAGS) $(GO) build -buildmode exe -o build/tinygo$(EXE) -tags "byollvm osusergo" -ldflags="-X github.com/tinygo-org/tinygo/goenv.GitSha1=`git rev-parse --short HEAD`" .
+	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GOENVFLAGS) $(GO) build -buildmode exe -o build/tinygo$(EXE) -tags byollvm -ldflags="-X github.com/tinygo-org/tinygo/goenv.GitSha1=`git rev-parse --short HEAD`" .
 test: wasi-libc
-	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=20m -buildmode exe -tags "byollvm osusergo" ./builder ./cgo ./compileopts ./compiler ./interp ./transform .
+	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=20m -buildmode exe -tags byollvm ./builder ./cgo ./compileopts ./compiler ./interp ./transform .
 
 # Standard library packages that pass tests on darwin, linux, wasi, and windows, but take over a minute in wasi
 TEST_PACKAGES_SLOW = \
@@ -330,14 +307,11 @@ TEST_PACKAGES_LINUX := \
 	archive/zip \
 	compress/flate \
 	compress/lzw \
-	crypto/hmac \
 	debug/dwarf \
 	debug/plan9obj \
 	io/fs \
 	io/ioutil \
-	strconv \
-	testing/fstest \
-	text/template/parse
+	testing/fstest
 
 TEST_PACKAGES_DARWIN := $(TEST_PACKAGES_LINUX)
 
@@ -454,14 +428,14 @@ ifneq ($(WASM), 0)
 	@$(MD5SUM) test.wasm
 	$(TINYGO) build -size short -o test.wasm -tags=reelboard            examples/blinky1
 	@$(MD5SUM) test.wasm
-	$(TINYGO) build -size short -o test.wasm -tags=microbit             examples/microbit-blink
+	$(TINYGO) build -size short -o test.wasm -tags=pca10040             examples/blinky2
+	@$(MD5SUM) test.wasm
+	$(TINYGO) build -size short -o test.wasm -tags=pca10056             examples/blinky2
 	@$(MD5SUM) test.wasm
 	$(TINYGO) build -size short -o test.wasm -tags=circuitplay_express  examples/blinky1
 	@$(MD5SUM) test.wasm
 	$(TINYGO) build -size short -o test.wasm -tags=circuitplay_bluefruit examples/blinky1
 	@$(MD5SUM) test.wasm
-	$(TINYGO) build -size short -o test.wasm -tags=mch2022              examples/serial
-	@$(MD5SUM) test.wasm
 endif
 	# test all targets/boards
 	$(TINYGO) build -size short -o test.hex -target=pca10040-s132v6     examples/blinky1
@@ -580,14 +554,6 @@ endif
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=macropad-rp2040 	examples/blinky1
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=badger2040          examples/blinky1
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=thingplus-rp2040    examples/blinky1
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=xiao-rp2040         examples/blinky1
-	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=challenger-rp2040    examples/blinky1
-	@$(MD5SUM) test.hex
 	# test pwm
 	$(TINYGO) build -size short -o test.hex -target=itsybitsy-m0        examples/pwm
 	@$(MD5SUM) test.hex
@@ -595,13 +561,11 @@ endif
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=feather-m4          examples/pwm
 	@$(MD5SUM) test.hex
-	# test usb
+	# test usbhid
 	$(TINYGO) build -size short -o test.hex -target=feather-nrf52840    examples/hid-keyboard
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=circuitplay-express examples/hid-keyboard
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=feather-nrf52840    examples/usb-midi
-	@$(MD5SUM) test.hex
 ifneq ($(STM32), 0)
 	$(TINYGO) build -size short -o test.hex -target=bluepill            examples/blinky1
 	@$(MD5SUM) test.hex
@@ -665,8 +629,6 @@ ifneq ($(XTENSA), 0)
 	@$(MD5SUM) test.bin
 	$(TINYGO) build -size short -o test.bin -target m5stack             examples/serial
 	@$(MD5SUM) test.bin
-	$(TINYGO) build -size short -o test.bin -target mch2022             examples/serial
-	@$(MD5SUM) test.bin
 endif
 	$(TINYGO) build -size short -o test.bin -target=esp32c3           	examples/serial
 	@$(MD5SUM) test.bin

README.md

@@ -43,7 +43,7 @@ See the [getting started instructions](https://tinygo.org/getting-started/) for
 
 You can compile TinyGo programs for microcontrollers, WebAssembly and Linux.
 
-The following 88 microcontroller boards are currently supported:
+The following 85 microcontroller boards are currently supported:
 
 * [Adafruit Circuit Playground Bluefruit](https://www.adafruit.com/product/4333)
 * [Adafruit Circuit Playground Express](https://www.adafruit.com/product/3333)
@@ -89,13 +89,11 @@ The following 88 microcontroller boards are currently supported:
 * [ESP8266 - d1mini](https://www.espressif.com/en/products/socs/esp8266)
 * [ESP8266 - NodeMCU](https://www.espressif.com/en/products/socs/esp8266)
 * [Game Boy Advance](https://en.wikipedia.org/wiki/Game_Boy_Advance)
-* [iLabs Challenger RP2040 LoRa](https://ilabs.se/product/challenger-rp2040-lora/)
 * [M5Stack](https://docs.m5stack.com/en/core/basic)
 * [M5Stack Core2](https://shop.m5stack.com/products/m5stack-core2-esp32-iot-development-kit)
 * [M5Stamp C3](https://docs.m5stack.com/en/core/stamp_c3)
 * [Makerdiary nRF52840-MDK](https://wiki.makerdiary.com/nrf52840-mdk/)
 * [Makerdiary nRF52840-MDK USB Dongle](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/)
-* [MCH2022 badge](https://badge.team/docs/badges/mch2022/)
 * [Microchip SAM E54 Xplained Pro](https://www.microchip.com/developmenttools/productdetails/atsame54-xpro)
 * [nice!nano](https://docs.nicekeyboards.com/#/nice!nano/)
 * [Nintendo Switch](https://www.nintendo.com/switch/)
@@ -107,7 +105,6 @@ The following 88 microcontroller boards are currently supported:
 * [Particle Boron](https://docs.particle.io/datasheets/cellular/boron-datasheet/)
 * [Particle Xenon](https://docs.particle.io/datasheets/discontinued/xenon-datasheet/)
 * [Phytec reel board](https://www.phytec.eu/product-eu/internet-of-things/reelboard/)
-* [Pimoroni Badger2040](https://shop.pimoroni.com/products/badger-2040)
 * [PineTime DevKit](https://www.pine64.org/pinetime/)
 * [PJRC Teensy 3.6](https://www.pjrc.com/store/teensy36.html)
 * [PJRC Teensy 4.0](https://www.pjrc.com/store/teensy40.html)
@@ -117,7 +114,6 @@ The following 88 microcontroller boards are currently supported:
 * [Raytac MDBT50Q-RX Dongle (with TinyUF2 bootloader)](https://www.adafruit.com/product/5199)
 * [Seeed Seeeduino XIAO](https://www.seeedstudio.com/Seeeduino-XIAO-Arduino-Microcontroller-SAMD21-Cortex-M0+-p-4426.html)
 * [Seeed XIAO BLE](https://www.seeedstudio.com/Seeed-XIAO-BLE-nRF52840-p-5201.html)
-* [Seeed XIAO RP2040](https://www.seeedstudio.com/XIAO-RP2040-v1-0-p-5026.html)
 * [Seeed LoRa-E5 Development Kit](https://www.seeedstudio.com/LoRa-E5-Dev-Kit-p-4868.html)
 * [Seeed Sipeed MAix BiT](https://www.seeedstudio.com/Sipeed-MAix-BiT-for-RISC-V-AI-IoT-p-2872.html)
 * [Seeed Wio Terminal](https://www.seeedstudio.com/Wio-Terminal-p-4509.html)

builder/config.go

@@ -33,8 +33,8 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
 	if err != nil {
 		return nil, fmt.Errorf("could not read version from GOROOT (%v): %v", goroot, err)
 	}
-	if major != 1 || minor < 16 || minor > 19 {
-		return nil, fmt.Errorf("requires go version 1.16 through 1.19, got go%d.%d", major, minor)
+	if major != 1 || minor < 16 || minor > 18 {
+		return nil, fmt.Errorf("requires go version 1.16 through 1.18, got go%d.%d", major, minor)
 	}
 
 	clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))

builder/sizes.go

@@ -127,7 +127,7 @@ var (
 // readProgramSizeFromDWARF reads the source location for each line of code and
 // each variable in the program, as far as this is stored in the DWARF debug
 // information.
-func readProgramSizeFromDWARF(data *dwarf.Data, codeOffset uint64, skipTombstone bool) ([]addressLine, error) {
+func readProgramSizeFromDWARF(data *dwarf.Data, codeOffset uint64) ([]addressLine, error) {
 	r := data.Reader()
 	var lines []*dwarf.LineFile
 	var addresses []addressLine
@@ -169,7 +169,7 @@ func readProgramSizeFromDWARF(data *dwarf.Data, codeOffset uint64, skipTombstone
 					return nil, err
 				}
 
-				if prevLineEntry.EndSequence && lineEntry.Address == 0 && skipTombstone {
+				if prevLineEntry.EndSequence && lineEntry.Address == 0 {
 					// Tombstone value. This symbol has been removed, for
 					// example by the --gc-sections linker flag. It is still
 					// here in the debug information because the linker can't
@@ -178,10 +178,6 @@ func readProgramSizeFromDWARF(data *dwarf.Data, codeOffset uint64, skipTombstone
 					// skipped.
 					// For more details, see (among others):
 					// https://reviews.llvm.org/D84825
-					// The value 0 can however really occur in object files,
-					// that typically start at address 0. So don't skip
-					// tombstone values in object files (like when parsing MachO
-					// files).
 					for {
 						err := lr.Next(&lineEntry)
 						if err != nil {
@@ -260,65 +256,6 @@ func readProgramSizeFromDWARF(data *dwarf.Data, codeOffset uint64, skipTombstone
 	return addresses, nil
 }
 
-// Read a MachO object file and return a line table.
-// Also return an index from symbol name to start address in the line table.
-func readMachOSymbolAddresses(path string) (map[string]int, []addressLine, error) {
-	// Some constants from mach-o/nlist.h
-	// See: https://opensource.apple.com/source/xnu/xnu-7195.141.2/EXTERNAL_HEADERS/mach-o/nlist.h.auto.html
-	const (
-		N_STAB = 0xe0
-		N_TYPE = 0x0e // bitmask for N_TYPE field
-		N_SECT = 0xe  // one of the possible type in the N_TYPE field
-	)
-
-	// Read DWARF from the given object file.
-	file, err := macho.Open(path)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer file.Close()
-	dwarf, err := file.DWARF()
-	if err != nil {
-		return nil, nil, err
-	}
-	lines, err := readProgramSizeFromDWARF(dwarf, 0, false)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// Make a map from start addresses to indices in the line table (because the
-	// line table is a slice, not a map).
-	addressToLine := make(map[uint64]int, len(lines))
-	for i, line := range lines {
-		if _, ok := addressToLine[line.Address]; ok {
-			addressToLine[line.Address] = -1
-			continue
-		}
-		addressToLine[line.Address] = i
-	}
-
-	// Make a map that for each symbol gives the start index in the line table.
-	addresses := make(map[string]int, len(addressToLine))
-	for _, symbol := range file.Symtab.Syms {
-		if symbol.Type&N_STAB != 0 {
-			continue // STABS entry, ignore
-		}
-		if symbol.Type&0x0e != N_SECT {
-			continue // undefined symbol
-		}
-		if index, ok := addressToLine[symbol.Value]; ok && index >= 0 {
-			if _, ok := addresses[symbol.Name]; ok {
-				// There is a duplicate. Mark it as unavailable.
-				addresses[symbol.Name] = -1
-				continue
-			}
-			addresses[symbol.Name] = index
-		}
-	}
-
-	return addresses, lines, nil
-}
-
 // loadProgramSize calculate a program/data size breakdown of each package for a
 // given ELF file.
 // If the file doesn't contain DWARF debug information, the returned program
@@ -341,7 +278,7 @@ func loadProgramSize(path string, packagePathMap map[string]string) (*programSiz
 		// Read DWARF information. The error is intentionally ignored.
 		data, _ := file.DWARF()
 		if data != nil {
-			addresses, err = readProgramSizeFromDWARF(data, 0, true)
+			addresses, err = readProgramSizeFromDWARF(data, 0)
 			if err != nil {
 				// However, _do_ report an error here. Something must have gone
 				// wrong while trying to parse DWARF data.
@@ -433,6 +370,11 @@ func loadProgramSize(path string, packagePathMap map[string]string) (*programSiz
 			}
 		}
 	} else if file, err := macho.NewFile(f); err == nil {
+		// TODO: read DWARF information. On MacOS, DWARF debug information isn't
+		// stored in the executable but stays in the object files. The
+		// executable does however contain the object file paths that contain
+		// debug information.
+
 		// Read segments, for use while reading through sections.
 		segments := map[string]*macho.Segment{}
 		for _, load := range file.Loads {
@@ -479,86 +421,11 @@ func loadProgramSize(path string, packagePathMap map[string]string) (*programSiz
 				})
 			}
 		}
-
-		// Read DWARF information.
-		// The data isn't stored directly in the binary as in most executable
-		// formats. Instead, it is left in the object files that were used as a
-		// basis for linking. The executable does however contain STABS debug
-		// information that points to the source object file and is used by
-		// debuggers.
-		// For more information:
-		// http://wiki.dwarfstd.org/index.php?title=Apple%27s_%22Lazy%22_DWARF_Scheme
-		var objSymbolNames map[string]int
-		var objAddresses []addressLine
-		var previousSymbol macho.Symbol
-		for _, symbol := range file.Symtab.Syms {
-			// STABS constants, from mach-o/stab.h:
-			// https://opensource.apple.com/source/xnu/xnu-7195.141.2/EXTERNAL_HEADERS/mach-o/stab.h.auto.html
-			const (
-				N_GSYM  = 0x20
-				N_FUN   = 0x24
-				N_STSYM = 0x26
-				N_SO    = 0x64
-				N_OSO   = 0x66
-			)
-			if symbol.Type == N_OSO {
-				// Found an object file. Now try to parse it.
-				objSymbolNames, objAddresses, err = readMachOSymbolAddresses(symbol.Name)
-				if err != nil && sizesDebug {
-					// Errors are normally ignored. If there is an error, it's
-					// simply treated as that the DWARF is not available.
-					fmt.Fprintf(os.Stderr, "could not read DWARF from file %s: %s\n", symbol.Name, err)
-				}
-			} else if symbol.Type == N_FUN {
-				// Found a function.
-				// The way this is encoded is a bit weird. MachO symbols don't
-				// have a length. What I've found is that the length is encoded
-				// by first having a N_FUN symbol as usual, and then having a
-				// symbol with a zero-length name that has the value not set to
-				// the address of the symbol but to the length. So in order to
-				// get both the address and the length, we look for a symbol
-				// with a name followed by a symbol without a name.
-				if symbol.Name == "" && previousSymbol.Type == N_FUN && previousSymbol.Name != "" {
-					// Functions are encoded as many small chunks in the line
-					// table (one or a few instructions per source line). But
-					// the symbol length covers the whole symbols, over many
-					// lines and possibly including inlined functions. So we
-					// continue to iterate through the objAddresses slice until
-					// we've found all the source lines that are part of this
-					// symbol.
-					address := previousSymbol.Value
-					length := symbol.Value
-					if index, ok := objSymbolNames[previousSymbol.Name]; ok && index >= 0 {
-						for length > 0 {
-							line := objAddresses[index]
-							line.Address = address
-							if line.Length > length {
-								// Line extends beyond the end of te symbol?
-								// Weird, shouldn't happen.
-								break
-							}
-							addresses = append(addresses, line)
-							index++
-							length -= line.Length
-							address += line.Length
-						}
-					}
-				}
-			} else if symbol.Type == N_GSYM || symbol.Type == N_STSYM {
-				// Global variables.
-				if index, ok := objSymbolNames[symbol.Name]; ok {
-					address := objAddresses[index]
-					address.Address = symbol.Value
-					addresses = append(addresses, address)
-				}
-			}
-			previousSymbol = symbol
-		}
 	} else if file, err := pe.NewFile(f); err == nil {
 		// Read DWARF information. The error is intentionally ignored.
 		data, _ := file.DWARF()
 		if data != nil {
-			addresses, err = readProgramSizeFromDWARF(data, 0, true)
+			addresses, err = readProgramSizeFromDWARF(data, 0)
 			if err != nil {
 				// However, _do_ report an error here. Something must have gone
 				// wrong while trying to parse DWARF data.
@@ -628,9 +495,9 @@ func loadProgramSize(path string, packagePathMap map[string]string) (*programSiz
 		const codeOffset = 0x8000_0000_0000_0000
 
 		// Read DWARF information. The error is intentionally ignored.
-		data, _ := file.DWARF()
+		data, err := file.DWARF()
 		if data != nil {
-			addresses, err = readProgramSizeFromDWARF(data, codeOffset, true)
+			addresses, err = readProgramSizeFromDWARF(data, codeOffset)
 			if err != nil {
 				// However, _do_ report an error here. Something must have gone
 				// wrong while trying to parse DWARF data.

cgo/libclang.go

@@ -13,13 +13,10 @@ import (
 	"strconv"
 	"strings"
 	"unsafe"
-
-	"tinygo.org/x/go-llvm"
 )
 
 /*
 #include <clang-c/Index.h> // If this fails, libclang headers aren't available. Please take a look here: https://tinygo.org/docs/guides/build/
-#include <llvm/Config/llvm-config.h>
 #include <stdlib.h>
 #include <stdint.h>
 
@@ -79,16 +76,6 @@ var diagnosticSeverity = [...]string{
 // theory decoupled from Clang) can also use this type.
 type clangCursor = C.GoCXCursor
 
-func init() {
-	// Check that we haven't messed up LLVM versioning.
-	// This can happen when llvm_config_*.go files in either this or the
-	// tinygo.org/x/go-llvm packages is incorrect. It should not ever happen
-	// with byollvm.
-	if C.LLVM_VERSION_STRING != llvm.Version {
-		panic("incorrect build: using LLVM version " + llvm.Version + " in the tinygo.org/x/llvm package, and version " + C.LLVM_VERSION_STRING + " in the ./cgo package")
-	}
-}
-
 func (f *cgoFile) readNames(fragment string, cflags []string, filename string, callback func(map[string]clangCursor)) {
 	index := C.clang_createIndex(0, 0)
 	defer C.clang_disposeIndex(index)

cgo/libclang_config_llvm13.go

@@ -1,5 +1,5 @@
-//go:build !byollvm && llvm13
-// +build !byollvm,llvm13
+//go:build !byollvm && !llvm14
+// +build !byollvm,!llvm14
 
 package cgo
 

cgo/libclang_config_llvm14.go

@@ -1,5 +1,5 @@
-//go:build !byollvm && !llvm13
-// +build !byollvm,!llvm13
+//go:build !byollvm && llvm14
+// +build !byollvm,llvm14
 
 package cgo
 

compileopts/target.go

@@ -302,7 +302,7 @@ func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) {
 			// systems so we need separate assembly files.
 			suffix = "_windows"
 		}
-		spec.ExtraFiles = append(spec.ExtraFiles, "src/runtime/asm_"+goarch+suffix+".S")
+		spec.ExtraFiles = append(spec.ExtraFiles, "src/runtime/gc_"+goarch+suffix+".S")
 		spec.ExtraFiles = append(spec.ExtraFiles, "src/internal/task/task_stack_"+goarch+suffix+".S")
 	}
 	if goarch != runtime.GOARCH {

compiler/alias.go

@@ -86,7 +86,7 @@ func (b *builder) createAlias(alias llvm.Value) {
 		pos := b.program.Fset.Position(b.fn.Pos())
 		b.SetCurrentDebugLocation(uint(pos.Line), uint(pos.Column), b.difunc, llvm.Metadata{})
 	}
-	entryBlock := b.ctx.AddBasicBlock(b.llvmFn, "entry")
+	entryBlock := llvm.AddBasicBlock(b.llvmFn, "entry")
 	b.SetInsertPointAtEnd(entryBlock)
 	if b.llvmFn.Type() != alias.Type() {
 		b.addError(b.fn.Pos(), "alias function should have the same type as aliasee "+alias.Name())

compiler/asserts.go

@@ -240,10 +240,8 @@ func (b *builder) createRuntimeAssert(assert llvm.Value, blockPrefix, assertFunc
 		}
 	}
 
-	// Put the fault block at the end of the function and the next block at the
-	// current insert position.
 	faultBlock := b.ctx.AddBasicBlock(b.llvmFn, blockPrefix+".throw")
-	nextBlock := b.insertBasicBlock(blockPrefix + ".next")
+	nextBlock := b.ctx.AddBasicBlock(b.llvmFn, blockPrefix+".next")
 	b.blockExits[b.currentBlock] = nextBlock // adjust outgoing block for phi nodes
 
 	// Now branch to the out-of-bounds or the regular block.

compiler/atomic.go

@@ -4,17 +4,19 @@ import (
 	"fmt"
 	"strings"
 
+	"golang.org/x/tools/go/ssa"
 	"tinygo.org/x/go-llvm"
 )
 
-// createAtomicOp lowers a sync/atomic function by lowering it as an LLVM atomic
-// operation. It returns the result of the operation, or a zero llvm.Value if
-// the result is void.
-func (b *builder) createAtomicOp(name string) llvm.Value {
+// createAtomicOp lowers an atomic library call by lowering it as an LLVM atomic
+// operation. It returns the result of the operation and true if the call could
+// be lowered inline, and false otherwise.
+func (b *builder) createAtomicOp(call *ssa.CallCommon) (llvm.Value, bool) {
+	name := call.Value.(*ssa.Function).Name()
 	switch name {
 	case "AddInt32", "AddInt64", "AddUint32", "AddUint64", "AddUintptr":
-		ptr := b.getValue(b.fn.Params[0])
-		val := b.getValue(b.fn.Params[1])
+		ptr := b.getValue(call.Args[0])
+		val := b.getValue(call.Args[1])
 		if strings.HasPrefix(b.Triple, "avr") {
 			// AtomicRMW does not work on AVR as intended:
 			// - There are some register allocation issues (fixed by https://reviews.llvm.org/D97127 which is not yet in a usable LLVM release)
@@ -27,18 +29,17 @@ func (b *builder) createAtomicOp(name string) llvm.Value {
 			}
 			oldVal := b.createCall(fn, []llvm.Value{ptr, val}, "")
 			// Return the new value, not the original value returned.
-			return b.CreateAdd(oldVal, val, "")
+			return b.CreateAdd(oldVal, val, ""), true
 		}
 		oldVal := b.CreateAtomicRMW(llvm.AtomicRMWBinOpAdd, ptr, val, llvm.AtomicOrderingSequentiallyConsistent, true)
 		// Return the new value, not the original value returned by atomicrmw.
-		return b.CreateAdd(oldVal, val, "")
+		return b.CreateAdd(oldVal, val, ""), true
 	case "SwapInt32", "SwapInt64", "SwapUint32", "SwapUint64", "SwapUintptr", "SwapPointer":
-		ptr := b.getValue(b.fn.Params[0])
-		val := b.getValue(b.fn.Params[1])
+		ptr := b.getValue(call.Args[0])
+		val := b.getValue(call.Args[1])
 		isPointer := val.Type().TypeKind() == llvm.PointerTypeKind
 		if isPointer {
 			// atomicrmw only supports integers, so cast to an integer.
-			// TODO: this is fixed in LLVM 15.
 			val = b.CreatePtrToInt(val, b.uintptrType, "")
 			ptr = b.CreateBitCast(ptr, llvm.PointerType(val.Type(), 0), "")
 		}
@@ -46,23 +47,23 @@ func (b *builder) createAtomicOp(name string) llvm.Value {
 		if isPointer {
 			oldVal = b.CreateIntToPtr(oldVal, b.i8ptrType, "")
 		}
-		return oldVal
+		return oldVal, true
 	case "CompareAndSwapInt32", "CompareAndSwapInt64", "CompareAndSwapUint32", "CompareAndSwapUint64", "CompareAndSwapUintptr", "CompareAndSwapPointer":
-		ptr := b.getValue(b.fn.Params[0])
-		old := b.getValue(b.fn.Params[1])
-		newVal := b.getValue(b.fn.Params[2])
+		ptr := b.getValue(call.Args[0])
+		old := b.getValue(call.Args[1])
+		newVal := b.getValue(call.Args[2])
 		tuple := b.CreateAtomicCmpXchg(ptr, old, newVal, llvm.AtomicOrderingSequentiallyConsistent, llvm.AtomicOrderingSequentiallyConsistent, true)
 		swapped := b.CreateExtractValue(tuple, 1, "")
-		return swapped
+		return swapped, true
 	case "LoadInt32", "LoadInt64", "LoadUint32", "LoadUint64", "LoadUintptr", "LoadPointer":
-		ptr := b.getValue(b.fn.Params[0])
+		ptr := b.getValue(call.Args[0])
 		val := b.CreateLoad(ptr, "")
 		val.SetOrdering(llvm.AtomicOrderingSequentiallyConsistent)
 		val.SetAlignment(b.targetData.PrefTypeAlignment(val.Type())) // required
-		return val
+		return val, true
 	case "StoreInt32", "StoreInt64", "StoreUint32", "StoreUint64", "StoreUintptr", "StorePointer":
-		ptr := b.getValue(b.fn.Params[0])
-		val := b.getValue(b.fn.Params[1])
+		ptr := b.getValue(call.Args[0])
+		val := b.getValue(call.Args[1])
 		if strings.HasPrefix(b.Triple, "avr") {
 			// SelectionDAGBuilder is currently missing the "are unaligned atomics allowed" check for stores.
 			vType := val.Type()
@@ -78,15 +79,13 @@ func (b *builder) createAtomicOp(name string) llvm.Value {
 			if fn.IsNil() {
 				fn = llvm.AddFunction(b.mod, name, llvm.FunctionType(vType, []llvm.Type{ptr.Type(), vType, b.uintptrType}, false))
 			}
-			b.createCall(fn, []llvm.Value{ptr, val, llvm.ConstInt(b.uintptrType, 5, false)}, "")
-			return llvm.Value{}
+			return b.createCall(fn, []llvm.Value{ptr, val, llvm.ConstInt(b.uintptrType, 5, false)}, ""), true
 		}
 		store := b.CreateStore(val, ptr)
 		store.SetOrdering(llvm.AtomicOrderingSequentiallyConsistent)
 		store.SetAlignment(b.targetData.PrefTypeAlignment(val.Type())) // required
-		return llvm.Value{}
+		return store, true
 	default:
-		b.addError(b.fn.Pos(), "unknown atomic operation: "+b.fn.Name())
-		return llvm.Value{}
+		return llvm.Value{}, false
 	}
 }

compiler/calls.go

@@ -33,36 +33,17 @@ const (
 	paramIsDeferenceableOrNull = 1 << iota
 )
 
-// createRuntimeCallCommon creates a runtime call. Use createRuntimeCall or
-// createRuntimeInvoke instead.
-func (b *builder) createRuntimeCallCommon(fnName string, args []llvm.Value, name string, isInvoke bool) llvm.Value {
+// createCall creates a new call to runtime.<fnName> with the given arguments.
+func (b *builder) createRuntimeCall(fnName string, args []llvm.Value, name string) llvm.Value {
 	fn := b.program.ImportedPackage("runtime").Members[fnName].(*ssa.Function)
 	llvmFn := b.getFunction(fn)
 	if llvmFn.IsNil() {
 		panic("trying to call non-existent function: " + fn.RelString(nil))
 	}
 	args = append(args, llvm.Undef(b.i8ptrType)) // unused context parameter
-	if isInvoke {
-		return b.createInvoke(llvmFn, args, name)
-	}
 	return b.createCall(llvmFn, args, name)
 }
 
-// createRuntimeCall creates a new call to runtime.<fnName> with the given
-// arguments.
-func (b *builder) createRuntimeCall(fnName string, args []llvm.Value, name string) llvm.Value {
-	return b.createRuntimeCallCommon(fnName, args, name, false)
-}
-
-// createRuntimeInvoke creates a new call to runtime.<fnName> with the given
-// arguments. If the runtime call panics, control flow is diverted to the
-// landing pad block.
-// Note that "invoke" here is meant in the LLVM sense (a call that can
-// panic/throw), not in the Go sense (an interface method call).
-func (b *builder) createRuntimeInvoke(fnName string, args []llvm.Value, name string) llvm.Value {
-	return b.createRuntimeCallCommon(fnName, args, name, true)
-}
-
 // createCall creates a call to the given function with the arguments possibly
 // expanded.
 func (b *builder) createCall(fn llvm.Value, args []llvm.Value, name string) llvm.Value {
@@ -74,15 +55,6 @@ func (b *builder) createCall(fn llvm.Value, args []llvm.Value, name string) llvm
 	return b.CreateCall(fn, expanded, name)
 }
 
-// createInvoke is like createCall but continues execution at the landing pad if
-// the call resulted in a panic.
-func (b *builder) createInvoke(fn llvm.Value, args []llvm.Value, name string) llvm.Value {
-	if b.hasDeferFrame() {
-		b.createInvokeCheckpoint()
-	}
-	return b.createCall(fn, args, name)
-}
-
 // Expand an argument type to a list that can be used in a function call
 // parameter list.
 func (c *compilerContext) expandFormalParamType(t llvm.Type, name string, goType types.Type) []paramInfo {

compiler/compiler.go

@@ -18,7 +18,6 @@ import (
 	"github.com/tinygo-org/tinygo/compiler/llvmutil"
 	"github.com/tinygo-org/tinygo/loader"
 	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/types/typeutil"
 	"tinygo.org/x/go-llvm"
 )
 
@@ -71,7 +70,7 @@ type compilerContext struct {
 	cu               llvm.Metadata
 	difiles          map[string]llvm.Metadata
 	ditypes          map[types.Type]llvm.Metadata
-	llvmTypes        typeutil.Map
+	llvmTypes        map[types.Type]llvm.Type
 	machine          llvm.TargetMachine
 	targetData       llvm.TargetData
 	intType          llvm.Type
@@ -96,6 +95,7 @@ func newCompilerContext(moduleName string, machine llvm.TargetMachine, config *C
 		DumpSSA:     dumpSSA,
 		difiles:     make(map[string]llvm.Metadata),
 		ditypes:     make(map[types.Type]llvm.Metadata),
+		llvmTypes:   make(map[types.Type]llvm.Type),
 		machine:     machine,
 		targetData:  machine.CreateTargetData(),
 		astComments: map[string]*ast.CommentGroup{},
@@ -143,8 +143,6 @@ type builder struct {
 	currentBlock      *ssa.BasicBlock
 	phis              []phiNode
 	deferPtr          llvm.Value
-	deferFrame        llvm.Value
-	landingpad        llvm.BasicBlock
 	difunc            llvm.Metadata
 	dilocals          map[*types.Var]llvm.Metadata
 	initInlinedAt     llvm.Metadata            // fake inlinedAt position
@@ -329,16 +327,12 @@ func (c *compilerContext) getLLVMRuntimeType(name string) llvm.Type {
 // important for named struct types (which should only be created once).
 func (c *compilerContext) getLLVMType(goType types.Type) llvm.Type {
 	// Try to load the LLVM type from the cache.
-	// Note: *types.Named isn't unique when working with generics.
-	// See https://github.com/golang/go/issues/53914
-	// This is the reason for using typeutil.Map to lookup LLVM types for Go types.
-	ival := c.llvmTypes.At(goType)
-	if ival != nil {
-		return ival.(llvm.Type)
+	if t, ok := c.llvmTypes[goType]; ok {
+		return t
 	}
 	// Not already created, so adding this type to the cache.
 	llvmType := c.makeLLVMType(goType)
-	c.llvmTypes.Set(goType, llvmType)
+	c.llvmTypes[goType] = llvmType
 	return llvmType
 }
 
@@ -393,9 +387,9 @@ func (c *compilerContext) makeLLVMType(goType types.Type) llvm.Type {
 			// in LLVM IR, named structs are implemented as named structs in
 			// LLVM. This is because it is otherwise impossible to create
 			// self-referencing types such as linked lists.
-			llvmName := typ.String()
+			llvmName := typ.Obj().Pkg().Path() + "." + typ.Obj().Name()
 			llvmType := c.ctx.StructCreateNamed(llvmName)
-			c.llvmTypes.Set(goType, llvmType) // avoid infinite recursion
+			c.llvmTypes[goType] = llvmType // avoid infinite recursion
 			underlying := c.getLLVMType(st)
 			llvmType.StructSetBody(underlying.StructElementTypes(), false)
 			return llvmType
@@ -786,19 +780,10 @@ func (c *compilerContext) createPackage(irbuilder llvm.Builder, pkg *ssa.Package
 		member := pkg.Members[name]
 		switch member := member.(type) {
 		case *ssa.Function:
-			if member.Synthetic == "generic function" {
-				// Do not try to build generic (non-instantiated) functions.
-				continue
-			}
 			// Create the function definition.
 			b := newBuilder(c, irbuilder, member)
 			if member.Blocks == nil {
-				// Try to define this as an intrinsic function.
-				b.defineIntrinsicFunction()
-				// It might not be an intrinsic function but simply an external
-				// function (defined via //go:linkname). Leave it undefined in
-				// that case.
-				continue
+				continue // external function
 			}
 			b.createFunction()
 		case *ssa.Type:
@@ -1022,11 +1007,10 @@ func (c *compilerContext) getEmbedFileString(file *loader.EmbedFile) llvm.Value
 	return llvm.ConstNamedStruct(c.getLLVMRuntimeType("_string"), []llvm.Value{strPtr, strLen})
 }
 
-// Start defining a function so that it can be filled with instructions: load
-// parameters, create basic blocks, and set up debug information.
-// This is separated out from createFunction() so that it is also usable to
-// define compiler intrinsics like the atomic operations in sync/atomic.
-func (b *builder) createFunctionStart() {
+// createFunction builds the LLVM IR implementation for this function. The
+// function must not yet be defined, otherwise this function will create a
+// diagnostic.
+func (b *builder) createFunction() {
 	if b.DumpSSA {
 		fmt.Printf("\nfunc %s:\n", b.fn)
 	}
@@ -1096,16 +1080,7 @@ func (b *builder) createFunctionStart() {
 		b.blockEntries[block] = llvmBlock
 		b.blockExits[block] = llvmBlock
 	}
-	var entryBlock llvm.BasicBlock
-	if len(b.fn.Blocks) != 0 {
-		// Normal functions have an entry block.
-		entryBlock = b.blockEntries[b.fn.Blocks[0]]
-	} else {
-		// This function isn't defined in Go SSA. It is probably a compiler
-		// intrinsic (like an atomic operation). Create the entry block
-		// manually.
-		entryBlock = b.ctx.AddBasicBlock(b.llvmFn, "entry")
-	}
+	entryBlock := b.blockEntries[b.fn.Blocks[0]]
 	b.SetInsertPointAtEnd(entryBlock)
 
 	if b.fn.Synthetic == "package initializer" {
@@ -1180,13 +1155,6 @@ func (b *builder) createFunctionStart() {
 		// them.
 		b.deferInitFunc()
 	}
-}
-
-// createFunction builds the LLVM IR implementation for this function. The
-// function must not yet be defined, otherwise this function will create a
-// diagnostic.
-func (b *builder) createFunction() {
-	b.createFunctionStart()
 
 	// Fill blocks with instructions.
 	for _, block := range b.fn.DomPreorder() {
@@ -1234,12 +1202,6 @@ func (b *builder) createFunction() {
 		}
 	}
 
-	if b.hasDeferFrame() {
-		// Create the landing pad block, where execution continues after a
-		// panic.
-		b.createLandingPad()
-	}
-
 	// Resolve phi nodes
 	for _, phi := range b.phis {
 		block := phi.ssa.Block()
@@ -1367,12 +1329,9 @@ func (b *builder) createInstruction(instr ssa.Instruction) {
 		b.createMapUpdate(mapType.Key(), m, key, value, instr.Pos())
 	case *ssa.Panic:
 		value := b.getValue(instr.X)
-		b.createRuntimeInvoke("_panic", []llvm.Value{value}, "")
+		b.createRuntimeCall("_panic", []llvm.Value{value}, "")
 		b.CreateUnreachable()
 	case *ssa.Return:
-		if b.hasDeferFrame() {
-			b.createRuntimeCall("destroyDeferFrame", []llvm.Value{b.deferFrame}, "")
-		}
 		if len(instr.Results) == 0 {
 			b.CreateRetVoid()
 		} else if len(instr.Results) == 1 {
@@ -1549,12 +1508,6 @@ func (b *builder) createBuiltin(argTypes []types.Type, argValues []llvm.Value, c
 			case *types.Pointer:
 				ptrValue := b.CreatePtrToInt(value, b.uintptrType, "")
 				b.createRuntimeCall("printptr", []llvm.Value{ptrValue}, "")
-			case *types.Slice:
-				bufptr := b.CreateExtractValue(value, 0, "")
-				buflen := b.CreateExtractValue(value, 1, "")
-				bufcap := b.CreateExtractValue(value, 2, "")
-				ptrValue := b.CreatePtrToInt(bufptr, b.uintptrType, "")
-				b.createRuntimeCall("printslice", []llvm.Value{ptrValue, buflen, bufcap}, "")
 			default:
 				return llvm.Value{}, b.makeError(pos, "unknown arg type: "+typ.String())
 			}
@@ -1567,13 +1520,7 @@ func (b *builder) createBuiltin(argTypes []types.Type, argValues []llvm.Value, c
 		cplx := argValues[0]
 		return b.CreateExtractValue(cplx, 0, "real"), nil
 	case "recover":
-		useParentFrame := uint64(0)
-		if b.hasDeferFrame() {
-			// recover() should return the panic value of the parent function,
-			// not of the current function.
-			useParentFrame = 1
-		}
-		return b.createRuntimeCall("_recover", []llvm.Value{llvm.ConstInt(b.ctx.Int1Type(), useParentFrame, false)}, ""), nil
+		return b.createRuntimeCall("_recover", nil, ""), nil
 	case "ssa:wrapnilchk":
 		// TODO: do an actual nil check?
 		return argValues[0], nil
@@ -1585,20 +1532,6 @@ func (b *builder) createBuiltin(argTypes []types.Type, argValues []llvm.Value, c
 		ptr := argValues[0]
 		len := argValues[1]
 		return b.CreateGEP(ptr, []llvm.Value{len}, ""), nil
-	case "Alignof": // unsafe.Alignof
-		align := b.targetData.ABITypeAlignment(argValues[0].Type())
-		return llvm.ConstInt(b.uintptrType, uint64(align), false), nil
-	case "Offsetof": // unsafe.Offsetof
-		// This builtin is a bit harder to implement and may need a bit of
-		// refactoring to work (it may be easier to implement if we have access
-		// to the underlying Go SSA instruction). It is also rarely used: it
-		// only applies in generic code and unsafe.Offsetof isn't very commonly
-		// used anyway.
-		// In other words, postpone it to some other day.
-		return llvm.Value{}, b.makeError(pos, "todo: unsafe.Offsetof")
-	case "Sizeof": // unsafe.Sizeof
-		size := b.targetData.TypeAllocSize(argValues[0].Type())
-		return llvm.ConstInt(b.uintptrType, size, false), nil
 	case "Slice": // unsafe.Slice
 		// This creates a slice from a pointer and a length.
 		// Note that the exception mentioned in the documentation (if the
@@ -1647,6 +1580,10 @@ func (b *builder) createFunctionCall(instr *ssa.CallCommon) (llvm.Value, error)
 		// applied) function call. If it is anonymous, it may be a closure.
 		name := fn.RelString(nil)
 		switch {
+		case name == "runtime.memcpy" || name == "runtime.memmove" || name == "reflect.memcpy":
+			return b.createMemoryCopyCall(fn, instr.Args)
+		case name == "runtime.memzero":
+			return b.createMemoryZeroCall(instr.Args)
 		case name == "math.Ceil" || name == "math.Floor" || name == "math.Sqrt" || name == "math.Trunc":
 			result, ok := b.createMathOp(instr)
 			if ok {
@@ -1666,12 +1603,18 @@ func (b *builder) createFunctionCall(instr *ssa.CallCommon) (llvm.Value, error)
 			return b.createSyscall(instr)
 		case strings.HasPrefix(name, "syscall.rawSyscallNoError"):
 			return b.createRawSyscallNoError(instr)
-		case name == "runtime.supportsRecover":
-			supportsRecover := uint64(0)
-			if b.supportsRecover() {
-				supportsRecover = 1
+		case strings.HasPrefix(name, "runtime/volatile.Load"):
+			return b.createVolatileLoad(instr)
+		case strings.HasPrefix(name, "runtime/volatile.Store"):
+			return b.createVolatileStore(instr)
+		case strings.HasPrefix(name, "sync/atomic."):
+			val, ok := b.createAtomicOp(instr)
+			if ok {
+				// This call could be lowered as an atomic operation.
+				return val, nil
 			}
-			return llvm.ConstInt(b.ctx.Int1Type(), supportsRecover, false), nil
+			// This call couldn't be lowered as an atomic operation, it's
+			// probably something else. Continue as usual.
 		case name == "runtime/interrupt.New":
 			return b.createInterruptGlobal(instr)
 		}
@@ -1734,7 +1677,7 @@ func (b *builder) createFunctionCall(instr *ssa.CallCommon) (llvm.Value, error)
 		params = append(params, context)
 	}
 
-	return b.createInvoke(callee, params, ""), nil
+	return b.createCall(callee, params, ""), nil
 }
 
 // getValue returns the LLVM value of a constant, function value, global, or

compiler/compiler_test.go

@@ -49,7 +49,6 @@ func TestCompiler(t *testing.T) {
 		{"float.go", "", ""},
 		{"interface.go", "", ""},
 		{"func.go", "", ""},
-		{"defer.go", "cortex-m-qemu", ""},
 		{"pragma.go", "", ""},
 		{"goroutine.go", "wasm", "asyncify"},
 		{"goroutine.go", "cortex-m-qemu", "tasks"},
@@ -65,9 +64,6 @@ func TestCompiler(t *testing.T) {
 	if goMinor >= 17 {
 		tests = append(tests, testCase{"go1.17.go", "", ""})
 	}
-	if goMinor >= 18 {
-		tests = append(tests, testCase{"generics.go", "", ""})
-	}
 
 	for _, tc := range tests {
 		name := tc.file
@@ -97,7 +93,6 @@ func TestCompiler(t *testing.T) {
 			}
 			compilerConfig := &Config{
 				Triple:             config.Triple(),
-				Features:           config.Features(),
 				GOOS:               config.GOOS(),
 				GOARCH:             config.GOARCH(),
 				CodeModel:          config.CodeModel(),

compiler/defer.go

@@ -15,39 +15,12 @@ package compiler
 
 import (
 	"go/types"
-	"strconv"
 
 	"github.com/tinygo-org/tinygo/compiler/llvmutil"
 	"golang.org/x/tools/go/ssa"
 	"tinygo.org/x/go-llvm"
 )
 
-// supportsRecover returns whether the compiler supports the recover() builtin
-// for the current architecture.
-func (b *builder) supportsRecover() bool {
-	switch b.archFamily() {
-	case "wasm32":
-		// Probably needs to be implemented using the exception handling
-		// proposal of WebAssembly:
-		// https://github.com/WebAssembly/exception-handling
-		return false
-	case "riscv64", "xtensa":
-		// TODO: add support for these architectures
-		return false
-	default:
-		return true
-	}
-}
-
-// hasDeferFrame returns whether the current function needs to catch panics and
-// run defers.
-func (b *builder) hasDeferFrame() bool {
-	if b.fn.Recover == nil {
-		return false
-	}
-	return b.supportsRecover()
-}
-
 // deferInitFunc sets up this function for future deferred calls. It must be
 // called from within the entry block when this function contains deferred
 // calls.
@@ -63,151 +36,6 @@ func (b *builder) deferInitFunc() {
 	deferType := llvm.PointerType(b.getLLVMRuntimeType("_defer"), 0)
 	b.deferPtr = b.CreateAlloca(deferType, "deferPtr")
 	b.CreateStore(llvm.ConstPointerNull(deferType), b.deferPtr)
-
-	if b.hasDeferFrame() {
-		// Set up the defer frame with the current stack pointer.
-		// This assumes that the stack pointer doesn't move outside of the
-		// function prologue/epilogue (an invariant maintained by TinyGo but
-		// possibly broken by the C alloca function).
-		// The frame pointer is _not_ saved, because it is marked as clobbered
-		// in the setjmp-like inline assembly.
-		deferFrameType := b.getLLVMRuntimeType("deferFrame")
-		b.deferFrame = b.CreateAlloca(deferFrameType, "deferframe.buf")
-		stackPointer := b.readStackPointer()
-		b.createRuntimeCall("setupDeferFrame", []llvm.Value{b.deferFrame, stackPointer}, "")
-
-		// Create the landing pad block, which is where control transfers after
-		// a panic.
-		b.landingpad = b.ctx.AddBasicBlock(b.llvmFn, "lpad")
-	}
-}
-
-// createLandingPad fills in the landing pad block. This block runs the deferred
-// functions and returns (by jumping to the recover block). If the function is
-// still panicking after the defers are run, the panic will be re-raised in
-// destroyDeferFrame.
-func (b *builder) createLandingPad() {
-	b.SetInsertPointAtEnd(b.landingpad)
-
-	// Add debug info, if needed.
-	// The location used is the closing bracket of the function.
-	if b.Debug {
-		pos := b.program.Fset.Position(b.fn.Syntax().End())
-		b.SetCurrentDebugLocation(uint(pos.Line), uint(pos.Column), b.difunc, llvm.Metadata{})
-	}
-
-	b.createRunDefers()
-
-	// Continue at the 'recover' block, which returns to the parent in an
-	// appropriate way.
-	b.CreateBr(b.blockEntries[b.fn.Recover])
-}
-
-// createInvokeCheckpoint saves the function state at the given point, to
-// continue at the landing pad if a panic happened. This is implemented using a
-// setjmp-like construct.
-func (b *builder) createInvokeCheckpoint() {
-	// Construct inline assembly equivalents of setjmp.
-	// The assembly works as follows:
-	//   * All registers (both callee-saved and caller saved) are clobbered
-	//     after the inline assembly returns.
-	//   * The assembly stores the address just past the end of the assembly
-	//     into the jump buffer.
-	//   * The return value (eax, rax, r0, etc) is set to zero in the inline
-	//     assembly but set to an unspecified non-zero value when jumping using
-	//     a longjmp.
-	var asmString, constraints string
-	resultType := b.uintptrType
-	switch b.archFamily() {
-	case "i386":
-		asmString = `
-xorl %eax, %eax
-movl $$1f, 4(%ebx)
-1:`
-		constraints = "={eax},{ebx},~{ebx},~{ecx},~{edx},~{esi},~{edi},~{ebp},~{xmm0},~{xmm1},~{xmm2},~{xmm3},~{xmm4},~{xmm5},~{xmm6},~{xmm7},~{fpsr},~{fpcr},~{flags},~{dirflag},~{memory}"
-		// This doesn't include the floating point stack because TinyGo uses
-		// newer floating point instructions.
-	case "x86_64":
-		asmString = `
-leaq 1f(%rip), %rax
-movq %rax, 8(%rbx)
-xorq %rax, %rax
-1:`
-		constraints = "={rax},{rbx},~{rbx},~{rcx},~{rdx},~{rsi},~{rdi},~{rbp},~{r8},~{r9},~{r10},~{r11},~{r12},~{r13},~{r14},~{r15},~{xmm0},~{xmm1},~{xmm2},~{xmm3},~{xmm4},~{xmm5},~{xmm6},~{xmm7},~{xmm8},~{xmm9},~{xmm10},~{xmm11},~{xmm12},~{xmm13},~{xmm14},~{xmm15},~{xmm16},~{xmm17},~{xmm18},~{xmm19},~{xmm20},~{xmm21},~{xmm22},~{xmm23},~{xmm24},~{xmm25},~{xmm26},~{xmm27},~{xmm28},~{xmm29},~{xmm30},~{xmm31},~{fpsr},~{fpcr},~{flags},~{dirflag},~{memory}"
-		// This list doesn't include AVX/AVX512 registers because TinyGo
-		// doesn't currently enable support for AVX instructions.
-	case "arm":
-		// Note: the following assembly takes into account that the PC is
-		// always 4 bytes ahead on ARM. The PC that is stored always points
-		// to the instruction just after the assembly fragment so that
-		// tinygo_longjmp lands at the correct instruction.
-		if b.isThumb() {
-			// Instructions are 2 bytes in size.
-			asmString = `
-movs r0, #0
-mov r2, pc
-str r2, [r1, #4]`
-		} else {
-			// Instructions are 4 bytes in size.
-			asmString = `
-str pc, [r1, #4]
-movs r0, #0`
-		}
-		constraints = "={r0},{r1},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{cpsr},~{memory}"
-	case "aarch64":
-		asmString = `
-adr x2, 1f
-str x2, [x1, #8]
-mov x0, #0
-1:
-`
-		constraints = "={x0},{x1},~{x1},~{x2},~{x3},~{x4},~{x5},~{x6},~{x7},~{x8},~{x9},~{x10},~{x11},~{x12},~{x13},~{x14},~{x15},~{x16},~{x17},~{x19},~{x20},~{x21},~{x22},~{x23},~{x24},~{x25},~{x26},~{x27},~{x28},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{q16},~{q17},~{q18},~{q19},~{q20},~{q21},~{q22},~{q23},~{q24},~{q25},~{q26},~{q27},~{q28},~{q29},~{q30},~{nzcv},~{ffr},~{vg},~{memory}"
-		if b.GOOS != "darwin" {
-			// These registers cause the following warning when compiling for
-			// MacOS:
-			//     warning: inline asm clobber list contains reserved registers:
-			//     X18, FP
-			//     Reserved registers on the clobber list may not be preserved
-			//     across the asm statement, and clobbering them may lead to
-			//     undefined behaviour.
-			constraints += ",~{x18},~{fp}"
-		}
-		// TODO: SVE registers, which we don't use in TinyGo at the moment.
-	case "avr":
-		// Note: the Y register (R28:R29) is a fixed register and therefore
-		// needs to be saved manually. TODO: do this only once per function with
-		// a defer frame, not for every call.
-		resultType = b.ctx.Int8Type()
-		asmString = `
-ldi r24, pm_lo8(1f)
-ldi r25, pm_hi8(1f)
-std z+2, r24
-std z+3, r25
-std z+4, r28
-std z+5, r29
-ldi r24, 0
-1:`
-		constraints = "={r24},z,~{r0},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{r13},~{r14},~{r15},~{r16},~{r17},~{r18},~{r19},~{r20},~{r21},~{r22},~{r23},~{r25},~{r26},~{r27}"
-	case "riscv32":
-		asmString = `
-la a2, 1f
-sw a2, 4(a1)
-li a0, 0
-1:`
-		constraints = "={a0},{a1},~{a1},~{a2},~{a3},~{a4},~{a5},~{a6},~{a7},~{s0},~{s1},~{s2},~{s3},~{s4},~{s5},~{s6},~{s7},~{s8},~{s9},~{s10},~{s11},~{t0},~{t1},~{t2},~{t3},~{t4},~{t5},~{t6},~{ra},~{f0},~{f1},~{f2},~{f3},~{f4},~{f5},~{f6},~{f7},~{f8},~{f9},~{f10},~{f11},~{f12},~{f13},~{f14},~{f15},~{f16},~{f17},~{f18},~{f19},~{f20},~{f21},~{f22},~{f23},~{f24},~{f25},~{f26},~{f27},~{f28},~{f29},~{f30},~{f31},~{memory}"
-	default:
-		// This case should have been handled by b.supportsRecover().
-		b.addError(b.fn.Pos(), "unknown architecture for defer: "+b.archFamily())
-	}
-	asmType := llvm.FunctionType(resultType, []llvm.Type{b.deferFrame.Type()}, false)
-	asm := llvm.InlineAsm(asmType, asmString, constraints, false, false, 0, false)
-	result := b.CreateCall(asm, []llvm.Value{b.deferFrame}, "setjmp")
-	result.AddCallSiteAttribute(-1, b.ctx.CreateEnumAttribute(llvm.AttributeKindID("returns_twice"), 0))
-	isZero := b.CreateICmp(llvm.IntEQ, result, llvm.ConstInt(resultType, 0, false), "setjmp.result")
-	continueBB := b.insertBasicBlock("")
-	b.CreateCondBr(isZero, continueBB, b.landingpad)
-	b.SetInsertPointAtEnd(continueBB)
-	b.blockExits[b.currentBlock] = continueBB
 }
 
 // isInLoop checks if there is a path from a basic block to itself.
@@ -373,31 +201,30 @@ func (b *builder) createDefer(instr *ssa.Defer) {
 		}
 	}
 
-	// Make a struct out of the collected values to put in the deferred call
-	// struct.
-	deferredCallType := b.ctx.StructType(valueTypes, false)
-	deferredCall := llvm.ConstNull(deferredCallType)
+	// Make a struct out of the collected values to put in the defer frame.
+	deferFrameType := b.ctx.StructType(valueTypes, false)
+	deferFrame := llvm.ConstNull(deferFrameType)
 	for i, value := range values {
-		deferredCall = b.CreateInsertValue(deferredCall, value, i, "")
+		deferFrame = b.CreateInsertValue(deferFrame, value, i, "")
 	}
 
 	// Put this struct in an allocation.
 	var alloca llvm.Value
 	if !isInLoop(instr.Block()) {
 		// This can safely use a stack allocation.
-		alloca = llvmutil.CreateEntryBlockAlloca(b.Builder, deferredCallType, "defer.alloca")
+		alloca = llvmutil.CreateEntryBlockAlloca(b.Builder, deferFrameType, "defer.alloca")
 	} else {
 		// This may be hit a variable number of times, so use a heap allocation.
-		size := b.targetData.TypeAllocSize(deferredCallType)
+		size := b.targetData.TypeAllocSize(deferFrameType)
 		sizeValue := llvm.ConstInt(b.uintptrType, size, false)
 		nilPtr := llvm.ConstNull(b.i8ptrType)
 		allocCall := b.createRuntimeCall("alloc", []llvm.Value{sizeValue, nilPtr}, "defer.alloc.call")
-		alloca = b.CreateBitCast(allocCall, llvm.PointerType(deferredCallType, 0), "defer.alloc")
+		alloca = b.CreateBitCast(allocCall, llvm.PointerType(deferFrameType, 0), "defer.alloc")
 	}
 	if b.NeedsStackObjects {
 		b.trackPointer(alloca)
 	}
-	b.CreateStore(deferredCall, alloca)
+	b.CreateStore(deferFrame, alloca)
 
 	// Push it on top of the linked list by replacing deferPtr.
 	allocaCast := b.CreateBitCast(alloca, next.Type(), "defer.alloca.cast")
@@ -421,11 +248,11 @@ func (b *builder) createRunDefers() {
 	//         }
 	//     }
 
-	// Create loop, in the order: loophead, loop, callback0, callback1, ..., unreachable, end.
-	end := b.insertBasicBlock("rundefers.end")
-	unreachable := b.ctx.InsertBasicBlock(end, "rundefers.default")
-	loop := b.ctx.InsertBasicBlock(unreachable, "rundefers.loop")
-	loophead := b.ctx.InsertBasicBlock(loop, "rundefers.loophead")
+	// Create loop.
+	loophead := b.ctx.AddBasicBlock(b.llvmFn, "rundefers.loophead")
+	loop := b.ctx.AddBasicBlock(b.llvmFn, "rundefers.loop")
+	unreachable := b.ctx.AddBasicBlock(b.llvmFn, "rundefers.default")
+	end := b.ctx.AddBasicBlock(b.llvmFn, "rundefers.end")
 	b.CreateBr(loophead)
 
 	// Create loop head:
@@ -457,7 +284,7 @@ func (b *builder) createRunDefers() {
 		// Create switch case, for example:
 		//     case 0:
 		//         // run first deferred call
-		block := b.insertBasicBlock("rundefers.callback" + strconv.Itoa(i))
+		block := b.ctx.AddBasicBlock(b.llvmFn, "rundefers.callback")
 		sw.AddCase(llvm.ConstInt(b.uintptrType, uint64(i), false), block)
 		b.SetInsertPointAtEnd(block)
 		switch callback := callback.(type) {
@@ -468,7 +295,7 @@ func (b *builder) createRunDefers() {
 			valueTypes := []llvm.Type{b.uintptrType, llvm.PointerType(b.getLLVMRuntimeType("_defer"), 0)}
 
 			if !callback.IsInvoke() {
-				//Expect funcValue to be passed through the deferred call.
+				//Expect funcValue to be passed through the defer frame.
 				valueTypes = append(valueTypes, b.getFuncType(callback.Signature()))
 			} else {
 				//Expect typecode
@@ -479,14 +306,14 @@ func (b *builder) createRunDefers() {
 				valueTypes = append(valueTypes, b.getLLVMType(arg.Type()))
 			}
 
-			deferredCallType := b.ctx.StructType(valueTypes, false)
-			deferredCallPtr := b.CreateBitCast(deferData, llvm.PointerType(deferredCallType, 0), "defercall")
+			deferFrameType := b.ctx.StructType(valueTypes, false)
+			deferFramePtr := b.CreateBitCast(deferData, llvm.PointerType(deferFrameType, 0), "deferFrame")
 
 			// Extract the params from the struct (including receiver).
 			forwardParams := []llvm.Value{}
 			zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
 			for i := 2; i < len(valueTypes); i++ {
-				gep := b.CreateInBoundsGEP(deferredCallPtr, []llvm.Value{zero, llvm.ConstInt(b.ctx.Int32Type(), uint64(i), false)}, "gep")
+				gep := b.CreateInBoundsGEP(deferFramePtr, []llvm.Value{zero, llvm.ConstInt(b.ctx.Int32Type(), uint64(i), false)}, "gep")
 				forwardParam := b.CreateLoad(gep, "param")
 				forwardParams = append(forwardParams, forwardParam)
 			}
@@ -526,14 +353,14 @@ func (b *builder) createRunDefers() {
 			for _, param := range getParams(callback.Signature) {
 				valueTypes = append(valueTypes, b.getLLVMType(param.Type()))
 			}
-			deferredCallType := b.ctx.StructType(valueTypes, false)
-			deferredCallPtr := b.CreateBitCast(deferData, llvm.PointerType(deferredCallType, 0), "defercall")
+			deferFrameType := b.ctx.StructType(valueTypes, false)
+			deferFramePtr := b.CreateBitCast(deferData, llvm.PointerType(deferFrameType, 0), "deferFrame")
 
 			// Extract the params from the struct.
 			forwardParams := []llvm.Value{}
 			zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
 			for i := range getParams(callback.Signature) {
-				gep := b.CreateInBoundsGEP(deferredCallPtr, []llvm.Value{zero, llvm.ConstInt(b.ctx.Int32Type(), uint64(i+2), false)}, "gep")
+				gep := b.CreateInBoundsGEP(deferFramePtr, []llvm.Value{zero, llvm.ConstInt(b.ctx.Int32Type(), uint64(i+2), false)}, "gep")
 				forwardParam := b.CreateLoad(gep, "param")
 				forwardParams = append(forwardParams, forwardParam)
 			}
@@ -547,7 +374,7 @@ func (b *builder) createRunDefers() {
 			}
 
 			// Call real function.
-			b.createInvoke(b.getFunction(callback), forwardParams, "")
+			b.createCall(b.getFunction(callback), forwardParams, "")
 
 		case *ssa.MakeClosure:
 			// Get the real defer struct type and cast to it.
@@ -558,14 +385,14 @@ func (b *builder) createRunDefers() {
 				valueTypes = append(valueTypes, b.getLLVMType(params.At(i).Type()))
 			}
 			valueTypes = append(valueTypes, b.i8ptrType) // closure
-			deferredCallType := b.ctx.StructType(valueTypes, false)
-			deferredCallPtr := b.CreateBitCast(deferData, llvm.PointerType(deferredCallType, 0), "defercall")
+			deferFrameType := b.ctx.StructType(valueTypes, false)
+			deferFramePtr := b.CreateBitCast(deferData, llvm.PointerType(deferFrameType, 0), "deferFrame")
 
 			// Extract the params from the struct.
 			forwardParams := []llvm.Value{}
 			zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
 			for i := 2; i < len(valueTypes); i++ {
-				gep := b.CreateInBoundsGEP(deferredCallPtr, []llvm.Value{zero, llvm.ConstInt(b.ctx.Int32Type(), uint64(i), false)}, "")
+				gep := b.CreateInBoundsGEP(deferFramePtr, []llvm.Value{zero, llvm.ConstInt(b.ctx.Int32Type(), uint64(i), false)}, "")
 				forwardParam := b.CreateLoad(gep, "param")
 				forwardParams = append(forwardParams, forwardParam)
 			}
@@ -584,14 +411,14 @@ func (b *builder) createRunDefers() {
 				valueTypes = append(valueTypes, b.getLLVMType(params.At(i).Type()))
 			}
 
-			deferredCallType := b.ctx.StructType(valueTypes, false)
-			deferredCallPtr := b.CreateBitCast(deferData, llvm.PointerType(deferredCallType, 0), "defercall")
+			deferFrameType := b.ctx.StructType(valueTypes, false)
+			deferFramePtr := b.CreateBitCast(deferData, llvm.PointerType(deferFrameType, 0), "deferFrame")
 
 			// Extract the params from the struct.
 			var argValues []llvm.Value
 			zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
 			for i := 0; i < params.Len(); i++ {
-				gep := b.CreateInBoundsGEP(deferredCallPtr, []llvm.Value{zero, llvm.ConstInt(b.ctx.Int32Type(), uint64(i+2), false)}, "gep")
+				gep := b.CreateInBoundsGEP(deferFramePtr, []llvm.Value{zero, llvm.ConstInt(b.ctx.Int32Type(), uint64(i+2), false)}, "gep")
 				forwardParam := b.CreateLoad(gep, "param")
 				argValues = append(argValues, forwardParam)
 			}

compiler/interface.go

@@ -389,8 +389,8 @@ func (b *builder) createTypeAssert(expr *ssa.TypeAssert) llvm.Value {
 	// value.
 
 	prevBlock := b.GetInsertBlock()
-	okBlock := b.insertBasicBlock("typeassert.ok")
-	nextBlock := b.insertBasicBlock("typeassert.next")
+	okBlock := b.ctx.AddBasicBlock(b.llvmFn, "typeassert.ok")
+	nextBlock := b.ctx.AddBasicBlock(b.llvmFn, "typeassert.next")
 	b.blockExits[b.currentBlock] = nextBlock // adjust outgoing block for phi nodes
 	b.CreateCondBr(commaOk, okBlock, nextBlock)
 

compiler/intrinsics.go

@@ -3,68 +3,36 @@ package compiler
 // This file contains helper functions to create calls to LLVM intrinsics.
 
 import (
-	"go/token"
 	"strconv"
-	"strings"
 
 	"golang.org/x/tools/go/ssa"
 	"tinygo.org/x/go-llvm"
 )
 
-// Define unimplemented intrinsic functions.
-//
-// Some functions are either normally implemented in Go assembly (like
-// sync/atomic functions) or intentionally left undefined to be implemented
-// directly in the compiler (like runtime/volatile functions). Either way, look
-// for these and implement them if this is the case.
-func (b *builder) defineIntrinsicFunction() {
-	name := b.fn.RelString(nil)
-	switch {
-	case name == "runtime.memcpy" || name == "runtime.memmove":
-		b.createMemoryCopyImpl()
-	case name == "runtime.memzero":
-		b.createMemoryZeroImpl()
-	case strings.HasPrefix(name, "runtime/volatile.Load"):
-		b.createVolatileLoad()
-	case strings.HasPrefix(name, "runtime/volatile.Store"):
-		b.createVolatileStore()
-	case strings.HasPrefix(name, "sync/atomic.") && token.IsExported(b.fn.Name()):
-		b.createFunctionStart()
-		returnValue := b.createAtomicOp(b.fn.Name())
-		if !returnValue.IsNil() {
-			b.CreateRet(returnValue)
-		} else {
-			b.CreateRetVoid()
-		}
-	}
-}
-
-// createMemoryCopyImpl creates a call to a builtin LLVM memcpy or memmove
+// createMemoryCopyCall creates a call to a builtin LLVM memcpy or memmove
 // function, declaring this function if needed. These calls are treated
 // specially by optimization passes possibly resulting in better generated code,
 // and will otherwise be lowered to regular libc memcpy/memmove calls.
-func (b *builder) createMemoryCopyImpl() {
-	b.createFunctionStart()
-	fnName := "llvm." + b.fn.Name() + ".p0i8.p0i8.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
+func (b *builder) createMemoryCopyCall(fn *ssa.Function, args []ssa.Value) (llvm.Value, error) {
+	fnName := "llvm." + fn.Name() + ".p0i8.p0i8.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
 	llvmFn := b.mod.NamedFunction(fnName)
 	if llvmFn.IsNil() {
 		fnType := llvm.FunctionType(b.ctx.VoidType(), []llvm.Type{b.i8ptrType, b.i8ptrType, b.uintptrType, b.ctx.Int1Type()}, false)
 		llvmFn = llvm.AddFunction(b.mod, fnName, fnType)
 	}
 	var params []llvm.Value
-	for _, param := range b.fn.Params {
+	for _, param := range args {
 		params = append(params, b.getValue(param))
 	}
 	params = append(params, llvm.ConstInt(b.ctx.Int1Type(), 0, false))
 	b.CreateCall(llvmFn, params, "")
-	b.CreateRetVoid()
+	return llvm.Value{}, nil
 }
 
-// createMemoryZeroImpl creates calls to llvm.memset.* to zero a block of
+// createMemoryZeroCall creates calls to llvm.memset.* to zero a block of
 // memory, declaring the function if needed. These calls will be lowered to
 // regular libc memset calls if they aren't optimized out in a different way.
-func (b *builder) createMemoryZeroImpl() {
-	b.createFunctionStart()
+func (b *builder) createMemoryZeroCall(args []ssa.Value) (llvm.Value, error) {
 	fnName := "llvm.memset.p0i8.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
 	llvmFn := b.mod.NamedFunction(fnName)
 	if llvmFn.IsNil() {
@@ -72,13 +40,13 @@ func (b *builder) createMemoryZeroImpl() {
 		llvmFn = llvm.AddFunction(b.mod, fnName, fnType)
 	}
 	params := []llvm.Value{
-		b.getValue(b.fn.Params[0]),
+		b.getValue(args[0]),
 		llvm.ConstInt(b.ctx.Int8Type(), 0, false),
-		b.getValue(b.fn.Params[1]),
+		b.getValue(args[1]),
 		llvm.ConstInt(b.ctx.Int1Type(), 0, false),
 	}
 	b.CreateCall(llvmFn, params, "")
-	b.CreateRetVoid()
+	return llvm.Value{}, nil
 }
 
 var mathToLLVMMapping = map[string]string{

compiler/llvm.go

@@ -5,7 +5,6 @@ import (
 	"go/token"
 	"go/types"
 	"math/big"
-	"strings"
 
 	"github.com/tinygo-org/tinygo/compiler/llvmutil"
 	"tinygo.org/x/go-llvm"
@@ -24,23 +23,6 @@ func (b *builder) createTemporaryAlloca(t llvm.Type, name string) (alloca, bitca
 	return llvmutil.CreateTemporaryAlloca(b.Builder, b.mod, t, name)
 }
 
-// insertBasicBlock inserts a new basic block after the current basic block.
-// This is useful when inserting new basic blocks while converting a
-// *ssa.BasicBlock to a llvm.BasicBlock and the LLVM basic block needs some
-// extra blocks.
-// It does not update b.blockExits, this must be done by the caller.
-func (b *builder) insertBasicBlock(name string) llvm.BasicBlock {
-	currentBB := b.Builder.GetInsertBlock()
-	nextBB := llvm.NextBasicBlock(currentBB)
-	if nextBB.IsNil() {
-		// Last basic block in the function, so add one to the end.
-		return b.ctx.AddBasicBlock(b.llvmFn, name)
-	}
-	// Insert a basic block before the next basic block - that is, at the
-	// current insert location.
-	return b.ctx.InsertBasicBlock(nextBB, name)
-}
-
 // emitLifetimeEnd signals the end of an (alloca) lifetime by calling the
 // llvm.lifetime.end intrinsic. It is commonly used together with
 // createTemporaryAlloca.
@@ -271,46 +253,3 @@ func (c *compilerContext) getPointerBitmap(typ llvm.Type, pos token.Pos) *big.In
 		panic("unknown LLVM type")
 	}
 }
-
-// archFamily returns the archtecture from the LLVM triple but with some
-// architecture names ("armv6", "thumbv7m", etc) merged into a single
-// architecture name ("arm").
-func (c *compilerContext) archFamily() string {
-	arch := strings.Split(c.Triple, "-")[0]
-	if strings.HasPrefix(arch, "arm64") {
-		return "aarch64"
-	}
-	if strings.HasPrefix(arch, "arm") || strings.HasPrefix(arch, "thumb") {
-		return "arm"
-	}
-	return arch
-}
-
-// isThumb returns whether we're in ARM or in Thumb mode. It panics if the
-// features string is not one for an ARM architecture.
-func (c *compilerContext) isThumb() bool {
-	var isThumb, isNotThumb bool
-	for _, feature := range strings.Split(c.Features, ",") {
-		if feature == "+thumb-mode" {
-			isThumb = true
-		}
-		if feature == "-thumb-mode" {
-			isNotThumb = true
-		}
-	}
-	if isThumb == isNotThumb {
-		panic("unexpected feature flags")
-	}
-	return isThumb
-}
-
-// readStackPointer emits a LLVM intrinsic call that returns the current stack
-// pointer as an *i8.
-func (b *builder) readStackPointer() llvm.Value {
-	stacksave := b.mod.NamedFunction("llvm.stacksave")
-	if stacksave.IsNil() {
-		fnType := llvm.FunctionType(b.i8ptrType, nil, false)
-		stacksave = llvm.AddFunction(b.mod, "llvm.stacksave", fnType)
-	}
-	return b.CreateCall(stacksave, nil, "")
-}

compiler/syscall.go

@@ -16,7 +16,20 @@ import (
 func (b *builder) createRawSyscall(call *ssa.CallCommon) (llvm.Value, error) {
 	num := b.getValue(call.Args[0])
 	switch {
-	case b.GOARCH == "amd64" && b.GOOS == "linux":
+	case b.GOARCH == "amd64":
+		if b.GOOS == "darwin" {
+			// Darwin adds this magic number to system call numbers:
+			//
+			// > Syscall classes for 64-bit system call entry.
+			// > For 64-bit users, the 32-bit syscall number is partitioned
+			// > with the high-order bits representing the class and low-order
+			// > bits being the syscall number within that class.
+			// > The high-order 32-bits of the 64-bit syscall number are unused.
+			// > All system classes enter the kernel via the syscall instruction.
+			//
+			// Source: https://opensource.apple.com/source/xnu/xnu-792.13.8/osfmk/mach/i386/syscall_sw.h
+			num = b.CreateOr(num, llvm.ConstInt(b.uintptrType, 0x2000000, false), "")
+		}
 		// Sources:
 		//   https://stackoverflow.com/a/2538212
 		//   https://en.wikibooks.org/wiki/X86_Assembly/Interfacing_with_Linux#syscall
@@ -166,6 +179,26 @@ func (b *builder) createSyscall(call *ssa.CallCommon) (llvm.Value, error) {
 		retval = b.CreateInsertValue(retval, zero, 1, "")
 		retval = b.CreateInsertValue(retval, errResult, 2, "")
 		return retval, nil
+	case "darwin":
+		syscallResult, err := b.createRawSyscall(call)
+		if err != nil {
+			return syscallResult, err
+		}
+		// Return values: r0, r1 uintptr, err Errno
+		// Pseudocode:
+		//     var err uintptr
+		//     if syscallResult != 0 {
+		//         err = syscallResult
+		//     }
+		//     return syscallResult, 0, err
+		zero := llvm.ConstInt(b.uintptrType, 0, false)
+		hasError := b.CreateICmp(llvm.IntNE, syscallResult, llvm.ConstInt(b.uintptrType, 0, false), "")
+		errResult := b.CreateSelect(hasError, syscallResult, zero, "syscallError")
+		retval := llvm.Undef(b.ctx.StructType([]llvm.Type{b.uintptrType, b.uintptrType, b.uintptrType}, false))
+		retval = b.CreateInsertValue(retval, syscallResult, 0, "")
+		retval = b.CreateInsertValue(retval, zero, 1, "")
+		retval = b.CreateInsertValue(retval, errResult, 2, "")
+		return retval, nil
 	case "windows":
 		// On Windows, syscall.Syscall* is basically just a function pointer
 		// call. This is complicated in gc because of stack switching and the

compiler/testdata/basic.ll

@@ -6,36 +6,40 @@ target triple = "wasm32-unknown-wasi"
 %main.kv = type { float }
 %main.kv.0 = type { i8 }
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.addInt(i32 %x, i32 %y, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.addInt(i32 %x, i32 %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = add i32 %x, %y
   ret i32 %0
 }
 
 ; Function Attrs: nounwind
-define hidden i1 @main.equalInt(i32 %x, i32 %y, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.equalInt(i32 %x, i32 %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = icmp eq i32 %x, %y
   ret i1 %0
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.divInt(i32 %x, i32 %y, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.divInt(i32 %x, i32 %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = icmp eq i32 %y, 0
   br i1 %0, label %divbyzero.throw, label %divbyzero.next
 
+divbyzero.throw:                                  ; preds = %entry
+  call void @runtime.divideByZeroPanic(i8* undef) #0
+  unreachable
+
 divbyzero.next:                                   ; preds = %entry
   %1 = icmp eq i32 %y, -1
   %2 = icmp eq i32 %x, -2147483648
@@ -43,35 +47,35 @@ divbyzero.next:                                   ; preds = %entry
   %4 = select i1 %3, i32 1, i32 %y
   %5 = sdiv i32 %x, %4
   ret i32 %5
-
-divbyzero.throw:                                  ; preds = %entry
-  call void @runtime.divideByZeroPanic(i8* undef) #2
-  unreachable
 }
 
-declare void @runtime.divideByZeroPanic(i8*) #0
+declare void @runtime.divideByZeroPanic(i8*)
 
 ; Function Attrs: nounwind
-define hidden i32 @main.divUint(i32 %x, i32 %y, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.divUint(i32 %x, i32 %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = icmp eq i32 %y, 0
   br i1 %0, label %divbyzero.throw, label %divbyzero.next
 
+divbyzero.throw:                                  ; preds = %entry
+  call void @runtime.divideByZeroPanic(i8* undef) #0
+  unreachable
+
 divbyzero.next:                                   ; preds = %entry
   %1 = udiv i32 %x, %y
   ret i32 %1
-
-divbyzero.throw:                                  ; preds = %entry
-  call void @runtime.divideByZeroPanic(i8* undef) #2
-  unreachable
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.remInt(i32 %x, i32 %y, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.remInt(i32 %x, i32 %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = icmp eq i32 %y, 0
   br i1 %0, label %divbyzero.throw, label %divbyzero.next
 
+divbyzero.throw:                                  ; preds = %entry
+  call void @runtime.divideByZeroPanic(i8* undef) #0
+  unreachable
+
 divbyzero.next:                                   ; preds = %entry
   %1 = icmp eq i32 %y, -1
   %2 = icmp eq i32 %x, -2147483648
@@ -79,83 +83,79 @@ divbyzero.next:                                   ; preds = %entry
   %4 = select i1 %3, i32 1, i32 %y
   %5 = srem i32 %x, %4
   ret i32 %5
-
-divbyzero.throw:                                  ; preds = %entry
-  call void @runtime.divideByZeroPanic(i8* undef) #2
-  unreachable
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.remUint(i32 %x, i32 %y, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.remUint(i32 %x, i32 %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = icmp eq i32 %y, 0
   br i1 %0, label %divbyzero.throw, label %divbyzero.next
 
+divbyzero.throw:                                  ; preds = %entry
+  call void @runtime.divideByZeroPanic(i8* undef) #0
+  unreachable
+
 divbyzero.next:                                   ; preds = %entry
   %1 = urem i32 %x, %y
   ret i32 %1
-
-divbyzero.throw:                                  ; preds = %entry
-  call void @runtime.divideByZeroPanic(i8* undef) #2
-  unreachable
 }
 
 ; Function Attrs: nounwind
-define hidden i1 @main.floatEQ(float %x, float %y, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.floatEQ(float %x, float %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = fcmp oeq float %x, %y
   ret i1 %0
 }
 
 ; Function Attrs: nounwind
-define hidden i1 @main.floatNE(float %x, float %y, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.floatNE(float %x, float %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = fcmp une float %x, %y
   ret i1 %0
 }
 
 ; Function Attrs: nounwind
-define hidden i1 @main.floatLower(float %x, float %y, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.floatLower(float %x, float %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = fcmp olt float %x, %y
   ret i1 %0
 }
 
 ; Function Attrs: nounwind
-define hidden i1 @main.floatLowerEqual(float %x, float %y, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.floatLowerEqual(float %x, float %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = fcmp ole float %x, %y
   ret i1 %0
 }
 
 ; Function Attrs: nounwind
-define hidden i1 @main.floatGreater(float %x, float %y, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.floatGreater(float %x, float %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = fcmp ogt float %x, %y
   ret i1 %0
 }
 
 ; Function Attrs: nounwind
-define hidden i1 @main.floatGreaterEqual(float %x, float %y, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.floatGreaterEqual(float %x, float %y, i8* %context) unnamed_addr #0 {
 entry:
   %0 = fcmp oge float %x, %y
   ret i1 %0
 }
 
 ; Function Attrs: nounwind
-define hidden float @main.complexReal(float %x.r, float %x.i, i8* %context) unnamed_addr #1 {
+define hidden float @main.complexReal(float %x.r, float %x.i, i8* %context) unnamed_addr #0 {
 entry:
   ret float %x.r
 }
 
 ; Function Attrs: nounwind
-define hidden float @main.complexImag(float %x.r, float %x.i, i8* %context) unnamed_addr #1 {
+define hidden float @main.complexImag(float %x.r, float %x.i, i8* %context) unnamed_addr #0 {
 entry:
   ret float %x.i
 }
 
 ; Function Attrs: nounwind
-define hidden { float, float } @main.complexAdd(float %x.r, float %x.i, float %y.r, float %y.i, i8* %context) unnamed_addr #1 {
+define hidden { float, float } @main.complexAdd(float %x.r, float %x.i, float %y.r, float %y.i, i8* %context) unnamed_addr #0 {
 entry:
   %0 = fadd float %x.r, %y.r
   %1 = fadd float %x.i, %y.i
@@ -165,7 +165,7 @@ entry:
 }
 
 ; Function Attrs: nounwind
-define hidden { float, float } @main.complexSub(float %x.r, float %x.i, float %y.r, float %y.i, i8* %context) unnamed_addr #1 {
+define hidden { float, float } @main.complexSub(float %x.r, float %x.i, float %y.r, float %y.i, i8* %context) unnamed_addr #0 {
 entry:
   %0 = fsub float %x.r, %y.r
   %1 = fsub float %x.i, %y.i
@@ -175,7 +175,7 @@ entry:
 }
 
 ; Function Attrs: nounwind
-define hidden { float, float } @main.complexMul(float %x.r, float %x.i, float %y.r, float %y.i, i8* %context) unnamed_addr #1 {
+define hidden { float, float } @main.complexMul(float %x.r, float %x.i, float %y.r, float %y.i, i8* %context) unnamed_addr #0 {
 entry:
   %0 = fmul float %x.r, %y.r
   %1 = fmul float %x.i, %y.i
@@ -189,18 +189,16 @@ entry:
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.foo(%main.kv* dereferenceable_or_null(4) %a, i8* %context) unnamed_addr #1 {
+define hidden void @main.foo(%main.kv* dereferenceable_or_null(4) %a, i8* %context) unnamed_addr #0 {
 entry:
   call void @"main.foo$1"(%main.kv.0* null, i8* undef)
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @"main.foo$1"(%main.kv.0* dereferenceable_or_null(1) %b, i8* %context) unnamed_addr #1 {
+define hidden void @"main.foo$1"(%main.kv.0* dereferenceable_or_null(1) %b, i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { nounwind }
+attributes #0 = { nounwind }

compiler/testdata/channel.ll

@@ -5,24 +5,24 @@ target triple = "wasm32-unknown-wasi"
 
 %runtime.channel = type { i32, i32, i8, %runtime.channelBlockedList*, i32, i32, i32, i8* }
 %runtime.channelBlockedList = type { %runtime.channelBlockedList*, %"internal/task.Task"*, %runtime.chanSelectState*, { %runtime.channelBlockedList*, i32, i32 } }
-%"internal/task.Task" = type { %"internal/task.Task"*, i8*, i64, %"internal/task.gcData", %"internal/task.state", i8* }
+%"internal/task.Task" = type { %"internal/task.Task"*, i8*, i64, %"internal/task.gcData", %"internal/task.state" }
 %"internal/task.gcData" = type { i8* }
 %"internal/task.state" = type { i32, i8*, %"internal/task.stackState", i1 }
 %"internal/task.stackState" = type { i32, i32 }
 %runtime.chanSelectState = type { %runtime.channel*, i8* }
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.chanIntSend(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #1 {
+define hidden void @main.chanIntSend(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #0 {
 entry:
   %chan.blockedList = alloca %runtime.channelBlockedList, align 8
   %chan.value = alloca i32, align 4
@@ -31,22 +31,22 @@ entry:
   store i32 3, i32* %chan.value, align 4
   %chan.blockedList.bitcast = bitcast %runtime.channelBlockedList* %chan.blockedList to i8*
   call void @llvm.lifetime.start.p0i8(i64 24, i8* nonnull %chan.blockedList.bitcast)
-  call void @runtime.chanSend(%runtime.channel* %ch, i8* nonnull %chan.value.bitcast, %runtime.channelBlockedList* nonnull %chan.blockedList, i8* undef) #3
+  call void @runtime.chanSend(%runtime.channel* %ch, i8* nonnull %chan.value.bitcast, %runtime.channelBlockedList* nonnull %chan.blockedList, i8* undef) #0
   call void @llvm.lifetime.end.p0i8(i64 24, i8* nonnull %chan.blockedList.bitcast)
   call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %chan.value.bitcast)
   ret void
 }
 
 ; Function Attrs: argmemonly nofree nosync nounwind willreturn
-declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #2
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
 
-declare void @runtime.chanSend(%runtime.channel* dereferenceable_or_null(32), i8*, %runtime.channelBlockedList* dereferenceable_or_null(24), i8*) #0
+declare void @runtime.chanSend(%runtime.channel* dereferenceable_or_null(32), i8*, %runtime.channelBlockedList* dereferenceable_or_null(24), i8*)
 
 ; Function Attrs: argmemonly nofree nosync nounwind willreturn
-declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #2
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
 
 ; Function Attrs: nounwind
-define hidden void @main.chanIntRecv(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #1 {
+define hidden void @main.chanIntRecv(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #0 {
 entry:
   %chan.blockedList = alloca %runtime.channelBlockedList, align 8
   %chan.value = alloca i32, align 4
@@ -54,41 +54,41 @@ entry:
   call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %chan.value.bitcast)
   %chan.blockedList.bitcast = bitcast %runtime.channelBlockedList* %chan.blockedList to i8*
   call void @llvm.lifetime.start.p0i8(i64 24, i8* nonnull %chan.blockedList.bitcast)
-  %0 = call i1 @runtime.chanRecv(%runtime.channel* %ch, i8* nonnull %chan.value.bitcast, %runtime.channelBlockedList* nonnull %chan.blockedList, i8* undef) #3
+  %0 = call i1 @runtime.chanRecv(%runtime.channel* %ch, i8* nonnull %chan.value.bitcast, %runtime.channelBlockedList* nonnull %chan.blockedList, i8* undef) #0
   call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %chan.value.bitcast)
   call void @llvm.lifetime.end.p0i8(i64 24, i8* nonnull %chan.blockedList.bitcast)
   ret void
 }
 
-declare i1 @runtime.chanRecv(%runtime.channel* dereferenceable_or_null(32), i8*, %runtime.channelBlockedList* dereferenceable_or_null(24), i8*) #0
+declare i1 @runtime.chanRecv(%runtime.channel* dereferenceable_or_null(32), i8*, %runtime.channelBlockedList* dereferenceable_or_null(24), i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.chanZeroSend(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #1 {
+define hidden void @main.chanZeroSend(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #0 {
 entry:
   %complit = alloca {}, align 8
   %chan.blockedList = alloca %runtime.channelBlockedList, align 8
   %0 = bitcast {}* %complit to i8*
-  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #3
+  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #0
   %chan.blockedList.bitcast = bitcast %runtime.channelBlockedList* %chan.blockedList to i8*
   call void @llvm.lifetime.start.p0i8(i64 24, i8* nonnull %chan.blockedList.bitcast)
-  call void @runtime.chanSend(%runtime.channel* %ch, i8* null, %runtime.channelBlockedList* nonnull %chan.blockedList, i8* undef) #3
+  call void @runtime.chanSend(%runtime.channel* %ch, i8* null, %runtime.channelBlockedList* nonnull %chan.blockedList, i8* undef) #0
   call void @llvm.lifetime.end.p0i8(i64 24, i8* nonnull %chan.blockedList.bitcast)
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.chanZeroRecv(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #1 {
+define hidden void @main.chanZeroRecv(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #0 {
 entry:
   %chan.blockedList = alloca %runtime.channelBlockedList, align 8
   %chan.blockedList.bitcast = bitcast %runtime.channelBlockedList* %chan.blockedList to i8*
   call void @llvm.lifetime.start.p0i8(i64 24, i8* nonnull %chan.blockedList.bitcast)
-  %0 = call i1 @runtime.chanRecv(%runtime.channel* %ch, i8* null, %runtime.channelBlockedList* nonnull %chan.blockedList, i8* undef) #3
+  %0 = call i1 @runtime.chanRecv(%runtime.channel* %ch, i8* null, %runtime.channelBlockedList* nonnull %chan.blockedList, i8* undef) #0
   call void @llvm.lifetime.end.p0i8(i64 24, i8* nonnull %chan.blockedList.bitcast)
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.selectZeroRecv(%runtime.channel* dereferenceable_or_null(32) %ch1, %runtime.channel* dereferenceable_or_null(32) %ch2, i8* %context) unnamed_addr #1 {
+define hidden void @main.selectZeroRecv(%runtime.channel* dereferenceable_or_null(32) %ch1, %runtime.channel* dereferenceable_or_null(32) %ch2, i8* %context) unnamed_addr #0 {
 entry:
   %select.states.alloca = alloca [2 x %runtime.chanSelectState], align 8
   %select.send.value = alloca i32, align 4
@@ -105,7 +105,7 @@ entry:
   %.repack4 = getelementptr inbounds [2 x %runtime.chanSelectState], [2 x %runtime.chanSelectState]* %select.states.alloca, i32 0, i32 1, i32 1
   store i8* null, i8** %.repack4, align 4
   %select.states = getelementptr inbounds [2 x %runtime.chanSelectState], [2 x %runtime.chanSelectState]* %select.states.alloca, i32 0, i32 0
-  %select.result = call { i32, i1 } @runtime.tryChanSelect(i8* undef, %runtime.chanSelectState* nonnull %select.states, i32 2, i32 2, i8* undef) #3
+  %select.result = call { i32, i1 } @runtime.tryChanSelect(i8* undef, %runtime.chanSelectState* nonnull %select.states, i32 2, i32 2, i8* undef) #0
   call void @llvm.lifetime.end.p0i8(i64 16, i8* nonnull %select.states.alloca.bitcast)
   %1 = extractvalue { i32, i1 } %select.result, 0
   %2 = icmp eq i32 %1, 0
@@ -122,9 +122,7 @@ select.body:                                      ; preds = %select.next
   br label %select.done
 }
 
-declare { i32, i1 } @runtime.tryChanSelect(i8*, %runtime.chanSelectState*, i32, i32, i8*) #0
+declare { i32, i1 } @runtime.tryChanSelect(i8*, %runtime.chanSelectState*, i32, i32, i8*)
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { argmemonly nofree nosync nounwind willreturn }
-attributes #3 = { nounwind }
+attributes #0 = { nounwind }
+attributes #1 = { argmemonly nofree nosync nounwind willreturn }

compiler/testdata/defer-cortex-m-qemu.ll

@@ -1,266 +0,0 @@
-; ModuleID = 'defer.go'
-source_filename = "defer.go"
-target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"
-target triple = "thumbv7m-unknown-unknown-eabi"
-
-%runtime._defer = type { i32, %runtime._defer* }
-%runtime.deferFrame = type { i8*, i8*, [0 x i8*], %runtime.deferFrame*, i1, %runtime._interface }
-%runtime._interface = type { i32, i8* }
-
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
-
-; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
-entry:
-  ret void
-}
-
-declare void @main.external(i8*) #0
-
-; Function Attrs: nounwind
-define hidden void @main.deferSimple(i8* %context) unnamed_addr #1 {
-entry:
-  %defer.alloca = alloca { i32, %runtime._defer* }, align 4
-  %deferPtr = alloca %runtime._defer*, align 4
-  store %runtime._defer* null, %runtime._defer** %deferPtr, align 4
-  %deferframe.buf = alloca %runtime.deferFrame, align 4
-  %0 = call i8* @llvm.stacksave()
-  call void @runtime.setupDeferFrame(%runtime.deferFrame* nonnull %deferframe.buf, i8* %0, i8* undef) #3
-  %defer.alloca.repack = getelementptr inbounds { i32, %runtime._defer* }, { i32, %runtime._defer* }* %defer.alloca, i32 0, i32 0
-  store i32 0, i32* %defer.alloca.repack, align 4
-  %defer.alloca.repack16 = getelementptr inbounds { i32, %runtime._defer* }, { i32, %runtime._defer* }* %defer.alloca, i32 0, i32 1
-  store %runtime._defer* null, %runtime._defer** %defer.alloca.repack16, align 4
-  %1 = bitcast %runtime._defer** %deferPtr to { i32, %runtime._defer* }**
-  store { i32, %runtime._defer* }* %defer.alloca, { i32, %runtime._defer* }** %1, align 4
-  %setjmp = call i32 asm "\0Amovs r0, #0\0Amov r2, pc\0Astr r2, [r1, #4]", "={r0},{r1},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{cpsr},~{memory}"(%runtime.deferFrame* nonnull %deferframe.buf) #4
-  %setjmp.result = icmp eq i32 %setjmp, 0
-  br i1 %setjmp.result, label %2, label %lpad
-
-2:                                                ; preds = %entry
-  call void @main.external(i8* undef) #3
-  br label %rundefers.loophead
-
-rundefers.loophead:                               ; preds = %4, %2
-  %3 = load %runtime._defer*, %runtime._defer** %deferPtr, align 4
-  %stackIsNil = icmp eq %runtime._defer* %3, null
-  br i1 %stackIsNil, label %rundefers.end, label %rundefers.loop
-
-rundefers.loop:                                   ; preds = %rundefers.loophead
-  %stack.next.gep = getelementptr inbounds %runtime._defer, %runtime._defer* %3, i32 0, i32 1
-  %stack.next = load %runtime._defer*, %runtime._defer** %stack.next.gep, align 4
-  store %runtime._defer* %stack.next, %runtime._defer** %deferPtr, align 4
-  %callback.gep = getelementptr inbounds %runtime._defer, %runtime._defer* %3, i32 0, i32 0
-  %callback = load i32, i32* %callback.gep, align 4
-  switch i32 %callback, label %rundefers.default [
-    i32 0, label %rundefers.callback0
-  ]
-
-rundefers.callback0:                              ; preds = %rundefers.loop
-  %setjmp1 = call i32 asm "\0Amovs r0, #0\0Amov r2, pc\0Astr r2, [r1, #4]", "={r0},{r1},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{cpsr},~{memory}"(%runtime.deferFrame* nonnull %deferframe.buf) #4
-  %setjmp.result2 = icmp eq i32 %setjmp1, 0
-  br i1 %setjmp.result2, label %4, label %lpad
-
-4:                                                ; preds = %rundefers.callback0
-  call void @"main.deferSimple$1"(i8* undef)
-  br label %rundefers.loophead
-
-rundefers.default:                                ; preds = %rundefers.loop
-  unreachable
-
-rundefers.end:                                    ; preds = %rundefers.loophead
-  call void @runtime.destroyDeferFrame(%runtime.deferFrame* nonnull %deferframe.buf, i8* undef) #3
-  ret void
-
-recover:                                          ; preds = %rundefers.end3
-  call void @runtime.destroyDeferFrame(%runtime.deferFrame* nonnull %deferframe.buf, i8* undef) #3
-  ret void
-
-lpad:                                             ; preds = %rundefers.callback012, %rundefers.callback0, %entry
-  br label %rundefers.loophead6
-
-rundefers.loophead6:                              ; preds = %6, %lpad
-  %5 = load %runtime._defer*, %runtime._defer** %deferPtr, align 4
-  %stackIsNil7 = icmp eq %runtime._defer* %5, null
-  br i1 %stackIsNil7, label %rundefers.end3, label %rundefers.loop5
-
-rundefers.loop5:                                  ; preds = %rundefers.loophead6
-  %stack.next.gep8 = getelementptr inbounds %runtime._defer, %runtime._defer* %5, i32 0, i32 1
-  %stack.next9 = load %runtime._defer*, %runtime._defer** %stack.next.gep8, align 4
-  store %runtime._defer* %stack.next9, %runtime._defer** %deferPtr, align 4
-  %callback.gep10 = getelementptr inbounds %runtime._defer, %runtime._defer* %5, i32 0, i32 0
-  %callback11 = load i32, i32* %callback.gep10, align 4
-  switch i32 %callback11, label %rundefers.default4 [
-    i32 0, label %rundefers.callback012
-  ]
-
-rundefers.callback012:                            ; preds = %rundefers.loop5
-  %setjmp14 = call i32 asm "\0Amovs r0, #0\0Amov r2, pc\0Astr r2, [r1, #4]", "={r0},{r1},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{cpsr},~{memory}"(%runtime.deferFrame* nonnull %deferframe.buf) #4
-  %setjmp.result15 = icmp eq i32 %setjmp14, 0
-  br i1 %setjmp.result15, label %6, label %lpad
-
-6:                                                ; preds = %rundefers.callback012
-  call void @"main.deferSimple$1"(i8* undef)
-  br label %rundefers.loophead6
-
-rundefers.default4:                               ; preds = %rundefers.loop5
-  unreachable
-
-rundefers.end3:                                   ; preds = %rundefers.loophead6
-  br label %recover
-}
-
-; Function Attrs: nofree nosync nounwind willreturn
-declare i8* @llvm.stacksave() #2
-
-declare void @runtime.setupDeferFrame(%runtime.deferFrame* dereferenceable_or_null(24), i8*, i8*) #0
-
-; Function Attrs: nounwind
-define hidden void @"main.deferSimple$1"(i8* %context) unnamed_addr #1 {
-entry:
-  call void @runtime.printint32(i32 3, i8* undef) #3
-  ret void
-}
-
-declare void @runtime.destroyDeferFrame(%runtime.deferFrame* dereferenceable_or_null(24), i8*) #0
-
-declare void @runtime.printint32(i32, i8*) #0
-
-; Function Attrs: nounwind
-define hidden void @main.deferMultiple(i8* %context) unnamed_addr #1 {
-entry:
-  %defer.alloca2 = alloca { i32, %runtime._defer* }, align 4
-  %defer.alloca = alloca { i32, %runtime._defer* }, align 4
-  %deferPtr = alloca %runtime._defer*, align 4
-  store %runtime._defer* null, %runtime._defer** %deferPtr, align 4
-  %deferframe.buf = alloca %runtime.deferFrame, align 4
-  %0 = call i8* @llvm.stacksave()
-  call void @runtime.setupDeferFrame(%runtime.deferFrame* nonnull %deferframe.buf, i8* %0, i8* undef) #3
-  %defer.alloca.repack = getelementptr inbounds { i32, %runtime._defer* }, { i32, %runtime._defer* }* %defer.alloca, i32 0, i32 0
-  store i32 0, i32* %defer.alloca.repack, align 4
-  %defer.alloca.repack26 = getelementptr inbounds { i32, %runtime._defer* }, { i32, %runtime._defer* }* %defer.alloca, i32 0, i32 1
-  store %runtime._defer* null, %runtime._defer** %defer.alloca.repack26, align 4
-  %1 = bitcast %runtime._defer** %deferPtr to { i32, %runtime._defer* }**
-  store { i32, %runtime._defer* }* %defer.alloca, { i32, %runtime._defer* }** %1, align 4
-  %defer.alloca2.repack = getelementptr inbounds { i32, %runtime._defer* }, { i32, %runtime._defer* }* %defer.alloca2, i32 0, i32 0
-  store i32 1, i32* %defer.alloca2.repack, align 4
-  %defer.alloca2.repack27 = getelementptr inbounds { i32, %runtime._defer* }, { i32, %runtime._defer* }* %defer.alloca2, i32 0, i32 1
-  %2 = bitcast %runtime._defer** %defer.alloca2.repack27 to { i32, %runtime._defer* }**
-  store { i32, %runtime._defer* }* %defer.alloca, { i32, %runtime._defer* }** %2, align 4
-  %3 = bitcast %runtime._defer** %deferPtr to { i32, %runtime._defer* }**
-  store { i32, %runtime._defer* }* %defer.alloca2, { i32, %runtime._defer* }** %3, align 4
-  %setjmp = call i32 asm "\0Amovs r0, #0\0Amov r2, pc\0Astr r2, [r1, #4]", "={r0},{r1},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{cpsr},~{memory}"(%runtime.deferFrame* nonnull %deferframe.buf) #4
-  %setjmp.result = icmp eq i32 %setjmp, 0
-  br i1 %setjmp.result, label %4, label %lpad
-
-4:                                                ; preds = %entry
-  call void @main.external(i8* undef) #3
-  br label %rundefers.loophead
-
-rundefers.loophead:                               ; preds = %7, %6, %4
-  %5 = load %runtime._defer*, %runtime._defer** %deferPtr, align 4
-  %stackIsNil = icmp eq %runtime._defer* %5, null
-  br i1 %stackIsNil, label %rundefers.end, label %rundefers.loop
-
-rundefers.loop:                                   ; preds = %rundefers.loophead
-  %stack.next.gep = getelementptr inbounds %runtime._defer, %runtime._defer* %5, i32 0, i32 1
-  %stack.next = load %runtime._defer*, %runtime._defer** %stack.next.gep, align 4
-  store %runtime._defer* %stack.next, %runtime._defer** %deferPtr, align 4
-  %callback.gep = getelementptr inbounds %runtime._defer, %runtime._defer* %5, i32 0, i32 0
-  %callback = load i32, i32* %callback.gep, align 4
-  switch i32 %callback, label %rundefers.default [
-    i32 0, label %rundefers.callback0
-    i32 1, label %rundefers.callback1
-  ]
-
-rundefers.callback0:                              ; preds = %rundefers.loop
-  %setjmp4 = call i32 asm "\0Amovs r0, #0\0Amov r2, pc\0Astr r2, [r1, #4]", "={r0},{r1},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{cpsr},~{memory}"(%runtime.deferFrame* nonnull %deferframe.buf) #4
-  %setjmp.result5 = icmp eq i32 %setjmp4, 0
-  br i1 %setjmp.result5, label %6, label %lpad
-
-6:                                                ; preds = %rundefers.callback0
-  call void @"main.deferMultiple$1"(i8* undef)
-  br label %rundefers.loophead
-
-rundefers.callback1:                              ; preds = %rundefers.loop
-  %setjmp7 = call i32 asm "\0Amovs r0, #0\0Amov r2, pc\0Astr r2, [r1, #4]", "={r0},{r1},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{cpsr},~{memory}"(%runtime.deferFrame* nonnull %deferframe.buf) #4
-  %setjmp.result8 = icmp eq i32 %setjmp7, 0
-  br i1 %setjmp.result8, label %7, label %lpad
-
-7:                                                ; preds = %rundefers.callback1
-  call void @"main.deferMultiple$2"(i8* undef)
-  br label %rundefers.loophead
-
-rundefers.default:                                ; preds = %rundefers.loop
-  unreachable
-
-rundefers.end:                                    ; preds = %rundefers.loophead
-  call void @runtime.destroyDeferFrame(%runtime.deferFrame* nonnull %deferframe.buf, i8* undef) #3
-  ret void
-
-recover:                                          ; preds = %rundefers.end9
-  call void @runtime.destroyDeferFrame(%runtime.deferFrame* nonnull %deferframe.buf, i8* undef) #3
-  ret void
-
-lpad:                                             ; preds = %rundefers.callback122, %rundefers.callback018, %rundefers.callback1, %rundefers.callback0, %entry
-  br label %rundefers.loophead12
-
-rundefers.loophead12:                             ; preds = %10, %9, %lpad
-  %8 = load %runtime._defer*, %runtime._defer** %deferPtr, align 4
-  %stackIsNil13 = icmp eq %runtime._defer* %8, null
-  br i1 %stackIsNil13, label %rundefers.end9, label %rundefers.loop11
-
-rundefers.loop11:                                 ; preds = %rundefers.loophead12
-  %stack.next.gep14 = getelementptr inbounds %runtime._defer, %runtime._defer* %8, i32 0, i32 1
-  %stack.next15 = load %runtime._defer*, %runtime._defer** %stack.next.gep14, align 4
-  store %runtime._defer* %stack.next15, %runtime._defer** %deferPtr, align 4
-  %callback.gep16 = getelementptr inbounds %runtime._defer, %runtime._defer* %8, i32 0, i32 0
-  %callback17 = load i32, i32* %callback.gep16, align 4
-  switch i32 %callback17, label %rundefers.default10 [
-    i32 0, label %rundefers.callback018
-    i32 1, label %rundefers.callback122
-  ]
-
-rundefers.callback018:                            ; preds = %rundefers.loop11
-  %setjmp20 = call i32 asm "\0Amovs r0, #0\0Amov r2, pc\0Astr r2, [r1, #4]", "={r0},{r1},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{cpsr},~{memory}"(%runtime.deferFrame* nonnull %deferframe.buf) #4
-  %setjmp.result21 = icmp eq i32 %setjmp20, 0
-  br i1 %setjmp.result21, label %9, label %lpad
-
-9:                                                ; preds = %rundefers.callback018
-  call void @"main.deferMultiple$1"(i8* undef)
-  br label %rundefers.loophead12
-
-rundefers.callback122:                            ; preds = %rundefers.loop11
-  %setjmp24 = call i32 asm "\0Amovs r0, #0\0Amov r2, pc\0Astr r2, [r1, #4]", "={r0},{r1},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{r10},~{r11},~{r12},~{lr},~{q0},~{q1},~{q2},~{q3},~{q4},~{q5},~{q6},~{q7},~{q8},~{q9},~{q10},~{q11},~{q12},~{q13},~{q14},~{q15},~{cpsr},~{memory}"(%runtime.deferFrame* nonnull %deferframe.buf) #4
-  %setjmp.result25 = icmp eq i32 %setjmp24, 0
-  br i1 %setjmp.result25, label %10, label %lpad
-
-10:                                               ; preds = %rundefers.callback122
-  call void @"main.deferMultiple$2"(i8* undef)
-  br label %rundefers.loophead12
-
-rundefers.default10:                              ; preds = %rundefers.loop11
-  unreachable
-
-rundefers.end9:                                   ; preds = %rundefers.loophead12
-  br label %recover
-}
-
-; Function Attrs: nounwind
-define hidden void @"main.deferMultiple$1"(i8* %context) unnamed_addr #1 {
-entry:
-  call void @runtime.printint32(i32 3, i8* undef) #3
-  ret void
-}
-
-; Function Attrs: nounwind
-define hidden void @"main.deferMultiple$2"(i8* %context) unnamed_addr #1 {
-entry:
-  call void @runtime.printint32(i32 5, i8* undef) #3
-  ret void
-}
-
-attributes #0 = { "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
-attributes #1 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
-attributes #2 = { nofree nosync nounwind willreturn }
-attributes #3 = { nounwind }
-attributes #4 = { nounwind returns_twice }

compiler/testdata/defer.go

@@ -1,20 +0,0 @@
-package main
-
-func external()
-
-func deferSimple() {
-	defer func() {
-		print(3)
-	}()
-	external()
-}
-
-func deferMultiple() {
-	defer func() {
-		print(3)
-	}()
-	defer func() {
-		print(5)
-	}()
-	external()
-}

compiler/testdata/float.ll

@@ -3,18 +3,18 @@ source_filename = "float.go"
 target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.f32tou32(float %v, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.f32tou32(float %v, i8* %context) unnamed_addr #0 {
 entry:
   %positive = fcmp oge float %v, 0.000000e+00
   %withinmax = fcmp ole float %v, 0x41EFFFFFC0000000
@@ -26,25 +26,25 @@ entry:
 }
 
 ; Function Attrs: nounwind
-define hidden float @main.maxu32f(i8* %context) unnamed_addr #1 {
+define hidden float @main.maxu32f(i8* %context) unnamed_addr #0 {
 entry:
   ret float 0x41F0000000000000
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.maxu32tof32(i8* %context) unnamed_addr #1 {
+define hidden i32 @main.maxu32tof32(i8* %context) unnamed_addr #0 {
 entry:
   ret i32 -1
 }
 
 ; Function Attrs: nounwind
-define hidden { i32, i32, i32, i32 } @main.inftoi32(i8* %context) unnamed_addr #1 {
+define hidden { i32, i32, i32, i32 } @main.inftoi32(i8* %context) unnamed_addr #0 {
 entry:
   ret { i32, i32, i32, i32 } { i32 -1, i32 0, i32 2147483647, i32 -2147483648 }
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.u32tof32tou32(i32 %v, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.u32tof32tou32(i32 %v, i8* %context) unnamed_addr #0 {
 entry:
   %0 = uitofp i32 %v to float
   %withinmax = fcmp ole float %0, 0x41EFFFFFC0000000
@@ -54,7 +54,7 @@ entry:
 }
 
 ; Function Attrs: nounwind
-define hidden float @main.f32tou32tof32(float %v, i8* %context) unnamed_addr #1 {
+define hidden float @main.f32tou32tof32(float %v, i8* %context) unnamed_addr #0 {
 entry:
   %positive = fcmp oge float %v, 0.000000e+00
   %withinmax = fcmp ole float %v, 0x41EFFFFFC0000000
@@ -67,7 +67,7 @@ entry:
 }
 
 ; Function Attrs: nounwind
-define hidden i8 @main.f32tou8(float %v, i8* %context) unnamed_addr #1 {
+define hidden i8 @main.f32tou8(float %v, i8* %context) unnamed_addr #0 {
 entry:
   %positive = fcmp oge float %v, 0.000000e+00
   %withinmax = fcmp ole float %v, 2.550000e+02
@@ -79,7 +79,7 @@ entry:
 }
 
 ; Function Attrs: nounwind
-define hidden i8 @main.f32toi8(float %v, i8* %context) unnamed_addr #1 {
+define hidden i8 @main.f32toi8(float %v, i8* %context) unnamed_addr #0 {
 entry:
   %abovemin = fcmp oge float %v, -1.280000e+02
   %belowmax = fcmp ole float %v, 1.270000e+02
@@ -92,5 +92,4 @@ entry:
   ret i8 %0
 }
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
+attributes #0 = { nounwind }

compiler/testdata/func.ll

@@ -3,47 +3,45 @@ source_filename = "func.go"
 target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.foo(i8* %callback.context, void ()* %callback.funcptr, i8* %context) unnamed_addr #1 {
+define hidden void @main.foo(i8* %callback.context, void ()* %callback.funcptr, i8* %context) unnamed_addr #0 {
 entry:
   %0 = icmp eq void ()* %callback.funcptr, null
   br i1 %0, label %fpcall.throw, label %fpcall.next
 
+fpcall.throw:                                     ; preds = %entry
+  call void @runtime.nilPanic(i8* undef) #0
+  unreachable
+
 fpcall.next:                                      ; preds = %entry
   %1 = bitcast void ()* %callback.funcptr to void (i32, i8*)*
-  call void %1(i32 3, i8* %callback.context) #2
+  call void %1(i32 3, i8* %callback.context) #0
   ret void
-
-fpcall.throw:                                     ; preds = %entry
-  call void @runtime.nilPanic(i8* undef) #2
-  unreachable
 }
 
-declare void @runtime.nilPanic(i8*) #0
+declare void @runtime.nilPanic(i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.bar(i8* %context) unnamed_addr #1 {
+define hidden void @main.bar(i8* %context) unnamed_addr #0 {
 entry:
   call void @main.foo(i8* undef, void ()* bitcast (void (i32, i8*)* @main.someFunc to void ()*), i8* undef)
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.someFunc(i32 %arg0, i8* %context) unnamed_addr #1 {
+define hidden void @main.someFunc(i32 %arg0, i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { nounwind }
+attributes #0 = { nounwind }

compiler/testdata/gc.ll

@@ -26,91 +26,91 @@ target triple = "wasm32-unknown-wasi"
 @"reflect/types.type:basic:complex128" = linkonce_odr constant %runtime.typecodeID { %runtime.typecodeID* null, i32 0, %runtime.interfaceMethodInfo* null, %runtime.typecodeID* @"reflect/types.type:pointer:basic:complex128", i32 0 }
 @"reflect/types.type:pointer:basic:complex128" = linkonce_odr constant %runtime.typecodeID { %runtime.typecodeID* @"reflect/types.type:basic:complex128", i32 0, %runtime.interfaceMethodInfo* null, %runtime.typecodeID* null, i32 0 }
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.newScalar(i8* %context) unnamed_addr #1 {
+define hidden void @main.newScalar(i8* %context) unnamed_addr #0 {
 entry:
-  %new = call i8* @runtime.alloc(i32 1, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %new, i8* undef) #2
+  %new = call i8* @runtime.alloc(i32 1, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %new, i8* undef) #0
   store i8* %new, i8** @main.scalar1, align 4
-  %new1 = call i8* @runtime.alloc(i32 4, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %new1, i8* undef) #2
+  %new1 = call i8* @runtime.alloc(i32 4, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %new1, i8* undef) #0
   store i8* %new1, i8** bitcast (i32** @main.scalar2 to i8**), align 4
-  %new2 = call i8* @runtime.alloc(i32 8, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %new2, i8* undef) #2
+  %new2 = call i8* @runtime.alloc(i32 8, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %new2, i8* undef) #0
   store i8* %new2, i8** bitcast (i64** @main.scalar3 to i8**), align 4
-  %new3 = call i8* @runtime.alloc(i32 4, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %new3, i8* undef) #2
+  %new3 = call i8* @runtime.alloc(i32 4, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %new3, i8* undef) #0
   store i8* %new3, i8** bitcast (float** @main.scalar4 to i8**), align 4
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.newArray(i8* %context) unnamed_addr #1 {
+define hidden void @main.newArray(i8* %context) unnamed_addr #0 {
 entry:
-  %new = call i8* @runtime.alloc(i32 3, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %new, i8* undef) #2
+  %new = call i8* @runtime.alloc(i32 3, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %new, i8* undef) #0
   store i8* %new, i8** bitcast ([3 x i8]** @main.array1 to i8**), align 4
-  %new1 = call i8* @runtime.alloc(i32 71, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %new1, i8* undef) #2
+  %new1 = call i8* @runtime.alloc(i32 71, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %new1, i8* undef) #0
   store i8* %new1, i8** bitcast ([71 x i8]** @main.array2 to i8**), align 4
-  %new2 = call i8* @runtime.alloc(i32 12, i8* nonnull inttoptr (i32 67 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %new2, i8* undef) #2
+  %new2 = call i8* @runtime.alloc(i32 12, i8* nonnull inttoptr (i32 67 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %new2, i8* undef) #0
   store i8* %new2, i8** bitcast ([3 x i8*]** @main.array3 to i8**), align 4
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.newStruct(i8* %context) unnamed_addr #1 {
+define hidden void @main.newStruct(i8* %context) unnamed_addr #0 {
 entry:
-  %new = call i8* @runtime.alloc(i32 0, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %new, i8* undef) #2
+  %new = call i8* @runtime.alloc(i32 0, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %new, i8* undef) #0
   store i8* %new, i8** bitcast ({}** @main.struct1 to i8**), align 4
-  %new1 = call i8* @runtime.alloc(i32 8, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %new1, i8* undef) #2
+  %new1 = call i8* @runtime.alloc(i32 8, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %new1, i8* undef) #0
   store i8* %new1, i8** bitcast ({ i32, i32 }** @main.struct2 to i8**), align 4
-  %new2 = call i8* @runtime.alloc(i32 248, i8* bitcast ({ i32, [8 x i8] }* @"runtime/gc.layout:62-2000000000000001" to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %new2, i8* undef) #2
+  %new2 = call i8* @runtime.alloc(i32 248, i8* bitcast ({ i32, [8 x i8] }* @"runtime/gc.layout:62-2000000000000001" to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %new2, i8* undef) #0
   store i8* %new2, i8** bitcast ({ i8*, [60 x i32], i8* }** @main.struct3 to i8**), align 4
-  %new3 = call i8* @runtime.alloc(i32 248, i8* bitcast ({ i32, [8 x i8] }* @"runtime/gc.layout:62-0001" to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %new3, i8* undef) #2
+  %new3 = call i8* @runtime.alloc(i32 248, i8* bitcast ({ i32, [8 x i8] }* @"runtime/gc.layout:62-0001" to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %new3, i8* undef) #0
   store i8* %new3, i8** bitcast ({ i8*, [61 x i32] }** @main.struct4 to i8**), align 4
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden { i8*, void ()* }* @main.newFuncValue(i8* %context) unnamed_addr #1 {
+define hidden { i8*, void ()* }* @main.newFuncValue(i8* %context) unnamed_addr #0 {
 entry:
-  %new = call i8* @runtime.alloc(i32 8, i8* nonnull inttoptr (i32 197 to i8*), i8* undef) #2
+  %new = call i8* @runtime.alloc(i32 8, i8* nonnull inttoptr (i32 197 to i8*), i8* undef) #0
   %0 = bitcast i8* %new to { i8*, void ()* }*
-  call void @runtime.trackPointer(i8* nonnull %new, i8* undef) #2
+  call void @runtime.trackPointer(i8* nonnull %new, i8* undef) #0
   ret { i8*, void ()* }* %0
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.makeSlice(i8* %context) unnamed_addr #1 {
+define hidden void @main.makeSlice(i8* %context) unnamed_addr #0 {
 entry:
-  %makeslice = call i8* @runtime.alloc(i32 5, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %makeslice, i8* undef) #2
+  %makeslice = call i8* @runtime.alloc(i32 5, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %makeslice, i8* undef) #0
   store i8* %makeslice, i8** getelementptr inbounds ({ i8*, i32, i32 }, { i8*, i32, i32 }* @main.slice1, i32 0, i32 0), align 8
   store i32 5, i32* getelementptr inbounds ({ i8*, i32, i32 }, { i8*, i32, i32 }* @main.slice1, i32 0, i32 1), align 4
   store i32 5, i32* getelementptr inbounds ({ i8*, i32, i32 }, { i8*, i32, i32 }* @main.slice1, i32 0, i32 2), align 8
-  %makeslice1 = call i8* @runtime.alloc(i32 20, i8* nonnull inttoptr (i32 67 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %makeslice1, i8* undef) #2
+  %makeslice1 = call i8* @runtime.alloc(i32 20, i8* nonnull inttoptr (i32 67 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %makeslice1, i8* undef) #0
   store i8* %makeslice1, i8** bitcast ({ i32**, i32, i32 }* @main.slice2 to i8**), align 8
   store i32 5, i32* getelementptr inbounds ({ i32**, i32, i32 }, { i32**, i32, i32 }* @main.slice2, i32 0, i32 1), align 4
   store i32 5, i32* getelementptr inbounds ({ i32**, i32, i32 }, { i32**, i32, i32 }* @main.slice2, i32 0, i32 2), align 8
-  %makeslice3 = call i8* @runtime.alloc(i32 60, i8* nonnull inttoptr (i32 71 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %makeslice3, i8* undef) #2
+  %makeslice3 = call i8* @runtime.alloc(i32 60, i8* nonnull inttoptr (i32 71 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %makeslice3, i8* undef) #0
   store i8* %makeslice3, i8** bitcast ({ { i8*, i32, i32 }*, i32, i32 }* @main.slice3 to i8**), align 8
   store i32 5, i32* getelementptr inbounds ({ { i8*, i32, i32 }*, i32, i32 }, { { i8*, i32, i32 }*, i32, i32 }* @main.slice3, i32 0, i32 1), align 4
   store i32 5, i32* getelementptr inbounds ({ { i8*, i32, i32 }*, i32, i32 }, { { i8*, i32, i32 }*, i32, i32 }* @main.slice3, i32 0, i32 2), align 8
@@ -118,20 +118,18 @@ entry:
 }
 
 ; Function Attrs: nounwind
-define hidden %runtime._interface @main.makeInterface(double %v.r, double %v.i, i8* %context) unnamed_addr #1 {
+define hidden %runtime._interface @main.makeInterface(double %v.r, double %v.i, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call i8* @runtime.alloc(i32 16, i8* null, i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #2
+  %0 = call i8* @runtime.alloc(i32 16, i8* null, i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #0
   %.repack = bitcast i8* %0 to double*
   store double %v.r, double* %.repack, align 8
   %.repack1 = getelementptr inbounds i8, i8* %0, i32 8
   %1 = bitcast i8* %.repack1 to double*
   store double %v.i, double* %1, align 8
   %2 = insertvalue %runtime._interface { i32 ptrtoint (%runtime.typecodeID* @"reflect/types.type:basic:complex128" to i32), i8* undef }, i8* %0, 1
-  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #2
+  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #0
   ret %runtime._interface %2
 }
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { nounwind }
+attributes #0 = { nounwind }

compiler/testdata/generics.go

@@ -1,30 +0,0 @@
-package main
-
-import "unsafe"
-
-type Coord interface {
-	int | float32
-}
-
-type Point[T Coord] struct {
-	X, Y T
-}
-
-func Add[T Coord](a, b Point[T]) Point[T] {
-	checkSize(unsafe.Alignof(a))
-	checkSize(unsafe.Sizeof(a))
-	return Point[T]{
-		X: a.X + b.X,
-		Y: a.Y + b.Y,
-	}
-}
-
-func main() {
-	var af, bf Point[float32]
-	Add(af, bf)
-
-	var ai, bi Point[int]
-	Add(ai, bi)
-}
-
-func checkSize(uintptr)

compiler/testdata/generics.ll

@@ -1,259 +0,0 @@
-; ModuleID = 'generics.go'
-source_filename = "generics.go"
-target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
-target triple = "wasm32-unknown-wasi"
-
-%"main.Point[int]" = type { i32, i32 }
-%"main.Point[float32]" = type { float, float }
-
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
-
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
-
-; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
-entry:
-  ret void
-}
-
-; Function Attrs: nounwind
-define hidden void @main.main(i8* %context) unnamed_addr #1 {
-entry:
-  %bi = alloca %"main.Point[int]", align 8
-  %ai = alloca %"main.Point[int]", align 8
-  %bf = alloca %"main.Point[float32]", align 8
-  %af = alloca %"main.Point[float32]", align 8
-  %af.repack = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %af, i32 0, i32 0
-  store float 0.000000e+00, float* %af.repack, align 8
-  %af.repack1 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %af, i32 0, i32 1
-  store float 0.000000e+00, float* %af.repack1, align 4
-  %0 = bitcast %"main.Point[float32]"* %af to i8*
-  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #2
-  %bf.repack = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %bf, i32 0, i32 0
-  store float 0.000000e+00, float* %bf.repack, align 8
-  %bf.repack2 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %bf, i32 0, i32 1
-  store float 0.000000e+00, float* %bf.repack2, align 4
-  %1 = bitcast %"main.Point[float32]"* %bf to i8*
-  call void @runtime.trackPointer(i8* nonnull %1, i8* undef) #2
-  %.elt = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %af, i32 0, i32 0
-  %.unpack = load float, float* %.elt, align 8
-  %.elt3 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %af, i32 0, i32 1
-  %.unpack4 = load float, float* %.elt3, align 4
-  %.elt5 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %bf, i32 0, i32 0
-  %.unpack6 = load float, float* %.elt5, align 8
-  %.elt7 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %bf, i32 0, i32 1
-  %.unpack8 = load float, float* %.elt7, align 4
-  %2 = call %"main.Point[float32]" @"main.Add[float32]"(float %.unpack, float %.unpack4, float %.unpack6, float %.unpack8, i8* undef)
-  %ai.repack = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %ai, i32 0, i32 0
-  store i32 0, i32* %ai.repack, align 8
-  %ai.repack9 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %ai, i32 0, i32 1
-  store i32 0, i32* %ai.repack9, align 4
-  %3 = bitcast %"main.Point[int]"* %ai to i8*
-  call void @runtime.trackPointer(i8* nonnull %3, i8* undef) #2
-  %bi.repack = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %bi, i32 0, i32 0
-  store i32 0, i32* %bi.repack, align 8
-  %bi.repack10 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %bi, i32 0, i32 1
-  store i32 0, i32* %bi.repack10, align 4
-  %4 = bitcast %"main.Point[int]"* %bi to i8*
-  call void @runtime.trackPointer(i8* nonnull %4, i8* undef) #2
-  %.elt11 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %ai, i32 0, i32 0
-  %.unpack12 = load i32, i32* %.elt11, align 8
-  %.elt13 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %ai, i32 0, i32 1
-  %.unpack14 = load i32, i32* %.elt13, align 4
-  %.elt15 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %bi, i32 0, i32 0
-  %.unpack16 = load i32, i32* %.elt15, align 8
-  %.elt17 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %bi, i32 0, i32 1
-  %.unpack18 = load i32, i32* %.elt17, align 4
-  %5 = call %"main.Point[int]" @"main.Add[int]"(i32 %.unpack12, i32 %.unpack14, i32 %.unpack16, i32 %.unpack18, i8* undef)
-  ret void
-}
-
-; Function Attrs: nounwind
-define linkonce_odr hidden %"main.Point[float32]" @"main.Add[float32]"(float %a.X, float %a.Y, float %b.X, float %b.Y, i8* %context) unnamed_addr #1 {
-entry:
-  %complit = alloca %"main.Point[float32]", align 8
-  %b = alloca %"main.Point[float32]", align 8
-  %a = alloca %"main.Point[float32]", align 8
-  %a.repack = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 0
-  store float 0.000000e+00, float* %a.repack, align 8
-  %a.repack9 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 1
-  store float 0.000000e+00, float* %a.repack9, align 4
-  %0 = bitcast %"main.Point[float32]"* %a to i8*
-  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #2
-  %a.repack10 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 0
-  store float %a.X, float* %a.repack10, align 8
-  %a.repack11 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 1
-  store float %a.Y, float* %a.repack11, align 4
-  %b.repack = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 0
-  store float 0.000000e+00, float* %b.repack, align 8
-  %b.repack13 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 1
-  store float 0.000000e+00, float* %b.repack13, align 4
-  %1 = bitcast %"main.Point[float32]"* %b to i8*
-  call void @runtime.trackPointer(i8* nonnull %1, i8* undef) #2
-  %b.repack14 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 0
-  store float %b.X, float* %b.repack14, align 8
-  %b.repack15 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 1
-  store float %b.Y, float* %b.repack15, align 4
-  call void @main.checkSize(i32 4, i8* undef) #2
-  call void @main.checkSize(i32 8, i8* undef) #2
-  %complit.repack = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %complit, i32 0, i32 0
-  store float 0.000000e+00, float* %complit.repack, align 8
-  %complit.repack17 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %complit, i32 0, i32 1
-  store float 0.000000e+00, float* %complit.repack17, align 4
-  %2 = bitcast %"main.Point[float32]"* %complit to i8*
-  call void @runtime.trackPointer(i8* nonnull %2, i8* undef) #2
-  %3 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %complit, i32 0, i32 0
-  br i1 false, label %deref.throw, label %deref.next
-
-deref.next:                                       ; preds = %entry
-  br i1 false, label %deref.throw1, label %deref.next2
-
-deref.next2:                                      ; preds = %deref.next
-  %4 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 0
-  %5 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 0
-  %6 = load float, float* %5, align 8
-  %7 = load float, float* %4, align 8
-  %8 = fadd float %6, %7
-  br i1 false, label %deref.throw3, label %deref.next4
-
-deref.next4:                                      ; preds = %deref.next2
-  br i1 false, label %deref.throw5, label %deref.next6
-
-deref.next6:                                      ; preds = %deref.next4
-  %9 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %b, i32 0, i32 1
-  %10 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %a, i32 0, i32 1
-  %11 = load float, float* %10, align 4
-  %12 = load float, float* %9, align 4
-  br i1 false, label %store.throw, label %store.next
-
-store.next:                                       ; preds = %deref.next6
-  store float %8, float* %3, align 8
-  br i1 false, label %store.throw7, label %store.next8
-
-store.next8:                                      ; preds = %store.next
-  %13 = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %complit, i32 0, i32 1
-  %14 = fadd float %11, %12
-  store float %14, float* %13, align 4
-  %.elt = getelementptr inbounds %"main.Point[float32]", %"main.Point[float32]"* %complit, i32 0, i32 0
-  %.unpack = load float, float* %.elt, align 8
-  %15 = insertvalue %"main.Point[float32]" undef, float %.unpack, 0
-  %16 = insertvalue %"main.Point[float32]" %15, float %14, 1
-  ret %"main.Point[float32]" %16
-
-deref.throw:                                      ; preds = %entry
-  unreachable
-
-deref.throw1:                                     ; preds = %deref.next
-  unreachable
-
-deref.throw3:                                     ; preds = %deref.next2
-  unreachable
-
-deref.throw5:                                     ; preds = %deref.next4
-  unreachable
-
-store.throw:                                      ; preds = %deref.next6
-  unreachable
-
-store.throw7:                                     ; preds = %store.next
-  unreachable
-}
-
-declare void @main.checkSize(i32, i8*) #0
-
-declare void @runtime.nilPanic(i8*) #0
-
-; Function Attrs: nounwind
-define linkonce_odr hidden %"main.Point[int]" @"main.Add[int]"(i32 %a.X, i32 %a.Y, i32 %b.X, i32 %b.Y, i8* %context) unnamed_addr #1 {
-entry:
-  %complit = alloca %"main.Point[int]", align 8
-  %b = alloca %"main.Point[int]", align 8
-  %a = alloca %"main.Point[int]", align 8
-  %a.repack = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 0
-  store i32 0, i32* %a.repack, align 8
-  %a.repack9 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 1
-  store i32 0, i32* %a.repack9, align 4
-  %0 = bitcast %"main.Point[int]"* %a to i8*
-  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #2
-  %a.repack10 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 0
-  store i32 %a.X, i32* %a.repack10, align 8
-  %a.repack11 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 1
-  store i32 %a.Y, i32* %a.repack11, align 4
-  %b.repack = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 0
-  store i32 0, i32* %b.repack, align 8
-  %b.repack13 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 1
-  store i32 0, i32* %b.repack13, align 4
-  %1 = bitcast %"main.Point[int]"* %b to i8*
-  call void @runtime.trackPointer(i8* nonnull %1, i8* undef) #2
-  %b.repack14 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 0
-  store i32 %b.X, i32* %b.repack14, align 8
-  %b.repack15 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 1
-  store i32 %b.Y, i32* %b.repack15, align 4
-  call void @main.checkSize(i32 4, i8* undef) #2
-  call void @main.checkSize(i32 8, i8* undef) #2
-  %complit.repack = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %complit, i32 0, i32 0
-  store i32 0, i32* %complit.repack, align 8
-  %complit.repack17 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %complit, i32 0, i32 1
-  store i32 0, i32* %complit.repack17, align 4
-  %2 = bitcast %"main.Point[int]"* %complit to i8*
-  call void @runtime.trackPointer(i8* nonnull %2, i8* undef) #2
-  %3 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %complit, i32 0, i32 0
-  br i1 false, label %deref.throw, label %deref.next
-
-deref.next:                                       ; preds = %entry
-  br i1 false, label %deref.throw1, label %deref.next2
-
-deref.next2:                                      ; preds = %deref.next
-  %4 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 0
-  %5 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 0
-  %6 = load i32, i32* %5, align 8
-  %7 = load i32, i32* %4, align 8
-  %8 = add i32 %6, %7
-  br i1 false, label %deref.throw3, label %deref.next4
-
-deref.next4:                                      ; preds = %deref.next2
-  br i1 false, label %deref.throw5, label %deref.next6
-
-deref.next6:                                      ; preds = %deref.next4
-  %9 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %b, i32 0, i32 1
-  %10 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %a, i32 0, i32 1
-  %11 = load i32, i32* %10, align 4
-  %12 = load i32, i32* %9, align 4
-  br i1 false, label %store.throw, label %store.next
-
-store.next:                                       ; preds = %deref.next6
-  store i32 %8, i32* %3, align 8
-  br i1 false, label %store.throw7, label %store.next8
-
-store.next8:                                      ; preds = %store.next
-  %13 = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %complit, i32 0, i32 1
-  %14 = add i32 %11, %12
-  store i32 %14, i32* %13, align 4
-  %.elt = getelementptr inbounds %"main.Point[int]", %"main.Point[int]"* %complit, i32 0, i32 0
-  %.unpack = load i32, i32* %.elt, align 8
-  %15 = insertvalue %"main.Point[int]" undef, i32 %.unpack, 0
-  %16 = insertvalue %"main.Point[int]" %15, i32 %14, 1
-  ret %"main.Point[int]" %16
-
-deref.throw:                                      ; preds = %entry
-  unreachable
-
-deref.throw1:                                     ; preds = %deref.next
-  unreachable
-
-deref.throw3:                                     ; preds = %deref.next2
-  unreachable
-
-deref.throw5:                                     ; preds = %deref.next4
-  unreachable
-
-store.throw:                                      ; preds = %deref.next6
-  unreachable
-
-store.throw7:                                     ; preds = %store.next
-  unreachable
-}
-
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { nounwind }

compiler/testdata/go1.17.ll

@@ -3,67 +3,67 @@ source_filename = "go1.17.go"
 target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden i8* @main.Add32(i8* %p, i32 %len, i8* %context) unnamed_addr #1 {
+define hidden i8* @main.Add32(i8* %p, i32 %len, i8* %context) unnamed_addr #0 {
 entry:
   %0 = getelementptr i8, i8* %p, i32 %len
-  call void @runtime.trackPointer(i8* %0, i8* undef) #2
+  call void @runtime.trackPointer(i8* %0, i8* undef) #0
   ret i8* %0
 }
 
 ; Function Attrs: nounwind
-define hidden i8* @main.Add64(i8* %p, i64 %len, i8* %context) unnamed_addr #1 {
+define hidden i8* @main.Add64(i8* %p, i64 %len, i8* %context) unnamed_addr #0 {
 entry:
   %0 = trunc i64 %len to i32
   %1 = getelementptr i8, i8* %p, i32 %0
-  call void @runtime.trackPointer(i8* %1, i8* undef) #2
+  call void @runtime.trackPointer(i8* %1, i8* undef) #0
   ret i8* %1
 }
 
 ; Function Attrs: nounwind
-define hidden [4 x i32]* @main.SliceToArray(i32* %s.data, i32 %s.len, i32 %s.cap, i8* %context) unnamed_addr #1 {
+define hidden [4 x i32]* @main.SliceToArray(i32* %s.data, i32 %s.len, i32 %s.cap, i8* %context) unnamed_addr #0 {
 entry:
   %0 = icmp ult i32 %s.len, 4
   br i1 %0, label %slicetoarray.throw, label %slicetoarray.next
 
+slicetoarray.throw:                               ; preds = %entry
+  call void @runtime.sliceToArrayPointerPanic(i8* undef) #0
+  unreachable
+
 slicetoarray.next:                                ; preds = %entry
   %1 = bitcast i32* %s.data to [4 x i32]*
   ret [4 x i32]* %1
-
-slicetoarray.throw:                               ; preds = %entry
-  call void @runtime.sliceToArrayPointerPanic(i8* undef) #2
-  unreachable
 }
 
-declare void @runtime.sliceToArrayPointerPanic(i8*) #0
+declare void @runtime.sliceToArrayPointerPanic(i8*)
 
 ; Function Attrs: nounwind
-define hidden [4 x i32]* @main.SliceToArrayConst(i8* %context) unnamed_addr #1 {
+define hidden [4 x i32]* @main.SliceToArrayConst(i8* %context) unnamed_addr #0 {
 entry:
-  %makeslice = call i8* @runtime.alloc(i32 24, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %makeslice, i8* undef) #2
+  %makeslice = call i8* @runtime.alloc(i32 24, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %makeslice, i8* undef) #0
   br i1 false, label %slicetoarray.throw, label %slicetoarray.next
 
+slicetoarray.throw:                               ; preds = %entry
+  unreachable
+
 slicetoarray.next:                                ; preds = %entry
   %0 = bitcast i8* %makeslice to [4 x i32]*
   ret [4 x i32]* %0
-
-slicetoarray.throw:                               ; preds = %entry
-  unreachable
 }
 
 ; Function Attrs: nounwind
-define hidden { i32*, i32, i32 } @main.SliceInt(i32* dereferenceable_or_null(4) %ptr, i32 %len, i8* %context) unnamed_addr #1 {
+define hidden { i32*, i32, i32 } @main.SliceInt(i32* dereferenceable_or_null(4) %ptr, i32 %len, i8* %context) unnamed_addr #0 {
 entry:
   %0 = icmp ugt i32 %len, 1073741823
   %1 = icmp eq i32* %ptr, null
@@ -72,44 +72,44 @@ entry:
   %4 = or i1 %3, %0
   br i1 %4, label %unsafe.Slice.throw, label %unsafe.Slice.next
 
+unsafe.Slice.throw:                               ; preds = %entry
+  call void @runtime.unsafeSlicePanic(i8* undef) #0
+  unreachable
+
 unsafe.Slice.next:                                ; preds = %entry
   %5 = insertvalue { i32*, i32, i32 } undef, i32* %ptr, 0
   %6 = insertvalue { i32*, i32, i32 } %5, i32 %len, 1
   %7 = insertvalue { i32*, i32, i32 } %6, i32 %len, 2
   %8 = bitcast i32* %ptr to i8*
-  call void @runtime.trackPointer(i8* %8, i8* undef) #2
+  call void @runtime.trackPointer(i8* %8, i8* undef) #0
   ret { i32*, i32, i32 } %7
-
-unsafe.Slice.throw:                               ; preds = %entry
-  call void @runtime.unsafeSlicePanic(i8* undef) #2
-  unreachable
 }
 
-declare void @runtime.unsafeSlicePanic(i8*) #0
+declare void @runtime.unsafeSlicePanic(i8*)
 
 ; Function Attrs: nounwind
-define hidden { i8*, i32, i32 } @main.SliceUint16(i8* dereferenceable_or_null(1) %ptr, i16 %len, i8* %context) unnamed_addr #1 {
+define hidden { i8*, i32, i32 } @main.SliceUint16(i8* dereferenceable_or_null(1) %ptr, i16 %len, i8* %context) unnamed_addr #0 {
 entry:
   %0 = icmp eq i8* %ptr, null
   %1 = icmp ne i16 %len, 0
   %2 = and i1 %0, %1
   br i1 %2, label %unsafe.Slice.throw, label %unsafe.Slice.next
 
+unsafe.Slice.throw:                               ; preds = %entry
+  call void @runtime.unsafeSlicePanic(i8* undef) #0
+  unreachable
+
 unsafe.Slice.next:                                ; preds = %entry
   %3 = zext i16 %len to i32
   %4 = insertvalue { i8*, i32, i32 } undef, i8* %ptr, 0
   %5 = insertvalue { i8*, i32, i32 } %4, i32 %3, 1
   %6 = insertvalue { i8*, i32, i32 } %5, i32 %3, 2
-  call void @runtime.trackPointer(i8* %ptr, i8* undef) #2
+  call void @runtime.trackPointer(i8* %ptr, i8* undef) #0
   ret { i8*, i32, i32 } %6
-
-unsafe.Slice.throw:                               ; preds = %entry
-  call void @runtime.unsafeSlicePanic(i8* undef) #2
-  unreachable
 }
 
 ; Function Attrs: nounwind
-define hidden { i32*, i32, i32 } @main.SliceUint64(i32* dereferenceable_or_null(4) %ptr, i64 %len, i8* %context) unnamed_addr #1 {
+define hidden { i32*, i32, i32 } @main.SliceUint64(i32* dereferenceable_or_null(4) %ptr, i64 %len, i8* %context) unnamed_addr #0 {
 entry:
   %0 = icmp ugt i64 %len, 1073741823
   %1 = icmp eq i32* %ptr, null
@@ -118,22 +118,22 @@ entry:
   %4 = or i1 %3, %0
   br i1 %4, label %unsafe.Slice.throw, label %unsafe.Slice.next
 
+unsafe.Slice.throw:                               ; preds = %entry
+  call void @runtime.unsafeSlicePanic(i8* undef) #0
+  unreachable
+
 unsafe.Slice.next:                                ; preds = %entry
   %5 = trunc i64 %len to i32
   %6 = insertvalue { i32*, i32, i32 } undef, i32* %ptr, 0
   %7 = insertvalue { i32*, i32, i32 } %6, i32 %5, 1
   %8 = insertvalue { i32*, i32, i32 } %7, i32 %5, 2
   %9 = bitcast i32* %ptr to i8*
-  call void @runtime.trackPointer(i8* %9, i8* undef) #2
+  call void @runtime.trackPointer(i8* %9, i8* undef) #0
   ret { i32*, i32, i32 } %8
-
-unsafe.Slice.throw:                               ; preds = %entry
-  call void @runtime.unsafeSlicePanic(i8* undef) #2
-  unreachable
 }
 
 ; Function Attrs: nounwind
-define hidden { i32*, i32, i32 } @main.SliceInt64(i32* dereferenceable_or_null(4) %ptr, i64 %len, i8* %context) unnamed_addr #1 {
+define hidden { i32*, i32, i32 } @main.SliceInt64(i32* dereferenceable_or_null(4) %ptr, i64 %len, i8* %context) unnamed_addr #0 {
 entry:
   %0 = icmp ugt i64 %len, 1073741823
   %1 = icmp eq i32* %ptr, null
@@ -142,20 +142,18 @@ entry:
   %4 = or i1 %3, %0
   br i1 %4, label %unsafe.Slice.throw, label %unsafe.Slice.next
 
+unsafe.Slice.throw:                               ; preds = %entry
+  call void @runtime.unsafeSlicePanic(i8* undef) #0
+  unreachable
+
 unsafe.Slice.next:                                ; preds = %entry
   %5 = trunc i64 %len to i32
   %6 = insertvalue { i32*, i32, i32 } undef, i32* %ptr, 0
   %7 = insertvalue { i32*, i32, i32 } %6, i32 %5, 1
   %8 = insertvalue { i32*, i32, i32 } %7, i32 %5, 2
   %9 = bitcast i32* %ptr to i8*
-  call void @runtime.trackPointer(i8* %9, i8* undef) #2
+  call void @runtime.trackPointer(i8* %9, i8* undef) #0
   ret { i32*, i32, i32 } %8
-
-unsafe.Slice.throw:                               ; preds = %entry
-  call void @runtime.unsafeSlicePanic(i8* undef) #2
-  unreachable
 }
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { nounwind }
+attributes #0 = { nounwind }

compiler/testdata/goroutine-cortex-m-qemu-tasks.ll

@@ -5,59 +5,59 @@ target triple = "thumbv7m-unknown-unknown-eabi"
 
 %runtime.channel = type { i32, i32, i8, %runtime.channelBlockedList*, i32, i32, i32, i8* }
 %runtime.channelBlockedList = type { %runtime.channelBlockedList*, %"internal/task.Task"*, %runtime.chanSelectState*, { %runtime.channelBlockedList*, i32, i32 } }
-%"internal/task.Task" = type { %"internal/task.Task"*, i8*, i64, %"internal/task.gcData", %"internal/task.state", i8* }
+%"internal/task.Task" = type { %"internal/task.Task"*, i8*, i64, %"internal/task.gcData", %"internal/task.state" }
 %"internal/task.gcData" = type {}
 %"internal/task.state" = type { i32, i32* }
 %runtime.chanSelectState = type { %runtime.channel*, i8* }
 
 @"main$string" = internal unnamed_addr constant [4 x i8] c"test", align 1
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.regularFunctionGoroutine(i8* %context) unnamed_addr #1 {
+define hidden void @main.regularFunctionGoroutine(i8* %context) unnamed_addr #0 {
 entry:
-  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (void (i8*)* @"main.regularFunction$gowrapper" to i32), i8* undef) #8
-  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.regularFunction$gowrapper" to i32), i8* nonnull inttoptr (i32 5 to i8*), i32 %stacksize, i8* undef) #8
+  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (void (i8*)* @"main.regularFunction$gowrapper" to i32), i8* undef) #0
+  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.regularFunction$gowrapper" to i32), i8* nonnull inttoptr (i32 5 to i8*), i32 %stacksize, i8* undef) #0
   ret void
 }
 
-declare void @main.regularFunction(i32, i8*) #0
+declare void @main.regularFunction(i32, i8*)
 
 ; Function Attrs: nounwind
-define linkonce_odr void @"main.regularFunction$gowrapper"(i8* %0) unnamed_addr #2 {
+define linkonce_odr void @"main.regularFunction$gowrapper"(i8* %0) unnamed_addr #1 {
 entry:
   %unpack.int = ptrtoint i8* %0 to i32
-  call void @main.regularFunction(i32 %unpack.int, i8* undef) #8
+  call void @main.regularFunction(i32 %unpack.int, i8* undef) #0
   ret void
 }
 
-declare i32 @"internal/task.getGoroutineStackSize"(i32, i8*) #0
+declare i32 @"internal/task.getGoroutineStackSize"(i32, i8*)
 
-declare void @"internal/task.start"(i32, i8*, i32, i8*) #0
+declare void @"internal/task.start"(i32, i8*, i32, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.inlineFunctionGoroutine(i8* %context) unnamed_addr #1 {
+define hidden void @main.inlineFunctionGoroutine(i8* %context) unnamed_addr #0 {
 entry:
-  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (void (i8*)* @"main.inlineFunctionGoroutine$1$gowrapper" to i32), i8* undef) #8
-  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.inlineFunctionGoroutine$1$gowrapper" to i32), i8* nonnull inttoptr (i32 5 to i8*), i32 %stacksize, i8* undef) #8
+  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (void (i8*)* @"main.inlineFunctionGoroutine$1$gowrapper" to i32), i8* undef) #0
+  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.inlineFunctionGoroutine$1$gowrapper" to i32), i8* nonnull inttoptr (i32 5 to i8*), i32 %stacksize, i8* undef) #0
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @"main.inlineFunctionGoroutine$1"(i32 %x, i8* %context) unnamed_addr #1 {
+define hidden void @"main.inlineFunctionGoroutine$1"(i32 %x, i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define linkonce_odr void @"main.inlineFunctionGoroutine$1$gowrapper"(i8* %0) unnamed_addr #3 {
+define linkonce_odr void @"main.inlineFunctionGoroutine$1$gowrapper"(i8* %0) unnamed_addr #2 {
 entry:
   %unpack.int = ptrtoint i8* %0 to i32
   call void @"main.inlineFunctionGoroutine$1"(i32 %unpack.int, i8* undef)
@@ -65,26 +65,26 @@ entry:
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.closureFunctionGoroutine(i8* %context) unnamed_addr #1 {
+define hidden void @main.closureFunctionGoroutine(i8* %context) unnamed_addr #0 {
 entry:
-  %n = call i8* @runtime.alloc(i32 4, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #8
+  %n = call i8* @runtime.alloc(i32 4, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
   %0 = bitcast i8* %n to i32*
   store i32 3, i32* %0, align 4
-  %1 = call i8* @runtime.alloc(i32 8, i8* null, i8* undef) #8
+  %1 = call i8* @runtime.alloc(i32 8, i8* null, i8* undef) #0
   %2 = bitcast i8* %1 to i32*
   store i32 5, i32* %2, align 4
   %3 = getelementptr inbounds i8, i8* %1, i32 4
   %4 = bitcast i8* %3 to i8**
   store i8* %n, i8** %4, align 4
-  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (void (i8*)* @"main.closureFunctionGoroutine$1$gowrapper" to i32), i8* undef) #8
-  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.closureFunctionGoroutine$1$gowrapper" to i32), i8* nonnull %1, i32 %stacksize, i8* undef) #8
+  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (void (i8*)* @"main.closureFunctionGoroutine$1$gowrapper" to i32), i8* undef) #0
+  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.closureFunctionGoroutine$1$gowrapper" to i32), i8* nonnull %1, i32 %stacksize, i8* undef) #0
   %5 = load i32, i32* %0, align 4
-  call void @runtime.printint32(i32 %5, i8* undef) #8
+  call void @runtime.printint32(i32 %5, i8* undef) #0
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @"main.closureFunctionGoroutine$1"(i32 %x, i8* %context) unnamed_addr #1 {
+define hidden void @"main.closureFunctionGoroutine$1"(i32 %x, i8* %context) unnamed_addr #0 {
 entry:
   %unpack.ptr = bitcast i8* %context to i32*
   store i32 7, i32* %unpack.ptr, align 4
@@ -92,7 +92,7 @@ entry:
 }
 
 ; Function Attrs: nounwind
-define linkonce_odr void @"main.closureFunctionGoroutine$1$gowrapper"(i8* %0) unnamed_addr #4 {
+define linkonce_odr void @"main.closureFunctionGoroutine$1$gowrapper"(i8* %0) unnamed_addr #3 {
 entry:
   %1 = bitcast i8* %0 to i32*
   %2 = load i32, i32* %1, align 4
@@ -103,12 +103,12 @@ entry:
   ret void
 }
 
-declare void @runtime.printint32(i32, i8*) #0
+declare void @runtime.printint32(i32, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.funcGoroutine(i8* %fn.context, void ()* %fn.funcptr, i8* %context) unnamed_addr #1 {
+define hidden void @main.funcGoroutine(i8* %fn.context, void ()* %fn.funcptr, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call i8* @runtime.alloc(i32 12, i8* null, i8* undef) #8
+  %0 = call i8* @runtime.alloc(i32 12, i8* null, i8* undef) #0
   %1 = bitcast i8* %0 to i32*
   store i32 5, i32* %1, align 4
   %2 = getelementptr inbounds i8, i8* %0, i32 4
@@ -117,13 +117,13 @@ entry:
   %4 = getelementptr inbounds i8, i8* %0, i32 8
   %5 = bitcast i8* %4 to void ()**
   store void ()* %fn.funcptr, void ()** %5, align 4
-  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (void (i8*)* @main.funcGoroutine.gowrapper to i32), i8* undef) #8
-  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @main.funcGoroutine.gowrapper to i32), i8* nonnull %0, i32 %stacksize, i8* undef) #8
+  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (void (i8*)* @main.funcGoroutine.gowrapper to i32), i8* undef) #0
+  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @main.funcGoroutine.gowrapper to i32), i8* nonnull %0, i32 %stacksize, i8* undef) #0
   ret void
 }
 
 ; Function Attrs: nounwind
-define linkonce_odr void @main.funcGoroutine.gowrapper(i8* %0) unnamed_addr #5 {
+define linkonce_odr void @main.funcGoroutine.gowrapper(i8* %0) unnamed_addr #4 {
 entry:
   %1 = bitcast i8* %0 to i32*
   %2 = load i32, i32* %1, align 4
@@ -133,38 +133,38 @@ entry:
   %6 = getelementptr inbounds i8, i8* %0, i32 8
   %7 = bitcast i8* %6 to void (i32, i8*)**
   %8 = load void (i32, i8*)*, void (i32, i8*)** %7, align 4
-  call void %8(i32 %2, i8* %5) #8
+  call void %8(i32 %2, i8* %5) #0
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.recoverBuiltinGoroutine(i8* %context) unnamed_addr #1 {
+define hidden void @main.recoverBuiltinGoroutine(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.copyBuiltinGoroutine(i8* %dst.data, i32 %dst.len, i32 %dst.cap, i8* %src.data, i32 %src.len, i32 %src.cap, i8* %context) unnamed_addr #1 {
+define hidden void @main.copyBuiltinGoroutine(i8* %dst.data, i32 %dst.len, i32 %dst.cap, i8* %src.data, i32 %src.len, i32 %src.cap, i8* %context) unnamed_addr #0 {
 entry:
-  %copy.n = call i32 @runtime.sliceCopy(i8* %dst.data, i8* %src.data, i32 %dst.len, i32 %src.len, i32 1, i8* undef) #8
+  %copy.n = call i32 @runtime.sliceCopy(i8* %dst.data, i8* %src.data, i32 %dst.len, i32 %src.len, i32 1, i8* undef) #0
   ret void
 }
 
-declare i32 @runtime.sliceCopy(i8* nocapture writeonly, i8* nocapture readonly, i32, i32, i32, i8*) #0
+declare i32 @runtime.sliceCopy(i8* nocapture writeonly, i8* nocapture readonly, i32, i32, i32, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.closeBuiltinGoroutine(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #1 {
+define hidden void @main.closeBuiltinGoroutine(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #0 {
 entry:
-  call void @runtime.chanClose(%runtime.channel* %ch, i8* undef) #8
+  call void @runtime.chanClose(%runtime.channel* %ch, i8* undef) #0
   ret void
 }
 
-declare void @runtime.chanClose(%runtime.channel* dereferenceable_or_null(32), i8*) #0
+declare void @runtime.chanClose(%runtime.channel* dereferenceable_or_null(32), i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.startInterfaceMethod(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #1 {
+define hidden void @main.startInterfaceMethod(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call i8* @runtime.alloc(i32 16, i8* null, i8* undef) #8
+  %0 = call i8* @runtime.alloc(i32 16, i8* null, i8* undef) #0
   %1 = bitcast i8* %0 to i8**
   store i8* %itf.value, i8** %1, align 4
   %2 = getelementptr inbounds i8, i8* %0, i32 4
@@ -176,15 +176,15 @@ entry:
   %4 = getelementptr inbounds i8, i8* %0, i32 12
   %5 = bitcast i8* %4 to i32*
   store i32 %itf.typecode, i32* %5, align 4
-  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (void (i8*)* @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper" to i32), i8* undef) #8
-  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper" to i32), i8* nonnull %0, i32 %stacksize, i8* undef) #8
+  %stacksize = call i32 @"internal/task.getGoroutineStackSize"(i32 ptrtoint (void (i8*)* @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper" to i32), i8* undef) #0
+  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper" to i32), i8* nonnull %0, i32 %stacksize, i8* undef) #0
   ret void
 }
 
-declare void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(i8*, i8*, i32, i32, i8*) #6
+declare void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(i8*, i8*, i32, i32, i8*) #5
 
 ; Function Attrs: nounwind
-define linkonce_odr void @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper"(i8* %0) unnamed_addr #7 {
+define linkonce_odr void @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper"(i8* %0) unnamed_addr #6 {
 entry:
   %1 = bitcast i8* %0 to i8**
   %2 = load i8*, i8** %1, align 4
@@ -197,16 +197,14 @@ entry:
   %9 = getelementptr inbounds i8, i8* %0, i32 12
   %10 = bitcast i8* %9 to i32*
   %11 = load i32, i32* %10, align 4
-  call void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(i8* %2, i8* %5, i32 %8, i32 %11, i8* undef) #8
+  call void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(i8* %2, i8* %5, i32 %8, i32 %11, i8* undef) #0
   ret void
 }
 
-attributes #0 = { "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
-attributes #1 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
-attributes #2 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="main.regularFunction" }
-attributes #3 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="main.inlineFunctionGoroutine$1" }
-attributes #4 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="main.closureFunctionGoroutine$1" }
-attributes #5 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper" }
-attributes #6 = { "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-invoke"="reflect/methods.Print(string)" "tinygo-methods"="reflect/methods.Print(string)" }
-attributes #7 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" "tinygo-gowrapper"="interface:{Print:func:{basic:string}{}}.Print$invoke" }
-attributes #8 = { nounwind }
+attributes #0 = { nounwind }
+attributes #1 = { nounwind "tinygo-gowrapper"="main.regularFunction" }
+attributes #2 = { nounwind "tinygo-gowrapper"="main.inlineFunctionGoroutine$1" }
+attributes #3 = { nounwind "tinygo-gowrapper"="main.closureFunctionGoroutine$1" }
+attributes #4 = { nounwind "tinygo-gowrapper" }
+attributes #5 = { "tinygo-invoke"="reflect/methods.Print(string)" "tinygo-methods"="reflect/methods.Print(string)" }
+attributes #6 = { nounwind "tinygo-gowrapper"="interface:{Print:func:{basic:string}{}}.Print$invoke" }

compiler/testdata/goroutine-wasm-asyncify.ll

@@ -5,7 +5,7 @@ target triple = "wasm32-unknown-wasi"
 
 %runtime.channel = type { i32, i32, i8, %runtime.channelBlockedList*, i32, i32, i32, i8* }
 %runtime.channelBlockedList = type { %runtime.channelBlockedList*, %"internal/task.Task"*, %runtime.chanSelectState*, { %runtime.channelBlockedList*, i32, i32 } }
-%"internal/task.Task" = type { %"internal/task.Task"*, i8*, i64, %"internal/task.gcData", %"internal/task.state", i8* }
+%"internal/task.Task" = type { %"internal/task.Task"*, i8*, i64, %"internal/task.gcData", %"internal/task.state" }
 %"internal/task.gcData" = type { i8* }
 %"internal/task.state" = type { i32, i8*, %"internal/task.stackState", i1 }
 %"internal/task.stackState" = type { i32, i32 }
@@ -13,84 +13,84 @@ target triple = "wasm32-unknown-wasi"
 
 @"main$string" = internal unnamed_addr constant [4 x i8] c"test", align 1
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.regularFunctionGoroutine(i8* %context) unnamed_addr #1 {
+define hidden void @main.regularFunctionGoroutine(i8* %context) unnamed_addr #0 {
 entry:
-  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.regularFunction$gowrapper" to i32), i8* nonnull inttoptr (i32 5 to i8*), i32 16384, i8* undef) #8
+  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.regularFunction$gowrapper" to i32), i8* nonnull inttoptr (i32 5 to i8*), i32 16384, i8* undef) #0
   ret void
 }
 
-declare void @main.regularFunction(i32, i8*) #0
+declare void @main.regularFunction(i32, i8*)
 
-declare void @runtime.deadlock(i8*) #0
+declare void @runtime.deadlock(i8*)
 
 ; Function Attrs: nounwind
-define linkonce_odr void @"main.regularFunction$gowrapper"(i8* %0) unnamed_addr #2 {
+define linkonce_odr void @"main.regularFunction$gowrapper"(i8* %0) unnamed_addr #1 {
 entry:
   %unpack.int = ptrtoint i8* %0 to i32
-  call void @main.regularFunction(i32 %unpack.int, i8* undef) #8
-  call void @runtime.deadlock(i8* undef) #8
+  call void @main.regularFunction(i32 %unpack.int, i8* undef) #0
+  call void @runtime.deadlock(i8* undef) #0
   unreachable
 }
 
-declare void @"internal/task.start"(i32, i8*, i32, i8*) #0
+declare void @"internal/task.start"(i32, i8*, i32, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.inlineFunctionGoroutine(i8* %context) unnamed_addr #1 {
+define hidden void @main.inlineFunctionGoroutine(i8* %context) unnamed_addr #0 {
 entry:
-  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.inlineFunctionGoroutine$1$gowrapper" to i32), i8* nonnull inttoptr (i32 5 to i8*), i32 16384, i8* undef) #8
+  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.inlineFunctionGoroutine$1$gowrapper" to i32), i8* nonnull inttoptr (i32 5 to i8*), i32 16384, i8* undef) #0
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @"main.inlineFunctionGoroutine$1"(i32 %x, i8* %context) unnamed_addr #1 {
+define hidden void @"main.inlineFunctionGoroutine$1"(i32 %x, i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define linkonce_odr void @"main.inlineFunctionGoroutine$1$gowrapper"(i8* %0) unnamed_addr #3 {
+define linkonce_odr void @"main.inlineFunctionGoroutine$1$gowrapper"(i8* %0) unnamed_addr #2 {
 entry:
   %unpack.int = ptrtoint i8* %0 to i32
   call void @"main.inlineFunctionGoroutine$1"(i32 %unpack.int, i8* undef)
-  call void @runtime.deadlock(i8* undef) #8
+  call void @runtime.deadlock(i8* undef) #0
   unreachable
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.closureFunctionGoroutine(i8* %context) unnamed_addr #1 {
+define hidden void @main.closureFunctionGoroutine(i8* %context) unnamed_addr #0 {
 entry:
-  %n = call i8* @runtime.alloc(i32 4, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #8
+  %n = call i8* @runtime.alloc(i32 4, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
   %0 = bitcast i8* %n to i32*
-  call void @runtime.trackPointer(i8* nonnull %n, i8* undef) #8
+  call void @runtime.trackPointer(i8* nonnull %n, i8* undef) #0
   store i32 3, i32* %0, align 4
-  call void @runtime.trackPointer(i8* nonnull %n, i8* undef) #8
-  call void @runtime.trackPointer(i8* bitcast (void (i32, i8*)* @"main.closureFunctionGoroutine$1" to i8*), i8* undef) #8
-  %1 = call i8* @runtime.alloc(i32 8, i8* null, i8* undef) #8
-  call void @runtime.trackPointer(i8* nonnull %1, i8* undef) #8
+  call void @runtime.trackPointer(i8* nonnull %n, i8* undef) #0
+  call void @runtime.trackPointer(i8* bitcast (void (i32, i8*)* @"main.closureFunctionGoroutine$1" to i8*), i8* undef) #0
+  %1 = call i8* @runtime.alloc(i32 8, i8* null, i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %1, i8* undef) #0
   %2 = bitcast i8* %1 to i32*
   store i32 5, i32* %2, align 4
   %3 = getelementptr inbounds i8, i8* %1, i32 4
   %4 = bitcast i8* %3 to i8**
   store i8* %n, i8** %4, align 4
-  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.closureFunctionGoroutine$1$gowrapper" to i32), i8* nonnull %1, i32 16384, i8* undef) #8
+  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"main.closureFunctionGoroutine$1$gowrapper" to i32), i8* nonnull %1, i32 16384, i8* undef) #0
   %5 = load i32, i32* %0, align 4
-  call void @runtime.printint32(i32 %5, i8* undef) #8
+  call void @runtime.printint32(i32 %5, i8* undef) #0
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @"main.closureFunctionGoroutine$1"(i32 %x, i8* %context) unnamed_addr #1 {
+define hidden void @"main.closureFunctionGoroutine$1"(i32 %x, i8* %context) unnamed_addr #0 {
 entry:
   %unpack.ptr = bitcast i8* %context to i32*
   store i32 7, i32* %unpack.ptr, align 4
@@ -98,7 +98,7 @@ entry:
 }
 
 ; Function Attrs: nounwind
-define linkonce_odr void @"main.closureFunctionGoroutine$1$gowrapper"(i8* %0) unnamed_addr #4 {
+define linkonce_odr void @"main.closureFunctionGoroutine$1$gowrapper"(i8* %0) unnamed_addr #3 {
 entry:
   %1 = bitcast i8* %0 to i32*
   %2 = load i32, i32* %1, align 4
@@ -106,17 +106,17 @@ entry:
   %4 = bitcast i8* %3 to i8**
   %5 = load i8*, i8** %4, align 4
   call void @"main.closureFunctionGoroutine$1"(i32 %2, i8* %5)
-  call void @runtime.deadlock(i8* undef) #8
+  call void @runtime.deadlock(i8* undef) #0
   unreachable
 }
 
-declare void @runtime.printint32(i32, i8*) #0
+declare void @runtime.printint32(i32, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.funcGoroutine(i8* %fn.context, void ()* %fn.funcptr, i8* %context) unnamed_addr #1 {
+define hidden void @main.funcGoroutine(i8* %fn.context, void ()* %fn.funcptr, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call i8* @runtime.alloc(i32 12, i8* null, i8* undef) #8
-  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #8
+  %0 = call i8* @runtime.alloc(i32 12, i8* null, i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #0
   %1 = bitcast i8* %0 to i32*
   store i32 5, i32* %1, align 4
   %2 = getelementptr inbounds i8, i8* %0, i32 4
@@ -125,12 +125,12 @@ entry:
   %4 = getelementptr inbounds i8, i8* %0, i32 8
   %5 = bitcast i8* %4 to void ()**
   store void ()* %fn.funcptr, void ()** %5, align 4
-  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @main.funcGoroutine.gowrapper to i32), i8* nonnull %0, i32 16384, i8* undef) #8
+  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @main.funcGoroutine.gowrapper to i32), i8* nonnull %0, i32 16384, i8* undef) #0
   ret void
 }
 
 ; Function Attrs: nounwind
-define linkonce_odr void @main.funcGoroutine.gowrapper(i8* %0) unnamed_addr #5 {
+define linkonce_odr void @main.funcGoroutine.gowrapper(i8* %0) unnamed_addr #4 {
 entry:
   %1 = bitcast i8* %0 to i32*
   %2 = load i32, i32* %1, align 4
@@ -140,40 +140,40 @@ entry:
   %6 = getelementptr inbounds i8, i8* %0, i32 8
   %7 = bitcast i8* %6 to void (i32, i8*)**
   %8 = load void (i32, i8*)*, void (i32, i8*)** %7, align 4
-  call void %8(i32 %2, i8* %5) #8
-  call void @runtime.deadlock(i8* undef) #8
+  call void %8(i32 %2, i8* %5) #0
+  call void @runtime.deadlock(i8* undef) #0
   unreachable
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.recoverBuiltinGoroutine(i8* %context) unnamed_addr #1 {
+define hidden void @main.recoverBuiltinGoroutine(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.copyBuiltinGoroutine(i8* %dst.data, i32 %dst.len, i32 %dst.cap, i8* %src.data, i32 %src.len, i32 %src.cap, i8* %context) unnamed_addr #1 {
+define hidden void @main.copyBuiltinGoroutine(i8* %dst.data, i32 %dst.len, i32 %dst.cap, i8* %src.data, i32 %src.len, i32 %src.cap, i8* %context) unnamed_addr #0 {
 entry:
-  %copy.n = call i32 @runtime.sliceCopy(i8* %dst.data, i8* %src.data, i32 %dst.len, i32 %src.len, i32 1, i8* undef) #8
+  %copy.n = call i32 @runtime.sliceCopy(i8* %dst.data, i8* %src.data, i32 %dst.len, i32 %src.len, i32 1, i8* undef) #0
   ret void
 }
 
-declare i32 @runtime.sliceCopy(i8* nocapture writeonly, i8* nocapture readonly, i32, i32, i32, i8*) #0
+declare i32 @runtime.sliceCopy(i8* nocapture writeonly, i8* nocapture readonly, i32, i32, i32, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.closeBuiltinGoroutine(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #1 {
+define hidden void @main.closeBuiltinGoroutine(%runtime.channel* dereferenceable_or_null(32) %ch, i8* %context) unnamed_addr #0 {
 entry:
-  call void @runtime.chanClose(%runtime.channel* %ch, i8* undef) #8
+  call void @runtime.chanClose(%runtime.channel* %ch, i8* undef) #0
   ret void
 }
 
-declare void @runtime.chanClose(%runtime.channel* dereferenceable_or_null(32), i8*) #0
+declare void @runtime.chanClose(%runtime.channel* dereferenceable_or_null(32), i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.startInterfaceMethod(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #1 {
+define hidden void @main.startInterfaceMethod(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call i8* @runtime.alloc(i32 16, i8* null, i8* undef) #8
-  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #8
+  %0 = call i8* @runtime.alloc(i32 16, i8* null, i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #0
   %1 = bitcast i8* %0 to i8**
   store i8* %itf.value, i8** %1, align 4
   %2 = getelementptr inbounds i8, i8* %0, i32 4
@@ -185,14 +185,14 @@ entry:
   %4 = getelementptr inbounds i8, i8* %0, i32 12
   %5 = bitcast i8* %4 to i32*
   store i32 %itf.typecode, i32* %5, align 4
-  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper" to i32), i8* nonnull %0, i32 16384, i8* undef) #8
+  call void @"internal/task.start"(i32 ptrtoint (void (i8*)* @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper" to i32), i8* nonnull %0, i32 16384, i8* undef) #0
   ret void
 }
 
-declare void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(i8*, i8*, i32, i32, i8*) #6
+declare void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(i8*, i8*, i32, i32, i8*) #5
 
 ; Function Attrs: nounwind
-define linkonce_odr void @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper"(i8* %0) unnamed_addr #7 {
+define linkonce_odr void @"interface:{Print:func:{basic:string}{}}.Print$invoke$gowrapper"(i8* %0) unnamed_addr #6 {
 entry:
   %1 = bitcast i8* %0 to i8**
   %2 = load i8*, i8** %1, align 4
@@ -205,17 +205,15 @@ entry:
   %9 = getelementptr inbounds i8, i8* %0, i32 12
   %10 = bitcast i8* %9 to i32*
   %11 = load i32, i32* %10, align 4
-  call void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(i8* %2, i8* %5, i32 %8, i32 %11, i8* undef) #8
-  call void @runtime.deadlock(i8* undef) #8
+  call void @"interface:{Print:func:{basic:string}{}}.Print$invoke"(i8* %2, i8* %5, i32 %8, i32 %11, i8* undef) #0
+  call void @runtime.deadlock(i8* undef) #0
   unreachable
 }
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "tinygo-gowrapper"="main.regularFunction" }
-attributes #3 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "tinygo-gowrapper"="main.inlineFunctionGoroutine$1" }
-attributes #4 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "tinygo-gowrapper"="main.closureFunctionGoroutine$1" }
-attributes #5 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "tinygo-gowrapper" }
-attributes #6 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "tinygo-invoke"="reflect/methods.Print(string)" "tinygo-methods"="reflect/methods.Print(string)" }
-attributes #7 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "tinygo-gowrapper"="interface:{Print:func:{basic:string}{}}.Print$invoke" }
-attributes #8 = { nounwind }
+attributes #0 = { nounwind }
+attributes #1 = { nounwind "tinygo-gowrapper"="main.regularFunction" }
+attributes #2 = { nounwind "tinygo-gowrapper"="main.inlineFunctionGoroutine$1" }
+attributes #3 = { nounwind "tinygo-gowrapper"="main.closureFunctionGoroutine$1" }
+attributes #4 = { nounwind "tinygo-gowrapper" }
+attributes #5 = { "tinygo-invoke"="reflect/methods.Print(string)" "tinygo-methods"="reflect/methods.Print(string)" }
+attributes #6 = { nounwind "tinygo-gowrapper"="interface:{Print:func:{basic:string}{}}.Print$invoke" }

compiler/testdata/interface.ll

@@ -22,113 +22,111 @@ target triple = "wasm32-unknown-wasi"
 @"reflect/types.interface:interface{String() string}$interface" = linkonce_odr constant [1 x i8*] [i8* @"reflect/methods.String() string"]
 @"reflect/types.typeid:basic:int" = external constant i8
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden %runtime._interface @main.simpleType(i8* %context) unnamed_addr #1 {
+define hidden %runtime._interface @main.simpleType(i8* %context) unnamed_addr #0 {
 entry:
-  call void @runtime.trackPointer(i8* null, i8* undef) #6
+  call void @runtime.trackPointer(i8* null, i8* undef) #0
   ret %runtime._interface { i32 ptrtoint (%runtime.typecodeID* @"reflect/types.type:basic:int" to i32), i8* null }
 }
 
 ; Function Attrs: nounwind
-define hidden %runtime._interface @main.pointerType(i8* %context) unnamed_addr #1 {
+define hidden %runtime._interface @main.pointerType(i8* %context) unnamed_addr #0 {
 entry:
-  call void @runtime.trackPointer(i8* null, i8* undef) #6
+  call void @runtime.trackPointer(i8* null, i8* undef) #0
   ret %runtime._interface { i32 ptrtoint (%runtime.typecodeID* @"reflect/types.type:pointer:basic:int" to i32), i8* null }
 }
 
 ; Function Attrs: nounwind
-define hidden %runtime._interface @main.interfaceType(i8* %context) unnamed_addr #1 {
+define hidden %runtime._interface @main.interfaceType(i8* %context) unnamed_addr #0 {
 entry:
-  call void @runtime.trackPointer(i8* null, i8* undef) #6
+  call void @runtime.trackPointer(i8* null, i8* undef) #0
   ret %runtime._interface { i32 ptrtoint (%runtime.typecodeID* @"reflect/types.type:pointer:named:error" to i32), i8* null }
 }
 
-declare i1 @"interface:{Error:func:{}{basic:string}}.$typeassert"(i32) #2
+declare i1 @"interface:{Error:func:{}{basic:string}}.$typeassert"(i32) #1
 
 ; Function Attrs: nounwind
-define hidden %runtime._interface @main.anonymousInterfaceType(i8* %context) unnamed_addr #1 {
+define hidden %runtime._interface @main.anonymousInterfaceType(i8* %context) unnamed_addr #0 {
 entry:
-  call void @runtime.trackPointer(i8* null, i8* undef) #6
+  call void @runtime.trackPointer(i8* null, i8* undef) #0
   ret %runtime._interface { i32 ptrtoint (%runtime.typecodeID* @"reflect/types.type:pointer:interface:{String:func:{}{basic:string}}" to i32), i8* null }
 }
 
-declare i1 @"interface:{String:func:{}{basic:string}}.$typeassert"(i32) #3
+declare i1 @"interface:{String:func:{}{basic:string}}.$typeassert"(i32) #2
 
 ; Function Attrs: nounwind
-define hidden i1 @main.isInt(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.isInt(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #0 {
 entry:
-  %typecode = call i1 @runtime.typeAssert(i32 %itf.typecode, i8* nonnull @"reflect/types.typeid:basic:int", i8* undef) #6
+  %typecode = call i1 @runtime.typeAssert(i32 %itf.typecode, i8* nonnull @"reflect/types.typeid:basic:int", i8* undef) #0
   br i1 %typecode, label %typeassert.ok, label %typeassert.next
 
+typeassert.ok:                                    ; preds = %entry
+  br label %typeassert.next
+
 typeassert.next:                                  ; preds = %typeassert.ok, %entry
   ret i1 %typecode
+}
+
+declare i1 @runtime.typeAssert(i32, i8* dereferenceable_or_null(1), i8*)
+
+; Function Attrs: nounwind
+define hidden i1 @main.isError(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #0 {
+entry:
+  %0 = call i1 @"interface:{Error:func:{}{basic:string}}.$typeassert"(i32 %itf.typecode) #0
+  br i1 %0, label %typeassert.ok, label %typeassert.next
 
 typeassert.ok:                                    ; preds = %entry
   br label %typeassert.next
-}
-
-declare i1 @runtime.typeAssert(i32, i8* dereferenceable_or_null(1), i8*) #0
-
-; Function Attrs: nounwind
-define hidden i1 @main.isError(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #1 {
-entry:
-  %0 = call i1 @"interface:{Error:func:{}{basic:string}}.$typeassert"(i32 %itf.typecode) #6
-  br i1 %0, label %typeassert.ok, label %typeassert.next
 
 typeassert.next:                                  ; preds = %typeassert.ok, %entry
   ret i1 %0
-
-typeassert.ok:                                    ; preds = %entry
-  br label %typeassert.next
 }
 
 ; Function Attrs: nounwind
-define hidden i1 @main.isStringer(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.isStringer(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call i1 @"interface:{String:func:{}{basic:string}}.$typeassert"(i32 %itf.typecode) #6
+  %0 = call i1 @"interface:{String:func:{}{basic:string}}.$typeassert"(i32 %itf.typecode) #0
   br i1 %0, label %typeassert.ok, label %typeassert.next
 
+typeassert.ok:                                    ; preds = %entry
+  br label %typeassert.next
+
 typeassert.next:                                  ; preds = %typeassert.ok, %entry
   ret i1 %0
-
-typeassert.ok:                                    ; preds = %entry
-  br label %typeassert.next
 }
 
 ; Function Attrs: nounwind
-define hidden i8 @main.callFooMethod(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #1 {
+define hidden i8 @main.callFooMethod(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call i8 @"interface:{String:func:{}{basic:string},main.foo:func:{basic:int}{basic:uint8}}.foo$invoke"(i8* %itf.value, i32 3, i32 %itf.typecode, i8* undef) #6
+  %0 = call i8 @"interface:{String:func:{}{basic:string},main.foo:func:{basic:int}{basic:uint8}}.foo$invoke"(i8* %itf.value, i32 3, i32 %itf.typecode, i8* undef) #0
   ret i8 %0
 }
 
-declare i8 @"interface:{String:func:{}{basic:string},main.foo:func:{basic:int}{basic:uint8}}.foo$invoke"(i8*, i32, i32, i8*) #4
+declare i8 @"interface:{String:func:{}{basic:string},main.foo:func:{basic:int}{basic:uint8}}.foo$invoke"(i8*, i32, i32, i8*) #3
 
 ; Function Attrs: nounwind
-define hidden %runtime._string @main.callErrorMethod(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #1 {
+define hidden %runtime._string @main.callErrorMethod(i32 %itf.typecode, i8* %itf.value, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call %runtime._string @"interface:{Error:func:{}{basic:string}}.Error$invoke"(i8* %itf.value, i32 %itf.typecode, i8* undef) #6
+  %0 = call %runtime._string @"interface:{Error:func:{}{basic:string}}.Error$invoke"(i8* %itf.value, i32 %itf.typecode, i8* undef) #0
   %1 = extractvalue %runtime._string %0, 0
-  call void @runtime.trackPointer(i8* %1, i8* undef) #6
+  call void @runtime.trackPointer(i8* %1, i8* undef) #0
   ret %runtime._string %0
 }
 
-declare %runtime._string @"interface:{Error:func:{}{basic:string}}.Error$invoke"(i8*, i32, i8*) #5
+declare %runtime._string @"interface:{Error:func:{}{basic:string}}.Error$invoke"(i8*, i32, i8*) #4
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "tinygo-methods"="reflect/methods.Error() string" }
-attributes #3 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "tinygo-methods"="reflect/methods.String() string" }
-attributes #4 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "tinygo-invoke"="main.$methods.foo(int) uint8" "tinygo-methods"="reflect/methods.String() string; main.$methods.foo(int) uint8" }
-attributes #5 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "tinygo-invoke"="reflect/methods.Error() string" "tinygo-methods"="reflect/methods.Error() string" }
-attributes #6 = { nounwind }
+attributes #0 = { nounwind }
+attributes #1 = { "tinygo-methods"="reflect/methods.Error() string" }
+attributes #2 = { "tinygo-methods"="reflect/methods.String() string" }
+attributes #3 = { "tinygo-invoke"="main.$methods.foo(int) uint8" "tinygo-methods"="reflect/methods.String() string; main.$methods.foo(int) uint8" }
+attributes #4 = { "tinygo-invoke"="reflect/methods.Error() string" "tinygo-methods"="reflect/methods.Error() string" }

compiler/testdata/intrinsics-cortex-m-qemu.ll

@@ -3,32 +3,30 @@ source_filename = "intrinsics.go"
 target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"
 target triple = "thumbv7m-unknown-unknown-eabi"
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden double @main.mySqrt(double %x, i8* %context) unnamed_addr #1 {
+define hidden double @main.mySqrt(double %x, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call double @math.Sqrt(double %x, i8* undef) #2
+  %0 = call double @math.Sqrt(double %x, i8* undef) #0
   ret double %0
 }
 
-declare double @math.Sqrt(double, i8*) #0
+declare double @math.Sqrt(double, i8*)
 
 ; Function Attrs: nounwind
-define hidden double @main.myTrunc(double %x, i8* %context) unnamed_addr #1 {
+define hidden double @main.myTrunc(double %x, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call double @math.Trunc(double %x, i8* undef) #2
+  %0 = call double @math.Trunc(double %x, i8* undef) #0
   ret double %0
 }
 
-declare double @math.Trunc(double, i8*) #0
+declare double @math.Trunc(double, i8*)
 
-attributes #0 = { "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
-attributes #1 = { nounwind "target-features"="+armv7-m,+hwdiv,+soft-float,+strict-align,+thumb-mode,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-dsp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fp16,-fp16fml,-fp64,-fpregs,-fullfp16,-hwdiv-arm,-i8mm,-lob,-mve,-mve.fp,-neon,-pacbti,-ras,-sb,-sha2,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp" }
-attributes #2 = { nounwind }
+attributes #0 = { nounwind }

compiler/testdata/intrinsics-wasm.ll

@@ -3,36 +3,35 @@ source_filename = "intrinsics.go"
 target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden double @main.mySqrt(double %x, i8* %context) unnamed_addr #1 {
+define hidden double @main.mySqrt(double %x, i8* %context) unnamed_addr #0 {
 entry:
   %0 = call double @llvm.sqrt.f64(double %x)
   ret double %0
 }
 
 ; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
-declare double @llvm.sqrt.f64(double) #2
+declare double @llvm.sqrt.f64(double) #1
 
 ; Function Attrs: nounwind
-define hidden double @main.myTrunc(double %x, i8* %context) unnamed_addr #1 {
+define hidden double @main.myTrunc(double %x, i8* %context) unnamed_addr #0 {
 entry:
   %0 = call double @llvm.trunc.f64(double %x)
   ret double %0
 }
 
 ; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
-declare double @llvm.trunc.f64(double) #2
+declare double @llvm.trunc.f64(double) #1
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { nofree nosync nounwind readnone speculatable willreturn }
+attributes #0 = { nounwind }
+attributes #1 = { nofree nosync nounwind readnone speculatable willreturn }

compiler/testdata/pointer.ll

@@ -3,78 +3,76 @@ source_filename = "pointer.go"
 target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden [0 x i32] @main.pointerDerefZero([0 x i32]* %x, i8* %context) unnamed_addr #1 {
+define hidden [0 x i32] @main.pointerDerefZero([0 x i32]* %x, i8* %context) unnamed_addr #0 {
 entry:
   ret [0 x i32] zeroinitializer
 }
 
 ; Function Attrs: nounwind
-define hidden i32* @main.pointerCastFromUnsafe(i8* %x, i8* %context) unnamed_addr #1 {
+define hidden i32* @main.pointerCastFromUnsafe(i8* %x, i8* %context) unnamed_addr #0 {
 entry:
   %0 = bitcast i8* %x to i32*
-  call void @runtime.trackPointer(i8* %x, i8* undef) #2
+  call void @runtime.trackPointer(i8* %x, i8* undef) #0
   ret i32* %0
 }
 
 ; Function Attrs: nounwind
-define hidden i8* @main.pointerCastToUnsafe(i32* dereferenceable_or_null(4) %x, i8* %context) unnamed_addr #1 {
+define hidden i8* @main.pointerCastToUnsafe(i32* dereferenceable_or_null(4) %x, i8* %context) unnamed_addr #0 {
 entry:
   %0 = bitcast i32* %x to i8*
-  call void @runtime.trackPointer(i8* %0, i8* undef) #2
+  call void @runtime.trackPointer(i8* %0, i8* undef) #0
   ret i8* %0
 }
 
 ; Function Attrs: nounwind
-define hidden i8* @main.pointerCastToUnsafeNoop(i8* dereferenceable_or_null(1) %x, i8* %context) unnamed_addr #1 {
+define hidden i8* @main.pointerCastToUnsafeNoop(i8* dereferenceable_or_null(1) %x, i8* %context) unnamed_addr #0 {
 entry:
-  call void @runtime.trackPointer(i8* %x, i8* undef) #2
+  call void @runtime.trackPointer(i8* %x, i8* undef) #0
   ret i8* %x
 }
 
 ; Function Attrs: nounwind
-define hidden i8* @main.pointerUnsafeGEPFixedOffset(i8* dereferenceable_or_null(1) %ptr, i8* %context) unnamed_addr #1 {
+define hidden i8* @main.pointerUnsafeGEPFixedOffset(i8* dereferenceable_or_null(1) %ptr, i8* %context) unnamed_addr #0 {
 entry:
-  call void @runtime.trackPointer(i8* %ptr, i8* undef) #2
+  call void @runtime.trackPointer(i8* %ptr, i8* undef) #0
   %0 = getelementptr inbounds i8, i8* %ptr, i32 10
-  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #2
+  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %0, i8* undef) #0
   ret i8* %0
 }
 
 ; Function Attrs: nounwind
-define hidden i8* @main.pointerUnsafeGEPByteOffset(i8* dereferenceable_or_null(1) %ptr, i32 %offset, i8* %context) unnamed_addr #1 {
+define hidden i8* @main.pointerUnsafeGEPByteOffset(i8* dereferenceable_or_null(1) %ptr, i32 %offset, i8* %context) unnamed_addr #0 {
 entry:
-  call void @runtime.trackPointer(i8* %ptr, i8* undef) #2
+  call void @runtime.trackPointer(i8* %ptr, i8* undef) #0
   %0 = getelementptr inbounds i8, i8* %ptr, i32 %offset
-  call void @runtime.trackPointer(i8* %0, i8* undef) #2
-  call void @runtime.trackPointer(i8* %0, i8* undef) #2
+  call void @runtime.trackPointer(i8* %0, i8* undef) #0
+  call void @runtime.trackPointer(i8* %0, i8* undef) #0
   ret i8* %0
 }
 
 ; Function Attrs: nounwind
-define hidden i32* @main.pointerUnsafeGEPIntOffset(i32* dereferenceable_or_null(4) %ptr, i32 %offset, i8* %context) unnamed_addr #1 {
+define hidden i32* @main.pointerUnsafeGEPIntOffset(i32* dereferenceable_or_null(4) %ptr, i32 %offset, i8* %context) unnamed_addr #0 {
 entry:
   %0 = bitcast i32* %ptr to i8*
-  call void @runtime.trackPointer(i8* %0, i8* undef) #2
+  call void @runtime.trackPointer(i8* %0, i8* undef) #0
   %1 = getelementptr i32, i32* %ptr, i32 %offset
   %2 = bitcast i32* %1 to i8*
-  call void @runtime.trackPointer(i8* %2, i8* undef) #2
+  call void @runtime.trackPointer(i8* %2, i8* undef) #0
   %3 = bitcast i32* %1 to i8*
-  call void @runtime.trackPointer(i8* %3, i8* undef) #2
+  call void @runtime.trackPointer(i8* %3, i8* undef) #0
   ret i32* %1
 }
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { nounwind }
+attributes #0 = { nounwind }

compiler/testdata/pragma.ll

@@ -10,59 +10,58 @@ target triple = "wasm32-unknown-wasi"
 @undefinedGlobalNotInSection = external global i32, align 4
 @main.multipleGlobalPragmas = hidden global i32 0, section ".global_section", align 1024
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define void @extern_func() #2 {
+define void @extern_func() #1 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @somepkg.someFunction1(i8* %context) unnamed_addr #1 {
+define hidden void @somepkg.someFunction1(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
-declare void @somepkg.someFunction2(i8*) #0
+declare void @somepkg.someFunction2(i8*)
 
 ; Function Attrs: inlinehint nounwind
-define hidden void @main.inlineFunc(i8* %context) unnamed_addr #3 {
+define hidden void @main.inlineFunc(i8* %context) unnamed_addr #2 {
 entry:
   ret void
 }
 
 ; Function Attrs: noinline nounwind
-define hidden void @main.noinlineFunc(i8* %context) unnamed_addr #4 {
+define hidden void @main.noinlineFunc(i8* %context) unnamed_addr #3 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden void @main.functionInSection(i8* %context) unnamed_addr #1 section ".special_function_section" {
+define hidden void @main.functionInSection(i8* %context) unnamed_addr #0 section ".special_function_section" {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define void @exportedFunctionInSection() #5 section ".special_function_section" {
+define void @exportedFunctionInSection() #4 section ".special_function_section" {
 entry:
   ret void
 }
 
-declare void @main.undefinedFunctionNotInSection(i8*) #0
+declare void @main.undefinedFunctionNotInSection(i8*)
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "wasm-export-name"="extern_func" }
-attributes #3 = { inlinehint nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #4 = { noinline nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #5 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" "wasm-export-name"="exportedFunctionInSection" }
+attributes #0 = { nounwind }
+attributes #1 = { nounwind "wasm-export-name"="extern_func" }
+attributes #2 = { inlinehint nounwind }
+attributes #3 = { noinline nounwind }
+attributes #4 = { nounwind "wasm-export-name"="exportedFunctionInSection" }

compiler/testdata/slice.ll

@@ -3,51 +3,51 @@ source_filename = "slice.go"
 target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20"
 target triple = "wasm32-unknown-wasi"
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.sliceLen(i32* %ints.data, i32 %ints.len, i32 %ints.cap, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.sliceLen(i32* %ints.data, i32 %ints.len, i32 %ints.cap, i8* %context) unnamed_addr #0 {
 entry:
   ret i32 %ints.len
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.sliceCap(i32* %ints.data, i32 %ints.len, i32 %ints.cap, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.sliceCap(i32* %ints.data, i32 %ints.len, i32 %ints.cap, i8* %context) unnamed_addr #0 {
 entry:
   ret i32 %ints.cap
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.sliceElement(i32* %ints.data, i32 %ints.len, i32 %ints.cap, i32 %index, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.sliceElement(i32* %ints.data, i32 %ints.len, i32 %ints.cap, i32 %index, i8* %context) unnamed_addr #0 {
 entry:
   %.not = icmp ult i32 %index, %ints.len
   br i1 %.not, label %lookup.next, label %lookup.throw
 
+lookup.throw:                                     ; preds = %entry
+  call void @runtime.lookupPanic(i8* undef) #0
+  unreachable
+
 lookup.next:                                      ; preds = %entry
   %0 = getelementptr inbounds i32, i32* %ints.data, i32 %index
   %1 = load i32, i32* %0, align 4
   ret i32 %1
-
-lookup.throw:                                     ; preds = %entry
-  call void @runtime.lookupPanic(i8* undef) #2
-  unreachable
 }
 
-declare void @runtime.lookupPanic(i8*) #0
+declare void @runtime.lookupPanic(i8*)
 
 ; Function Attrs: nounwind
-define hidden { i32*, i32, i32 } @main.sliceAppendValues(i32* %ints.data, i32 %ints.len, i32 %ints.cap, i8* %context) unnamed_addr #1 {
+define hidden { i32*, i32, i32 } @main.sliceAppendValues(i32* %ints.data, i32 %ints.len, i32 %ints.cap, i8* %context) unnamed_addr #0 {
 entry:
-  %varargs = call i8* @runtime.alloc(i32 12, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
-  call void @runtime.trackPointer(i8* nonnull %varargs, i8* undef) #2
+  %varargs = call i8* @runtime.alloc(i32 12, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
+  call void @runtime.trackPointer(i8* nonnull %varargs, i8* undef) #0
   %0 = bitcast i8* %varargs to i32*
   store i32 1, i32* %0, align 4
   %1 = getelementptr inbounds i8, i8* %varargs, i32 4
@@ -57,7 +57,7 @@ entry:
   %4 = bitcast i8* %3 to i32*
   store i32 3, i32* %4, align 4
   %append.srcPtr = bitcast i32* %ints.data to i8*
-  %append.new = call { i8*, i32, i32 } @runtime.sliceAppend(i8* %append.srcPtr, i8* nonnull %varargs, i32 %ints.len, i32 %ints.cap, i32 3, i32 4, i8* undef) #2
+  %append.new = call { i8*, i32, i32 } @runtime.sliceAppend(i8* %append.srcPtr, i8* nonnull %varargs, i32 %ints.len, i32 %ints.cap, i32 3, i32 4, i8* undef) #0
   %append.newPtr = extractvalue { i8*, i32, i32 } %append.new, 0
   %append.newBuf = bitcast i8* %append.newPtr to i32*
   %append.newLen = extractvalue { i8*, i32, i32 } %append.new, 1
@@ -65,18 +65,18 @@ entry:
   %5 = insertvalue { i32*, i32, i32 } undef, i32* %append.newBuf, 0
   %6 = insertvalue { i32*, i32, i32 } %5, i32 %append.newLen, 1
   %7 = insertvalue { i32*, i32, i32 } %6, i32 %append.newCap, 2
-  call void @runtime.trackPointer(i8* %append.newPtr, i8* undef) #2
+  call void @runtime.trackPointer(i8* %append.newPtr, i8* undef) #0
   ret { i32*, i32, i32 } %7
 }
 
-declare { i8*, i32, i32 } @runtime.sliceAppend(i8*, i8* nocapture readonly, i32, i32, i32, i32, i8*) #0
+declare { i8*, i32, i32 } @runtime.sliceAppend(i8*, i8* nocapture readonly, i32, i32, i32, i32, i8*)
 
 ; Function Attrs: nounwind
-define hidden { i32*, i32, i32 } @main.sliceAppendSlice(i32* %ints.data, i32 %ints.len, i32 %ints.cap, i32* %added.data, i32 %added.len, i32 %added.cap, i8* %context) unnamed_addr #1 {
+define hidden { i32*, i32, i32 } @main.sliceAppendSlice(i32* %ints.data, i32 %ints.len, i32 %ints.cap, i32* %added.data, i32 %added.len, i32 %added.cap, i8* %context) unnamed_addr #0 {
 entry:
   %append.srcPtr = bitcast i32* %ints.data to i8*
   %append.srcPtr1 = bitcast i32* %added.data to i8*
-  %append.new = call { i8*, i32, i32 } @runtime.sliceAppend(i8* %append.srcPtr, i8* %append.srcPtr1, i32 %ints.len, i32 %ints.cap, i32 %added.len, i32 4, i8* undef) #2
+  %append.new = call { i8*, i32, i32 } @runtime.sliceAppend(i8* %append.srcPtr, i8* %append.srcPtr1, i32 %ints.len, i32 %ints.cap, i32 %added.len, i32 4, i8* undef) #0
   %append.newPtr = extractvalue { i8*, i32, i32 } %append.new, 0
   %append.newBuf = bitcast i8* %append.newPtr to i32*
   %append.newLen = extractvalue { i8*, i32, i32 } %append.new, 1
@@ -84,105 +84,103 @@ entry:
   %0 = insertvalue { i32*, i32, i32 } undef, i32* %append.newBuf, 0
   %1 = insertvalue { i32*, i32, i32 } %0, i32 %append.newLen, 1
   %2 = insertvalue { i32*, i32, i32 } %1, i32 %append.newCap, 2
-  call void @runtime.trackPointer(i8* %append.newPtr, i8* undef) #2
+  call void @runtime.trackPointer(i8* %append.newPtr, i8* undef) #0
   ret { i32*, i32, i32 } %2
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.sliceCopy(i32* %dst.data, i32 %dst.len, i32 %dst.cap, i32* %src.data, i32 %src.len, i32 %src.cap, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.sliceCopy(i32* %dst.data, i32 %dst.len, i32 %dst.cap, i32* %src.data, i32 %src.len, i32 %src.cap, i8* %context) unnamed_addr #0 {
 entry:
   %copy.dstPtr = bitcast i32* %dst.data to i8*
   %copy.srcPtr = bitcast i32* %src.data to i8*
-  %copy.n = call i32 @runtime.sliceCopy(i8* %copy.dstPtr, i8* %copy.srcPtr, i32 %dst.len, i32 %src.len, i32 4, i8* undef) #2
+  %copy.n = call i32 @runtime.sliceCopy(i8* %copy.dstPtr, i8* %copy.srcPtr, i32 %dst.len, i32 %src.len, i32 4, i8* undef) #0
   ret i32 %copy.n
 }
 
-declare i32 @runtime.sliceCopy(i8* nocapture writeonly, i8* nocapture readonly, i32, i32, i32, i8*) #0
+declare i32 @runtime.sliceCopy(i8* nocapture writeonly, i8* nocapture readonly, i32, i32, i32, i8*)
 
 ; Function Attrs: nounwind
-define hidden { i8*, i32, i32 } @main.makeByteSlice(i32 %len, i8* %context) unnamed_addr #1 {
+define hidden { i8*, i32, i32 } @main.makeByteSlice(i32 %len, i8* %context) unnamed_addr #0 {
 entry:
   %slice.maxcap = icmp slt i32 %len, 0
   br i1 %slice.maxcap, label %slice.throw, label %slice.next
 
+slice.throw:                                      ; preds = %entry
+  call void @runtime.slicePanic(i8* undef) #0
+  unreachable
+
 slice.next:                                       ; preds = %entry
-  %makeslice.buf = call i8* @runtime.alloc(i32 %len, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
+  %makeslice.buf = call i8* @runtime.alloc(i32 %len, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
   %0 = insertvalue { i8*, i32, i32 } undef, i8* %makeslice.buf, 0
   %1 = insertvalue { i8*, i32, i32 } %0, i32 %len, 1
   %2 = insertvalue { i8*, i32, i32 } %1, i32 %len, 2
-  call void @runtime.trackPointer(i8* nonnull %makeslice.buf, i8* undef) #2
+  call void @runtime.trackPointer(i8* nonnull %makeslice.buf, i8* undef) #0
   ret { i8*, i32, i32 } %2
-
-slice.throw:                                      ; preds = %entry
-  call void @runtime.slicePanic(i8* undef) #2
-  unreachable
 }
 
-declare void @runtime.slicePanic(i8*) #0
+declare void @runtime.slicePanic(i8*)
 
 ; Function Attrs: nounwind
-define hidden { i16*, i32, i32 } @main.makeInt16Slice(i32 %len, i8* %context) unnamed_addr #1 {
+define hidden { i16*, i32, i32 } @main.makeInt16Slice(i32 %len, i8* %context) unnamed_addr #0 {
 entry:
   %slice.maxcap = icmp slt i32 %len, 0
   br i1 %slice.maxcap, label %slice.throw, label %slice.next
 
+slice.throw:                                      ; preds = %entry
+  call void @runtime.slicePanic(i8* undef) #0
+  unreachable
+
 slice.next:                                       ; preds = %entry
   %makeslice.cap = shl i32 %len, 1
-  %makeslice.buf = call i8* @runtime.alloc(i32 %makeslice.cap, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
+  %makeslice.buf = call i8* @runtime.alloc(i32 %makeslice.cap, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
   %makeslice.array = bitcast i8* %makeslice.buf to i16*
   %0 = insertvalue { i16*, i32, i32 } undef, i16* %makeslice.array, 0
   %1 = insertvalue { i16*, i32, i32 } %0, i32 %len, 1
   %2 = insertvalue { i16*, i32, i32 } %1, i32 %len, 2
-  call void @runtime.trackPointer(i8* nonnull %makeslice.buf, i8* undef) #2
+  call void @runtime.trackPointer(i8* nonnull %makeslice.buf, i8* undef) #0
   ret { i16*, i32, i32 } %2
-
-slice.throw:                                      ; preds = %entry
-  call void @runtime.slicePanic(i8* undef) #2
-  unreachable
 }
 
 ; Function Attrs: nounwind
-define hidden { [3 x i8]*, i32, i32 } @main.makeArraySlice(i32 %len, i8* %context) unnamed_addr #1 {
+define hidden { [3 x i8]*, i32, i32 } @main.makeArraySlice(i32 %len, i8* %context) unnamed_addr #0 {
 entry:
   %slice.maxcap = icmp ugt i32 %len, 1431655765
   br i1 %slice.maxcap, label %slice.throw, label %slice.next
 
+slice.throw:                                      ; preds = %entry
+  call void @runtime.slicePanic(i8* undef) #0
+  unreachable
+
 slice.next:                                       ; preds = %entry
   %makeslice.cap = mul i32 %len, 3
-  %makeslice.buf = call i8* @runtime.alloc(i32 %makeslice.cap, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
+  %makeslice.buf = call i8* @runtime.alloc(i32 %makeslice.cap, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
   %makeslice.array = bitcast i8* %makeslice.buf to [3 x i8]*
   %0 = insertvalue { [3 x i8]*, i32, i32 } undef, [3 x i8]* %makeslice.array, 0
   %1 = insertvalue { [3 x i8]*, i32, i32 } %0, i32 %len, 1
   %2 = insertvalue { [3 x i8]*, i32, i32 } %1, i32 %len, 2
-  call void @runtime.trackPointer(i8* nonnull %makeslice.buf, i8* undef) #2
+  call void @runtime.trackPointer(i8* nonnull %makeslice.buf, i8* undef) #0
   ret { [3 x i8]*, i32, i32 } %2
-
-slice.throw:                                      ; preds = %entry
-  call void @runtime.slicePanic(i8* undef) #2
-  unreachable
 }
 
 ; Function Attrs: nounwind
-define hidden { i32*, i32, i32 } @main.makeInt32Slice(i32 %len, i8* %context) unnamed_addr #1 {
+define hidden { i32*, i32, i32 } @main.makeInt32Slice(i32 %len, i8* %context) unnamed_addr #0 {
 entry:
   %slice.maxcap = icmp ugt i32 %len, 1073741823
   br i1 %slice.maxcap, label %slice.throw, label %slice.next
 
+slice.throw:                                      ; preds = %entry
+  call void @runtime.slicePanic(i8* undef) #0
+  unreachable
+
 slice.next:                                       ; preds = %entry
   %makeslice.cap = shl i32 %len, 2
-  %makeslice.buf = call i8* @runtime.alloc(i32 %makeslice.cap, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #2
+  %makeslice.buf = call i8* @runtime.alloc(i32 %makeslice.cap, i8* nonnull inttoptr (i32 3 to i8*), i8* undef) #0
   %makeslice.array = bitcast i8* %makeslice.buf to i32*
   %0 = insertvalue { i32*, i32, i32 } undef, i32* %makeslice.array, 0
   %1 = insertvalue { i32*, i32, i32 } %0, i32 %len, 1
   %2 = insertvalue { i32*, i32, i32 } %1, i32 %len, 2
-  call void @runtime.trackPointer(i8* nonnull %makeslice.buf, i8* undef) #2
+  call void @runtime.trackPointer(i8* nonnull %makeslice.buf, i8* undef) #0
   ret { i32*, i32, i32 } %2
-
-slice.throw:                                      ; preds = %entry
-  call void @runtime.slicePanic(i8* undef) #2
-  unreachable
 }
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { nounwind }
+attributes #0 = { nounwind }

compiler/testdata/string.ll

@@ -7,95 +7,93 @@ target triple = "wasm32-unknown-wasi"
 
 @"main$string" = internal unnamed_addr constant [3 x i8] c"foo", align 1
 
-declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*) #0
+declare noalias nonnull i8* @runtime.alloc(i32, i8*, i8*)
 
-declare void @runtime.trackPointer(i8* nocapture readonly, i8*) #0
+declare void @runtime.trackPointer(i8* nocapture readonly, i8*)
 
 ; Function Attrs: nounwind
-define hidden void @main.init(i8* %context) unnamed_addr #1 {
+define hidden void @main.init(i8* %context) unnamed_addr #0 {
 entry:
   ret void
 }
 
 ; Function Attrs: nounwind
-define hidden %runtime._string @main.someString(i8* %context) unnamed_addr #1 {
+define hidden %runtime._string @main.someString(i8* %context) unnamed_addr #0 {
 entry:
   ret %runtime._string { i8* getelementptr inbounds ([3 x i8], [3 x i8]* @"main$string", i32 0, i32 0), i32 3 }
 }
 
 ; Function Attrs: nounwind
-define hidden %runtime._string @main.zeroLengthString(i8* %context) unnamed_addr #1 {
+define hidden %runtime._string @main.zeroLengthString(i8* %context) unnamed_addr #0 {
 entry:
   ret %runtime._string zeroinitializer
 }
 
 ; Function Attrs: nounwind
-define hidden i32 @main.stringLen(i8* %s.data, i32 %s.len, i8* %context) unnamed_addr #1 {
+define hidden i32 @main.stringLen(i8* %s.data, i32 %s.len, i8* %context) unnamed_addr #0 {
 entry:
   ret i32 %s.len
 }
 
 ; Function Attrs: nounwind
-define hidden i8 @main.stringIndex(i8* %s.data, i32 %s.len, i32 %index, i8* %context) unnamed_addr #1 {
+define hidden i8 @main.stringIndex(i8* %s.data, i32 %s.len, i32 %index, i8* %context) unnamed_addr #0 {
 entry:
   %.not = icmp ult i32 %index, %s.len
   br i1 %.not, label %lookup.next, label %lookup.throw
 
+lookup.throw:                                     ; preds = %entry
+  call void @runtime.lookupPanic(i8* undef) #0
+  unreachable
+
 lookup.next:                                      ; preds = %entry
   %0 = getelementptr inbounds i8, i8* %s.data, i32 %index
   %1 = load i8, i8* %0, align 1
   ret i8 %1
-
-lookup.throw:                                     ; preds = %entry
-  call void @runtime.lookupPanic(i8* undef) #2
-  unreachable
 }
 
-declare void @runtime.lookupPanic(i8*) #0
+declare void @runtime.lookupPanic(i8*)
 
 ; Function Attrs: nounwind
-define hidden i1 @main.stringCompareEqual(i8* %s1.data, i32 %s1.len, i8* %s2.data, i32 %s2.len, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.stringCompareEqual(i8* %s1.data, i32 %s1.len, i8* %s2.data, i32 %s2.len, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call i1 @runtime.stringEqual(i8* %s1.data, i32 %s1.len, i8* %s2.data, i32 %s2.len, i8* undef) #2
+  %0 = call i1 @runtime.stringEqual(i8* %s1.data, i32 %s1.len, i8* %s2.data, i32 %s2.len, i8* undef) #0
   ret i1 %0
 }
 
-declare i1 @runtime.stringEqual(i8*, i32, i8*, i32, i8*) #0
+declare i1 @runtime.stringEqual(i8*, i32, i8*, i32, i8*)
 
 ; Function Attrs: nounwind
-define hidden i1 @main.stringCompareUnequal(i8* %s1.data, i32 %s1.len, i8* %s2.data, i32 %s2.len, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.stringCompareUnequal(i8* %s1.data, i32 %s1.len, i8* %s2.data, i32 %s2.len, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call i1 @runtime.stringEqual(i8* %s1.data, i32 %s1.len, i8* %s2.data, i32 %s2.len, i8* undef) #2
+  %0 = call i1 @runtime.stringEqual(i8* %s1.data, i32 %s1.len, i8* %s2.data, i32 %s2.len, i8* undef) #0
   %1 = xor i1 %0, true
   ret i1 %1
 }
 
 ; Function Attrs: nounwind
-define hidden i1 @main.stringCompareLarger(i8* %s1.data, i32 %s1.len, i8* %s2.data, i32 %s2.len, i8* %context) unnamed_addr #1 {
+define hidden i1 @main.stringCompareLarger(i8* %s1.data, i32 %s1.len, i8* %s2.data, i32 %s2.len, i8* %context) unnamed_addr #0 {
 entry:
-  %0 = call i1 @runtime.stringLess(i8* %s2.data, i32 %s2.len, i8* %s1.data, i32 %s1.len, i8* undef) #2
+  %0 = call i1 @runtime.stringLess(i8* %s2.data, i32 %s2.len, i8* %s1.data, i32 %s1.len, i8* undef) #0
   ret i1 %0
 }
 
-declare i1 @runtime.stringLess(i8*, i32, i8*, i32, i8*) #0
+declare i1 @runtime.stringLess(i8*, i32, i8*, i32, i8*)
 
 ; Function Attrs: nounwind
-define hidden i8 @main.stringLookup(i8* %s.data, i32 %s.len, i8 %x, i8* %context) unnamed_addr #1 {
+define hidden i8 @main.stringLookup(i8* %s.data, i32 %s.len, i8 %x, i8* %context) unnamed_addr #0 {
 entry:
   %0 = zext i8 %x to i32
   %.not = icmp ult i32 %0, %s.len
   br i1 %.not, label %lookup.next, label %lookup.throw
 
+lookup.throw:                                     ; preds = %entry
+  call void @runtime.lookupPanic(i8* undef) #0
+  unreachable
+
 lookup.next:                                      ; preds = %entry
   %1 = getelementptr inbounds i8, i8* %s.data, i32 %0
   %2 = load i8, i8* %1, align 1
   ret i8 %2
-
-lookup.throw:                                     ; preds = %entry
-  call void @runtime.lookupPanic(i8* undef) #2
-  unreachable
 }
 
-attributes #0 = { "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #1 = { nounwind "target-features"="+bulk-memory,+nontrapping-fptoint,+sign-ext" }
-attributes #2 = { nounwind }
+attributes #0 = { nounwind }

compiler/volatile.go

@@ -3,25 +3,28 @@ package compiler
 // This file implements volatile loads/stores in runtime/volatile.LoadT and
 // runtime/volatile.StoreT as compiler builtins.
 
+import (
+	"golang.org/x/tools/go/ssa"
+	"tinygo.org/x/go-llvm"
+)
+
 // createVolatileLoad is the implementation of the intrinsic function
 // runtime/volatile.LoadT().
-func (b *builder) createVolatileLoad() {
-	b.createFunctionStart()
-	addr := b.getValue(b.fn.Params[0])
-	b.createNilCheck(b.fn.Params[0], addr, "deref")
+func (b *builder) createVolatileLoad(instr *ssa.CallCommon) (llvm.Value, error) {
+	addr := b.getValue(instr.Args[0])
+	b.createNilCheck(instr.Args[0], addr, "deref")
 	val := b.CreateLoad(addr, "")
 	val.SetVolatile(true)
-	b.CreateRet(val)
+	return val, nil
 }
 
 // createVolatileStore is the implementation of the intrinsic function
 // runtime/volatile.StoreT().
-func (b *builder) createVolatileStore() {
-	b.createFunctionStart()
-	addr := b.getValue(b.fn.Params[0])
-	val := b.getValue(b.fn.Params[1])
-	b.createNilCheck(b.fn.Params[0], addr, "deref")
+func (b *builder) createVolatileStore(instr *ssa.CallCommon) (llvm.Value, error) {
+	addr := b.getValue(instr.Args[0])
+	val := b.getValue(instr.Args[1])
+	b.createNilCheck(instr.Args[0], addr, "deref")
 	store := b.CreateStore(val, addr)
 	store.SetVolatile(true)
-	b.CreateRetVoid()
+	return llvm.Value{}, nil
 }

go.mod

@@ -3,7 +3,7 @@ module github.com/tinygo-org/tinygo
 go 1.16
 
 require (
-	github.com/aykevl/go-wasm v0.0.2-0.20220616010729-4a0a888aebdc
+	github.com/aykevl/go-wasm v0.0.2-0.20211119014117-0761b1ddcd1a
 	github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
 	github.com/chromedp/cdproto v0.0.0-20220113222801-0725d94bb6ee
 	github.com/chromedp/chromedp v0.7.6
@@ -15,5 +15,5 @@ require (
 	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
 	golang.org/x/tools v0.1.11
 	gopkg.in/yaml.v2 v2.4.0
-	tinygo.org/x/go-llvm v0.0.0-20220626113704-45f1e2dbf887
+	tinygo.org/x/go-llvm v0.0.0-20220420140351-512c94c1e71f
 )

go.sum

@@ -1,5 +1,5 @@
-github.com/aykevl/go-wasm v0.0.2-0.20220616010729-4a0a888aebdc h1:Yp49g+qqgQRPk/gcRSmAsXgnT16XPJ6Y5JM1poc6gYM=
-github.com/aykevl/go-wasm v0.0.2-0.20220616010729-4a0a888aebdc/go.mod h1:7sXyiaA0WtSogCu67R2252fQpVmJMh9JWJ9ddtGkpWw=
+github.com/aykevl/go-wasm v0.0.2-0.20211119014117-0761b1ddcd1a h1:QPU7APo6y/6VkCDq6HU3WWIUzER8iywSac23+1UQv60=
+github.com/aykevl/go-wasm v0.0.2-0.20211119014117-0761b1ddcd1a/go.mod h1:7sXyiaA0WtSogCu67R2252fQpVmJMh9JWJ9ddtGkpWw=
 github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 h1:oMCHnXa6CCCafdPDbMh/lWRhRByN0VFLvv+g+ayx1SI=
 github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI=
 github.com/chromedp/cdproto v0.0.0-20211126220118-81fa0469ad77/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U=
@@ -79,5 +79,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-tinygo.org/x/go-llvm v0.0.0-20220626113704-45f1e2dbf887 h1:k+Y1DU/WoBDkTkRJGF149yk3S2K2VhNglN435DXDS5s=
-tinygo.org/x/go-llvm v0.0.0-20220626113704-45f1e2dbf887/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=
+tinygo.org/x/go-llvm v0.0.0-20220420140351-512c94c1e71f h1:9/J+NpFTpAhYcbh1mC4dr9W/aAPnwrUh8dmq21xWdSM=
+tinygo.org/x/go-llvm v0.0.0-20220420140351-512c94c1e71f/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=

goenv/version.go

@@ -12,7 +12,7 @@ import (
 
 // Version of TinyGo.
 // Update this value before release of new version of software.
-const Version = "0.25.0-dev"
+const Version = "0.24.0-dev"
 
 var (
 	// This variable is set at build time using -ldflags parameters.

main.go

@@ -350,14 +350,16 @@ func Flash(pkgName, port string, options *compileopts.Options) error {
 		// do we need port reset to put MCU into bootloader mode?
 		if config.Target.PortReset == "true" && flashMethod != "openocd" {
 			port, err := getDefaultPort(port, config.Target.SerialPort)
-			if err == nil {
-				err = touchSerialPortAt1200bps(port)
-				if err != nil {
-					return &commandError{"failed to reset port", result.Binary, err}
-				}
-				// give the target MCU a chance to restart into bootloader
-				time.Sleep(3 * time.Second)
+			if err != nil {
+				return err
 			}
+
+			err = touchSerialPortAt1200bps(port)
+			if err != nil {
+				return &commandError{"failed to reset port", result.Binary, err}
+			}
+			// give the target MCU a chance to restart into bootloader
+			time.Sleep(3 * time.Second)
 		}
 
 		// this flashing method copies the binary data to a Mass Storage Device (msd)

main_test.go

@@ -244,13 +244,6 @@ func runPlatTests(options compileopts.Options, tests []string, t *testing.T) {
 			runTest("rand.go", options, t, nil, nil)
 		})
 	}
-	if options.Target != "wasi" && options.Target != "wasm" {
-		// The recover() builtin isn't supported yet on WebAssembly and Windows.
-		t.Run("recover.go", func(t *testing.T) {
-			t.Parallel()
-			runTest("recover.go", options, t, nil, nil)
-		})
-	}
 }
 
 func emuCheck(t *testing.T, options compileopts.Options) {
@@ -349,7 +342,6 @@ func runTestWithConfig(name string, t *testing.T, options compileopts.Options, c
 		actual = bytes.Replace(actual, []byte{0x1b, '[', '3', '2', 'm'}, nil, -1)
 		actual = bytes.Replace(actual, []byte{0x1b, '[', '0', 'm'}, nil, -1)
 		actual = bytes.Replace(actual, []byte{'.', '.', '\n'}, []byte{'\n'}, -1)
-		actual = bytes.Replace(actual, []byte{'\n', '.', '\n'}, []byte{'\n', '\n'}, -1)
 	}
 	if name == "testing.go" {
 		// Strip actual time.

src/crypto/rand/rand_arc4random.go

@@ -1,4 +1,3 @@
-//go:build darwin || tinygo.wasm
 // +build darwin tinygo.wasm
 
 // This implementation of crypto/rand uses the arc4random_buf function

src/crypto/rand/rand_urandom.go

@@ -1,4 +1,3 @@
-//go:build linux && !baremetal && !wasi
 // +build linux,!baremetal,!wasi
 
 // This implementation of crypto/rand uses the /dev/urandom pseudo-file to

src/device/nxp/mimxrt1062_mpu.go

@@ -193,12 +193,12 @@ func enableIcache(enable bool) {
 			arm.Asm("dsb 0xF")
 			arm.Asm("isb 0xF")
 		} else {
-			arm.Asm("dsb 0xF")
-			arm.Asm("isb 0xF")
+		arm.Asm("dsb 0xF")
+		arm.Asm("isb 0xF")
 			SystemControl.CCR.ClearBits(SCB_CCR_IC_Msk)
 			SystemControl.ICIALLU.Set(0)
-			arm.Asm("dsb 0xF")
-			arm.Asm("isb 0xF")
+		arm.Asm("dsb 0xF")
+		arm.Asm("isb 0xF")
 		}
 	}
 }

src/examples/uart/uart.go

@@ -1,25 +0,0 @@
-// This reads from UART1 and outputs to default serial, usually UART0 or USB.
-// Example of how to work with UARTs other than the default.
-package main
-
-import (
-	"machine"
-	"time"
-)
-
-var (
-	uart = machine.UART1
-	tx   = machine.UART1_TX_PIN
-	rx   = machine.UART1_RX_PIN
-)
-
-func main() {
-	uart.Configure(machine.UARTConfig{TX: tx, RX: rx})
-	for {
-		if uart.Buffered() > 0 {
-			data, _ := uart.ReadByte()
-			print(string(data))
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-}

src/examples/usb-midi/main.go

@@ -7,9 +7,6 @@ import (
 	"time"
 )
 
-// Try it easily by opening the following site in Chrome.
-// https://www.onlinemusictools.com/kb/
-
 func main() {
 	led := machine.LED
 	led.Configure(machine.PinConfig{Mode: machine.PinOutput})
@@ -18,7 +15,7 @@ func main() {
 	button.Configure(machine.PinConfig{Mode: machine.PinInputPullup})
 
 	m := midi.New()
-	m.SetHandler(func(b []byte) {
+	m.SetCallback(func(b []byte) {
 		led.Set(!led.Get())
 		fmt.Printf("% X\r\n", b)
 		m.Write(b)
@@ -27,12 +24,12 @@ func main() {
 	prev := true
 	chords := []struct {
 		name string
-		keys []midi.Note
+		keys []byte
 	}{
-		{name: "C ", keys: []midi.Note{midi.C4, midi.E4, midi.G4}},
-		{name: "G ", keys: []midi.Note{midi.G3, midi.B3, midi.D4}},
-		{name: "Am", keys: []midi.Note{midi.A3, midi.C4, midi.E4}},
-		{name: "F ", keys: []midi.Note{midi.F3, midi.A3, midi.C4}},
+		{name: "C ", keys: []byte{60, 64, 67}},
+		{name: "G ", keys: []byte{55, 59, 62}},
+		{name: "Am", keys: []byte{57, 60, 64}},
+		{name: "F ", keys: []byte{53, 57, 60}},
 	}
 	index := 0
 
@@ -42,12 +39,12 @@ func main() {
 			led.Set(current)
 			if current {
 				for _, c := range chords[index].keys {
-					m.NoteOff(0, 0, c, 0x40)
+					m.Write([]byte{0x08, 0x80, c, 0x40})
 				}
 				index = (index + 1) % len(chords)
 			} else {
 				for _, c := range chords[index].keys {
-					m.NoteOn(0, 0, c, 0x40)
+					m.Write([]byte{0x09, 0x90, c, 0x40})
 				}
 			}
 			prev = current

src/internal/fuzz/fuzz.go

@@ -115,7 +115,7 @@ func CheckCorpus(vals []any, types []reflect.Type) error {
 	return errors.New("not implemented")
 }
 
-func ResetCoverage()    {}
+func ResetCoverage() {}
 func SnapshotCoverage() {}
 
 // RunFuzzWorker is called in a worker process to communicate with the

src/internal/task/task.go

@@ -20,10 +20,6 @@ type Task struct {
 
 	// state is the underlying running state of the task.
 	state state
-
-	// DeferFrame stores a pointer to the (stack allocated) defer frame of the
-	// goroutine that is used for the recover builtin.
-	DeferFrame unsafe.Pointer
 }
 
 // getGoroutineStackSize is a compiler intrinsic that returns the stack size for

src/internal/task/task_none.go

@@ -1,13 +1,9 @@
-//go:build scheduler.none
 // +build scheduler.none
 
 package task
 
 import "unsafe"
 
-// There is only one goroutine so the task struct can be a global.
-var mainTask Task
-
 //go:linkname runtimePanic runtime.runtimePanic
 func runtimePanic(str string)
 
@@ -16,8 +12,8 @@ func Pause() {
 }
 
 func Current() *Task {
-	// Return a task struct, which is used for the recover builtin for example.
-	return &mainTask
+	runtimePanic("scheduler is disabled")
+	return nil
 }
 
 //go:noinline

src/internal/task/task_stack_386.go

@@ -1,4 +1,3 @@
-//go:build scheduler.tasks && 386
 // +build scheduler.tasks,386
 
 package task

src/internal/task/task_stack_amd64.go

@@ -1,4 +1,3 @@
-//go:build scheduler.tasks && amd64 && !windows
 // +build scheduler.tasks,amd64,!windows
 
 package task

src/internal/task/task_stack_amd64_windows.go

@@ -1,4 +1,3 @@
-//go:build scheduler.tasks && amd64 && windows
 // +build scheduler.tasks,amd64,windows
 
 package task

src/internal/task/task_stack_arm.go

@@ -1,4 +1,3 @@
-//go:build scheduler.tasks && arm && !cortexm && !avr && !xtensa && !tinygo.riscv
 // +build scheduler.tasks,arm,!cortexm,!avr,!xtensa,!tinygo.riscv
 
 package task

src/internal/task/task_stack_arm64.go

@@ -1,4 +1,3 @@
-//go:build scheduler.tasks && arm64
 // +build scheduler.tasks,arm64
 
 package task

src/internal/task/task_stack_avr.S

@@ -72,10 +72,7 @@ tinygo_swapTask:
     std Y+1, r3
 
     // Switch to the new stack pointer.
-    in   r0, 0x3f ; SREG
-    cli
     out  0x3d, r24; SPL
-    out  0x3f, r0 ; SREG, restore interrupts (after the next instruction)
     out  0x3e, r25; SPH
 
     // Load saved register from the new stack.

src/internal/task/task_stack_avr.go

@@ -1,4 +1,3 @@
-//go:build scheduler.tasks && avr
 // +build scheduler.tasks,avr
 
 package task

src/internal/task/task_stack_cortexm.go

@@ -1,4 +1,3 @@
-//go:build scheduler.tasks && cortexm
 // +build scheduler.tasks,cortexm
 
 package task

src/internal/task/task_stack_esp32.go

@@ -1,4 +1,3 @@
-//go:build scheduler.tasks && esp32
 // +build scheduler.tasks,esp32
 
 package task

src/internal/task/task_stack_esp8266.go

@@ -1,4 +1,3 @@
-//go:build scheduler.tasks && esp8266
 // +build scheduler.tasks,esp8266
 
 package task

src/internal/task/task_stack_tinygoriscv.go

@@ -1,4 +1,3 @@
-//go:build scheduler.tasks && tinygo.riscv
 // +build scheduler.tasks,tinygo.riscv
 
 package task

src/machine/board_arduino_mega1280.go

@@ -9,6 +9,9 @@ func CPUFrequency() uint32 {
 }
 
 const (
+	AREF Pin = NoPin
+	LED  Pin = PB7
+
 	A0  Pin = PF0
 	A1  Pin = PF1
 	A2  Pin = PF2
@@ -99,7 +102,4 @@ const (
 	D51 Pin = PB2
 	D52 Pin = PB1
 	D53 Pin = PB0
-
-	AREF Pin = NoPin
-	LED  Pin = PB7
 )

src/machine/board_arduino_mega2560.go

@@ -3,17 +3,15 @@
 
 package machine
 
-import (
-	"device/avr"
-	"runtime/interrupt"
-)
-
 // Return the current CPU frequency in hertz.
 func CPUFrequency() uint32 {
 	return 16000000
 }
 
 const (
+	AREF Pin = NoPin
+	LED  Pin = PB7
+
 	A0  Pin = PF0
 	A1  Pin = PF1
 	A2  Pin = PF2
@@ -64,12 +62,12 @@ const (
 	D11 Pin = PB5
 	D12 Pin = PB6
 	D13 Pin = PB7
-	D14 Pin = PJ1 // TX3
-	D15 Pin = PJ0 // RX3
-	D16 Pin = PH1 // TX2
-	D17 Pin = PH0 // RX2
-	D18 Pin = PD3 // TX1
-	D19 Pin = PD2 // RX1
+	D14 Pin = PJ1
+	D15 Pin = PJ0
+	D16 Pin = PH1
+	D17 Pin = PH0
+	D18 Pin = PD3
+	D19 Pin = PD2
 	D20 Pin = PD1
 	D21 Pin = PD0
 	D22 Pin = PA0
@@ -104,63 +102,4 @@ const (
 	D51 Pin = PB2
 	D52 Pin = PB1
 	D53 Pin = PB0
-
-	AREF Pin = NoPin
-	LED  Pin = PB7
 )
-
-// UART pins
-const (
-	UART_TX_PIN  Pin = UART0_TX_PIN
-	UART_RX_PIN  Pin = UART0_RX_PIN
-	UART0_TX_PIN Pin = D1
-	UART0_RX_PIN Pin = D0
-	UART1_TX_PIN Pin = D18
-	UART1_RX_PIN Pin = D19
-	UART2_TX_PIN Pin = D16
-	UART2_RX_PIN Pin = D17
-	UART3_TX_PIN Pin = D14
-	UART3_RX_PIN Pin = D15
-)
-
-var (
-	UART1  = &_UART1
-	_UART1 = UART{
-		Buffer: NewRingBuffer(),
-
-		dataReg:    avr.UDR1,
-		baudRegH:   avr.UBRR1H,
-		baudRegL:   avr.UBRR1L,
-		statusRegA: avr.UCSR1A,
-		statusRegB: avr.UCSR1B,
-		statusRegC: avr.UCSR1C,
-	}
-	UART2  = &_UART2
-	_UART2 = UART{
-		Buffer: NewRingBuffer(),
-
-		dataReg:    avr.UDR2,
-		baudRegH:   avr.UBRR2H,
-		baudRegL:   avr.UBRR2L,
-		statusRegA: avr.UCSR2A,
-		statusRegB: avr.UCSR2B,
-		statusRegC: avr.UCSR2C,
-	}
-	UART3  = &_UART3
-	_UART3 = UART{
-		Buffer: NewRingBuffer(),
-
-		dataReg:    avr.UDR3,
-		baudRegH:   avr.UBRR3H,
-		baudRegL:   avr.UBRR3L,
-		statusRegA: avr.UCSR3A,
-		statusRegB: avr.UCSR3B,
-		statusRegC: avr.UCSR3C,
-	}
-)
-
-func init() {
-	interrupt.New(irq_USART1_RX, _UART1.handleInterrupt)
-	interrupt.New(irq_USART2_RX, _UART2.handleInterrupt)
-	interrupt.New(irq_USART3_RX, _UART3.handleInterrupt)
-}

src/machine/board_arduino_mkr1000.go

@@ -12,6 +12,9 @@ const RESET_MAGIC_VALUE = 0x07738135
 
 // GPIO Pins
 const (
+	RX0 Pin = PB23 // UART2 RX
+	TX1 Pin = PB22 // UART2 TX
+
 	D0 Pin = PA22 // PWM available
 	D1 Pin = PA23 // PWM available
 	D2 Pin = PA10 // PWM available
@@ -28,9 +31,6 @@ const (
 	D12 Pin = PA09 // PWM available, SCL
 	D13 Pin = PB23 // RX
 	D14 Pin = PB22 // TX
-
-	RX0 Pin = PB23 // UART2 RX
-	TX1 Pin = PB22 // UART2 TX
 )
 
 // Analog pins

src/machine/board_arduino_mkrwifi1010.go

@@ -12,6 +12,9 @@ const RESET_MAGIC_VALUE = 0x07738135
 
 // GPIO Pins
 const (
+	RX0 Pin = PB23 // UART1 RX
+	TX1 Pin = PB22 // UART1 TX
+
 	D0 Pin = PA22 // PWM available
 	D1 Pin = PA23 // PWM available
 	D2 Pin = PA10 // PWM available
@@ -28,9 +31,6 @@ const (
 	D12 Pin = PA09 // PWM available, SCL
 	D13 Pin = PB23 // RX
 	D14 Pin = PB22 // TX
-
-	RX0 Pin = PB23 // UART1 RX
-	TX1 Pin = PB22 // UART1 TX
 )
 
 // Analog pins

src/machine/board_arduino_zero.go

@@ -28,6 +28,14 @@ const (
 	D13 = PA17 // PWM available
 )
 
+// LEDs on the Arduino Zero
+const (
+	LED      = LED1
+	LED1 Pin = D13
+	LED2 Pin = PA27 // TX LED
+	LED3 Pin = PB03 // RX LED
+)
+
 // ADC pins
 const (
 	AREF Pin = PA03
@@ -39,14 +47,6 @@ const (
 	ADC5 Pin = PB02
 )
 
-// LEDs on the Arduino Zero
-const (
-	LED      = LED1
-	LED1 Pin = D13
-	LED2 Pin = PA27 // TX LED
-	LED3 Pin = PB03 // RX LED
-)
-
 // SPI pins - EDBG connected
 const (
 	SPI0_SDO_PIN Pin = PA16 // MOSI: SERCOM1/PAD[0]

src/machine/board_badger2040.go

@@ -9,11 +9,6 @@
 //
 package machine
 
-import (
-	"device/rp"
-	"runtime/interrupt"
-)
-
 const (
 	LED Pin = GPIO25
 
@@ -84,26 +79,3 @@ var (
 	usb_VID uint16 = 0x2e8a
 	usb_PID uint16 = 0x0003
 )
-
-// UART pins
-const (
-	UART0_TX_PIN = GPIO0
-	UART0_RX_PIN = GPIO1
-	UART_TX_PIN  = UART0_TX_PIN
-	UART_RX_PIN  = UART0_RX_PIN
-)
-
-// UART on the RP2040
-var (
-	UART0  = &_UART0
-	_UART0 = UART{
-		Buffer: NewRingBuffer(),
-		Bus:    rp.UART0,
-	}
-)
-
-var DefaultUART = UART0
-
-func init() {
-	UART0.Interrupt = interrupt.New(rp.IRQ_UART0_IRQ, _UART0.handleInterrupt)
-}

src/machine/board_bluepill.go

@@ -8,42 +8,14 @@ import (
 	"runtime/interrupt"
 )
 
-// Pins printed on the silkscreen
 const (
-	C13 = PC13
-	C14 = PC14
-	C15 = PC15
-	A0  = PA0
-	A1  = PA1
-	A2  = PA2
-	A3  = PA3
-	A4  = PA4
-	A5  = PA5
-	A6  = PA6
-	A7  = PA7
-	B0  = PB0
-	B1  = PB1
-	B10 = PB10
-	B11 = PB11
-	B12 = PB12
-	B13 = PB13
-	B14 = PB14
-	B15 = PB15
-	A8  = PA8
-	A9  = PA9
-	A10 = PA10
-	A11 = PA11
-	A12 = PA12
-	A13 = PA13
-	A14 = PA14
-	A15 = PA15
-	B3  = PB3
-	B4  = PB4
-	B5  = PB5
-	B6  = PB6
-	B7  = PB7
-	B8  = PB8
-	B9  = PB9
+	LED = PC13
+)
+
+const (
+	// This board does not have a user button, so
+	// use first GPIO pin by default
+	BUTTON = PA0
 )
 
 // Analog Pins
@@ -60,14 +32,6 @@ const (
 	ADC9 = PB1
 )
 
-const (
-	// This board does not have a user button, so
-	// use first GPIO pin by default
-	BUTTON = PA0
-
-	LED = PC13
-)
-
 var DefaultUART = UART1
 
 // UART pins

src/machine/board_challenger_rp2040.go

@@ -1,119 +0,0 @@
-//go:build challenger_rp2040
-// +build challenger_rp2040
-
-package machine
-
-import (
-	"device/rp"
-	"runtime/interrupt"
-)
-
-const (
-	LED = GPIO24
-
-	// Onboard crystal oscillator frequency, in MHz.
-	xoscFreq = 12 // MHz
-)
-
-// GPIO Pins
-const (
-	D5  = GPIO2
-	D6  = GPIO3
-	D9  = GPIO4
-	D10 = GPIO5
-	D11 = GPIO6
-	D12 = GPIO7
-	D13 = GPIO8
-)
-
-// Analog pins
-const (
-	A0 = ADC0
-	A1 = ADC1
-	A2 = ADC2
-	A3 = ADC3
-)
-
-// I2C Pins.
-const (
-	I2C0_SDA_PIN = GPIO24
-	I2C0_SCL_PIN = GPIO25
-
-	I2C1_SDA_PIN = GPIO2
-	I2C1_SCL_PIN = GPIO3
-
-	SDA_PIN = I2C1_SDA_PIN
-	SCL_PIN = I2C1_SCL_PIN
-)
-
-// SPI default pins
-const (
-	// Default Serial Clock Bus 0 for SPI communications
-	SPI0_SCK_PIN = GPIO22
-	// Default Serial Out Bus 0 for SPI communications
-	SPI0_SDO_PIN = GPIO23 // Tx
-	// Default Serial In Bus 0 for SPI communications
-	SPI0_SDI_PIN = GPIO20 // Rx
-
-	// Default Serial Clock Bus 1 for SPI communications
-	SPI1_SCK_PIN = GPIO10
-	// Default Serial Out Bus 1 for SPI communications
-	SPI1_SDO_PIN = GPIO11 // Tx
-	// Default Serial In Bus 1 for SPI communications
-	SPI1_SDI_PIN = GPIO12 // Rx
-)
-
-// LoRa default pins
-const (
-	LORA_CS    = GPIO9
-	LORA_SCK   = GPIO10
-	LORA_SDO   = GPIO11
-	LORA_SDI   = GPIO12
-	LORA_RESET = GPIO13
-	LORA_DIO0  = GPIO14
-	LORA_DIO1  = GPIO15
-	LORA_DIO2  = GPIO18
-)
-
-// UART pins
-const (
-	UART0_TX_PIN = GPIO16
-	UART0_RX_PIN = GPIO17
-	UART1_TX_PIN = GPIO4
-	UART1_RX_PIN = GPIO5
-	UART_TX_PIN  = UART0_TX_PIN
-	UART_RX_PIN  = UART0_RX_PIN
-)
-
-// UART on the RP2040
-var (
-	UART0  = &_UART0
-	_UART0 = UART{
-		Buffer: NewRingBuffer(),
-		Bus:    rp.UART0,
-	}
-
-	UART1  = &_UART1
-	_UART1 = UART{
-		Buffer: NewRingBuffer(),
-		Bus:    rp.UART1,
-	}
-)
-
-var DefaultUART = UART0
-
-func init() {
-	UART0.Interrupt = interrupt.New(rp.IRQ_UART0_IRQ, _UART0.handleInterrupt)
-	UART1.Interrupt = interrupt.New(rp.IRQ_UART1_IRQ, _UART1.handleInterrupt)
-}
-
-// USB identifiers
-const (
-	usb_STRING_PRODUCT      = "Challenger 2040 LoRa"
-	usb_STRING_MANUFACTURER = "iLabs"
-)
-
-var (
-	usb_VID uint16 = 0x2e8a
-	usb_PID uint16 = 0x1023
-)

src/machine/board_clue_alpha.go

@@ -28,6 +28,14 @@ const (
 	D18 = P0_16
 	D19 = P0_25
 	D20 = P0_24
+	D21 = A0
+	D22 = A1
+	D23 = A2
+	D24 = A3
+	D25 = A4
+	D26 = A5
+	D27 = A6
+	D28 = A7
 	D29 = P0_14
 	D30 = P0_15
 	D31 = P0_12

src/machine/board_esp32-coreboard-v2.go

@@ -3,50 +3,50 @@
 
 package machine
 
-const (
-	CLK  = GPIO6
-	CMD  = GPIO11
-	IO0  = GPIO0
-	IO1  = GPIO1
-	IO2  = GPIO2
-	IO3  = GPIO3
-	IO4  = GPIO4
-	IO5  = GPIO5
-	IO9  = GPIO9
-	IO10 = GPIO10
-	IO16 = GPIO16
-	IO17 = GPIO17
-	IO18 = GPIO18
-	IO19 = GPIO19
-	IO21 = GPIO21
-	IO22 = GPIO22
-	IO23 = GPIO23
-	IO25 = GPIO25
-	IO26 = GPIO26
-	IO27 = GPIO27
-	IO32 = GPIO32
-	IO33 = GPIO33
-	IO34 = GPIO34
-	IO35 = GPIO35
-	IO36 = GPIO36
-	IO39 = GPIO39
-	RXD  = GPIO3
-	SD0  = GPIO7
-	SD1  = GPIO8
-	SD2  = GPIO9
-	SD3  = GPIO10
-	SVN  = GPIO39
-	SVP  = GPIO36
-	TCK  = GPIO13
-	TD0  = GPIO15
-	TDI  = GPIO12
-	TMS  = GPIO14
-	TXD  = GPIO1
-)
-
 // Built-in LED on some ESP32 boards.
 const LED = IO2
 
+const (
+	CLK  Pin = 6
+	CMD  Pin = 11
+	IO0  Pin = 0
+	IO1  Pin = 1
+	IO10 Pin = 10
+	IO16 Pin = 16
+	IO17 Pin = 17
+	IO18 Pin = 18
+	IO19 Pin = 19
+	IO2  Pin = 2
+	IO21 Pin = 21
+	IO22 Pin = 22
+	IO23 Pin = 23
+	IO25 Pin = 25
+	IO26 Pin = 26
+	IO27 Pin = 27
+	IO3  Pin = 3
+	IO32 Pin = 32
+	IO33 Pin = 33
+	IO34 Pin = 34
+	IO35 Pin = 35
+	IO36 Pin = 36
+	IO39 Pin = 39
+	IO4  Pin = 4
+	IO5  Pin = 5
+	IO9  Pin = 9
+	RXD  Pin = 3
+	SD0  Pin = 7
+	SD1  Pin = 8
+	SD2  Pin = 9
+	SD3  Pin = 10
+	SVN  Pin = 39
+	SVP  Pin = 36
+	TCK  Pin = 13
+	TD0  Pin = 15
+	TDI  Pin = 12
+	TMS  Pin = 14
+	TXD  Pin = 1
+)
+
 // SPI pins
 const (
 	SPI0_SCK_PIN = IO18

src/machine/board_esp32c3-12f.go

@@ -12,21 +12,21 @@ const (
 )
 
 const (
-	IO0  = GPIO0
-	IO1  = GPIO1
-	IO2  = GPIO2
-	IO3  = GPIO3
-	IO4  = GPIO4
-	IO5  = GPIO5
-	IO6  = GPIO6
-	IO7  = GPIO7
-	IO8  = GPIO8
-	IO9  = GPIO9
-	IO10 = GPIO10
-	IO18 = GPIO18
-	IO19 = GPIO19
-	RXD  = GPIO20
-	TXD  = GPIO21
+	IO0  Pin = 0
+	IO1  Pin = 1
+	IO10 Pin = 10
+	IO18 Pin = 18
+	IO19 Pin = 19
+	IO2  Pin = 2
+	IO3  Pin = 3
+	IO4  Pin = 4
+	IO5  Pin = 5
+	IO6  Pin = 6
+	IO7  Pin = 7
+	IO8  Pin = 8
+	IO9  Pin = 9
+	RXD  Pin = 20
+	TXD  Pin = 21
 )
 
 // ADC pins

src/machine/board_feather_rp2040.go

@@ -3,13 +3,12 @@
 
 package machine
 
-import (
-	"device/rp"
-	"runtime/interrupt"
-)
+const (
+	LED = GPIO13
 
-// Onboard crystal oscillator frequency, in MHz.
-const xoscFreq = 12 // MHz
+	// Onboard crystal oscillator frequency, in MHz.
+	xoscFreq = 12 // MHz
+)
 
 // GPIO Pins
 const (
@@ -33,8 +32,6 @@ const (
 	A3 = GPIO29
 )
 
-const LED = GPIO13
-
 // I2C Pins.
 const (
 	I2C0_SDA_PIN = GPIO24
@@ -64,41 +61,9 @@ const (
 	SPI1_SDI_PIN = GPIO12 // Rx
 )
 
-// UART pins
+// USB CDC identifiers
 const (
-	UART0_TX_PIN = GPIO0
-	UART0_RX_PIN = GPIO1
-	UART1_TX_PIN = GPIO8
-	UART1_RX_PIN = GPIO9
-	UART_TX_PIN  = UART0_TX_PIN
-	UART_RX_PIN  = UART0_RX_PIN
-)
-
-// UART on the RP2040
-var (
-	UART0  = &_UART0
-	_UART0 = UART{
-		Buffer: NewRingBuffer(),
-		Bus:    rp.UART0,
-	}
-
-	UART1  = &_UART1
-	_UART1 = UART{
-		Buffer: NewRingBuffer(),
-		Bus:    rp.UART1,
-	}
-)
-
-var DefaultUART = UART0
-
-func init() {
-	UART0.Interrupt = interrupt.New(rp.IRQ_UART0_IRQ, _UART0.handleInterrupt)
-	UART1.Interrupt = interrupt.New(rp.IRQ_UART1_IRQ, _UART1.handleInterrupt)
-}
-
-// USB identifiers
-const (
-	usb_STRING_PRODUCT      = "Feather RP2040"
+	usb_STRING_PRODUCT      = "Adafruit Feather RP2040"
 	usb_STRING_MANUFACTURER = "Adafruit"
 )
 

src/machine/board_m5stack.go

@@ -20,40 +20,46 @@ const (
 	//     HPWR    | 5V
 	//     HPWR    | BATTERY
 
-	IO0  = GPIO0
-	IO1  = GPIO1
-	IO2  = GPIO2
-	IO3  = GPIO3
-	IO4  = GPIO4
-	IO5  = GPIO5
-	IO6  = GPIO6
-	IO7  = GPIO7
-	IO8  = GPIO8
-	IO9  = GPIO9
-	IO10 = GPIO10
-	IO11 = GPIO11
-	IO12 = GPIO12
-	IO13 = GPIO13
-	IO14 = GPIO14
-	IO15 = GPIO15
-	IO16 = GPIO16
-	IO17 = GPIO17
-	IO18 = GPIO18
-	IO19 = GPIO19
-	IO21 = GPIO21
-	IO22 = GPIO22
-	IO23 = GPIO23
-	IO25 = GPIO25
-	IO26 = GPIO26
-	IO27 = GPIO27
-	IO32 = GPIO32
-	IO33 = GPIO33
-	IO34 = GPIO34
-	IO35 = GPIO35
-	IO36 = GPIO36
-	IO37 = GPIO37
-	IO38 = GPIO38
-	IO39 = GPIO39
+	IO0  Pin = 0
+	IO1  Pin = 1
+	IO2  Pin = 2
+	IO3  Pin = 3
+	IO4  Pin = 4
+	IO5  Pin = 5
+	IO6  Pin = 6
+	IO7  Pin = 7
+	IO8  Pin = 8
+	IO9  Pin = 9
+	IO10 Pin = 10
+	IO11 Pin = 11
+	IO12 Pin = 12
+	IO13 Pin = 13
+	IO14 Pin = 14
+	IO15 Pin = 15
+	IO16 Pin = 16
+	IO17 Pin = 17
+	IO18 Pin = 18
+	IO19 Pin = 19
+	IO20 Pin = 20
+	IO21 Pin = 21
+	IO22 Pin = 22
+	IO23 Pin = 23
+	IO24 Pin = 24
+	IO25 Pin = 25
+	IO26 Pin = 26
+	IO27 Pin = 27
+	IO28 Pin = 28
+	IO29 Pin = 29
+	IO30 Pin = 30
+	IO31 Pin = 31
+	IO32 Pin = 32
+	IO33 Pin = 33
+	IO34 Pin = 34
+	IO35 Pin = 35
+	IO36 Pin = 36
+	IO37 Pin = 37
+	IO38 Pin = 38
+	IO39 Pin = 39
 )
 
 const (

src/machine/board_m5stack_core2.go

@@ -20,39 +20,39 @@ const (
 	//     N/C      | 5V
 	//     N/C      | BAT
 
-	IO0  = GPIO0
-	IO1  = GPIO1 // U0TXD
-	IO2  = GPIO2
-	IO3  = GPIO3 // U0RXD
-	IO4  = GPIO4
-	IO5  = GPIO5
-	IO6  = GPIO6  // SD_CLK
-	IO7  = GPIO7  // SD_DATA0
-	IO8  = GPIO8  // SD_DATA1
-	IO9  = GPIO9  // SD_DATA2
-	IO10 = GPIO10 // SD_DATA3
-	IO11 = GPIO11 // SD_CMD
-	IO12 = GPIO12
-	IO13 = GPIO13 // U0RXD
-	IO14 = GPIO14 // U1TXD
-	IO15 = GPIO15
-	IO16 = GPIO16
-	IO17 = GPIO17
-	IO18 = GPIO18 // SPI0_SCK
-	IO19 = GPIO19
-	IO21 = GPIO21 // SDA0
-	IO22 = GPIO22 // SCL0
-	IO23 = GPIO23 // SPI0_SDO
-	IO25 = GPIO25
-	IO26 = GPIO26
-	IO27 = GPIO27
-	IO32 = GPIO32 // SDA1
-	IO33 = GPIO33 // SCL1
-	IO34 = GPIO34
-	IO35 = GPIO35 // ADC1
-	IO36 = GPIO36 // ADC2
-	IO38 = GPIO38 // SPI0_SDI
-	IO39 = GPIO39
+	IO0  Pin = 0
+	IO1  Pin = 1 // U0TXD
+	IO2  Pin = 2
+	IO3  Pin = 3 // U0RXD
+	IO4  Pin = 4
+	IO5  Pin = 5
+	IO6  Pin = 6  // SD_CLK
+	IO7  Pin = 7  // SD_DATA0
+	IO8  Pin = 8  // SD_DATA1
+	IO9  Pin = 9  // SD_DATA2
+	IO10 Pin = 10 // SD_DATA3
+	IO11 Pin = 11 // SD_CMD
+	IO12 Pin = 12
+	IO13 Pin = 13 // U0RXD
+	IO14 Pin = 14 // U1TXD
+	IO15 Pin = 15
+	IO16 Pin = 16
+	IO17 Pin = 17
+	IO18 Pin = 18 // SPI0_SCK
+	IO19 Pin = 19
+	IO21 Pin = 21 // SDA0
+	IO22 Pin = 22 // SCL0
+	IO23 Pin = 23 // SPI0_SDO
+	IO25 Pin = 25
+	IO26 Pin = 26
+	IO27 Pin = 27
+	IO32 Pin = 32 // SDA1
+	IO33 Pin = 33 // SCL1
+	IO34 Pin = 34
+	IO35 Pin = 35 // ADC1
+	IO36 Pin = 36 // ADC2
+	IO38 Pin = 38 // SPI0_SDI
+	IO39 Pin = 39
 )
 
 // SPI pins

src/machine/board_m5stamp_c3.go

@@ -4,28 +4,28 @@
 package machine
 
 const (
-	IO0  = GPIO0
-	IO1  = GPIO1
-	IO2  = GPIO2
-	IO3  = GPIO3
-	IO4  = GPIO4
-	IO5  = GPIO5
-	IO6  = GPIO6
-	IO7  = GPIO7
-	IO8  = GPIO8
-	IO9  = GPIO9
-	IO10 = GPIO10
-	IO11 = GPIO11
-	IO12 = GPIO12
-	IO13 = GPIO13
-	IO14 = GPIO14
-	IO15 = GPIO15
-	IO16 = GPIO16
-	IO17 = GPIO17
-	IO18 = GPIO18
-	IO19 = GPIO19
-	IO20 = GPIO20
-	IO21 = GPIO21
+	IO0  Pin = 0
+	IO1  Pin = 1
+	IO2  Pin = 2
+	IO3  Pin = 3
+	IO4  Pin = 4
+	IO5  Pin = 5
+	IO6  Pin = 6
+	IO7  Pin = 7
+	IO8  Pin = 8
+	IO9  Pin = 9
+	IO10 Pin = 10
+	IO11 Pin = 11
+	IO12 Pin = 12
+	IO13 Pin = 13
+	IO14 Pin = 14
+	IO15 Pin = 15
+	IO16 Pin = 16
+	IO17 Pin = 17
+	IO18 Pin = 18
+	IO19 Pin = 19
+	IO20 Pin = 20
+	IO21 Pin = 21
 
 	XTAL_32K_P = IO0
 	XTAL_32K_N = IO1

src/machine/board_macropad-rp2040.go

@@ -3,11 +3,6 @@
 
 package machine
 
-import (
-	"device/rp"
-	"runtime/interrupt"
-)
-
 const (
 	NeopixelCount = 12
 
@@ -69,37 +64,3 @@ const (
 	SPI0_SDO_PIN = 31 // not pinned out
 	SPI0_SDI_PIN = 31 // not pinned out
 )
-
-// UART pins
-const (
-	UART0_TX_PIN = GPIO0
-	UART0_RX_PIN = GPIO1
-	UART_TX_PIN  = UART0_TX_PIN
-	UART_RX_PIN  = UART0_RX_PIN
-)
-
-// UART on the RP2040
-var (
-	UART0  = &_UART0
-	_UART0 = UART{
-		Buffer: NewRingBuffer(),
-		Bus:    rp.UART0,
-	}
-)
-
-var DefaultUART = UART0
-
-func init() {
-	UART0.Interrupt = interrupt.New(rp.IRQ_UART0_IRQ, _UART0.handleInterrupt)
-}
-
-// USB identifiers
-const (
-	usb_STRING_PRODUCT      = "MacroPad RP2040"
-	usb_STRING_MANUFACTURER = "Adafruit"
-)
-
-var (
-	usb_VID uint16 = 0x239A
-	usb_PID uint16 = 0x8107
-)

src/machine/board_mch2022.go

@@ -1,29 +0,0 @@
-//go:build mch2022
-// +build mch2022
-
-package machine
-
-// See: https://badge.team/docs/badges/mch2022/pinout/
-
-const (
-	UART_TX_PIN Pin = 1
-	UART_RX_PIN Pin = 3
-
-	WS2812 Pin = 5
-
-	PowerOn Pin = 19 // Set high to enable power to LEDs and SD card
-
-	// I2C pins
-	SDA_PIN Pin = 22
-	SCL_PIN Pin = 21
-
-	// SPI and related pins (ICE40 and LCD).
-	LCD_RESET         Pin = 25
-	LCD_MODE          Pin = 26
-	LCD_DC            Pin = 33
-	SPI0_SCK_PIN      Pin = 18
-	SPI0_SDO_PIN      Pin = 23
-	SPI0_SDI_PIN      Pin = 35 // connected to ICE40
-	SPI0_CS_ICE40_PIN Pin = 27
-	SPI0_CS_LCD_PIN   Pin = 32
-)

src/machine/board_microbit.go

@@ -6,74 +6,74 @@ package machine
 // The micro:bit does not have a 32kHz crystal on board.
 const HasLowFrequencyCrystal = false
 
-var DefaultUART = UART0
-
-// GPIO/Analog pins
-const (
-	P0  = P0_03
-	P1  = P0_02
-	P2  = P0_01
-	P3  = P0_04
-	P4  = P0_05
-	P5  = P0_17
-	P6  = P0_12
-	P7  = P0_11
-	P8  = P0_18
-	P9  = P0_10
-	P10 = P0_06
-	P11 = P0_26
-	P12 = P0_20
-	P13 = P0_23
-	P14 = P0_22
-	P15 = P0_21
-	P16 = P0_16
-)
-
 // Buttons on the micro:bit (A and B)
 const (
-	BUTTONA = P0_17
-	BUTTONB = P0_26
-	BUTTON  = BUTTONA
+	BUTTON  Pin = BUTTONA
+	BUTTONA Pin = 17
+	BUTTONB Pin = 26
 )
 
+var DefaultUART = UART0
+
 // UART pins
 const (
-	UART_TX_PIN = P0_24
-	UART_RX_PIN = P0_25
+	UART_TX_PIN Pin = 24
+	UART_RX_PIN Pin = 25
 )
 
 // ADC pins
 const (
-	ADC0 = P0_03 // P0 on the board
-	ADC1 = P0_02 // P1 on the board
-	ADC2 = P0_01 // P2 on the board
+	ADC0 Pin = 3 // P0 on the board
+	ADC1 Pin = 2 // P1 on the board
+	ADC2 Pin = 1 // P2 on the board
 )
 
 // I2C pins
 const (
-	SDA_PIN = P0_30 // P20 on the board
-	SCL_PIN = P0_00 // P19 on the board
+	SDA_PIN Pin = 30 // P20 on the board
+	SCL_PIN Pin = 0  // P19 on the board
 )
 
 // SPI pins
 const (
-	SPI0_SCK_PIN = P0_23 // P13 on the board
-	SPI0_SDO_PIN = P0_21 // P15 on the board
-	SPI0_SDI_PIN = P0_22 // P14 on the board
+	SPI0_SCK_PIN Pin = 23 // P13 on the board
+	SPI0_SDO_PIN Pin = 21 // P15 on the board
+	SPI0_SDI_PIN Pin = 22 // P14 on the board
+)
+
+// GPIO/Analog pins
+const (
+	P0  Pin = 3
+	P1  Pin = 2
+	P2  Pin = 1
+	P3  Pin = 4
+	P4  Pin = 5
+	P5  Pin = 17
+	P6  Pin = 12
+	P7  Pin = 11
+	P8  Pin = 18
+	P9  Pin = 10
+	P10 Pin = 6
+	P11 Pin = 26
+	P12 Pin = 20
+	P13 Pin = 23
+	P14 Pin = 22
+	P15 Pin = 21
+	P16 Pin = 16
 )
 
 // LED matrix pins
 const (
-	LED_COL_1 = P0_04
-	LED_COL_2 = P0_05
-	LED_COL_3 = P0_06
-	LED_COL_4 = P0_07
-	LED_COL_5 = P0_08
-	LED_COL_6 = P0_09
-	LED_COL_7 = P0_10
-	LED_COL_8 = P0_11
-	LED_COL_9 = P0_12
-	LED_ROW_1 = P0_13
-	LED_ROW_2 = P0_14
-	LED_ROW_3 = P0_15
+	LED_COL_1 Pin = 4
+	LED_COL_2 Pin = 5
+	LED_COL_3 Pin = 6
+	LED_COL_4 Pin = 7
+	LED_COL_5 Pin = 8
+	LED_COL_6 Pin = 9
+	LED_COL_7 Pin = 10
+	LED_COL_8 Pin = 11
+	LED_COL_9 Pin = 12
+	LED_ROW_1 Pin = 13
+	LED_ROW_2 Pin = 14
+	LED_ROW_3 Pin = 15
 )

src/machine/board_nano-rp2040.go

@@ -13,11 +13,6 @@
 //
 package machine
 
-import (
-	"device/rp"
-	"runtime/interrupt"
-)
-
 // Digital Pins
 const (
 	D2  Pin = GPIO25
@@ -109,26 +104,3 @@ var (
 	usb_VID uint16 = 0x2341
 	usb_PID uint16 = 0x005e
 )
-
-// UART pins
-const (
-	UART0_TX_PIN = GPIO0
-	UART0_RX_PIN = GPIO1
-	UART_TX_PIN  = UART0_TX_PIN
-	UART_RX_PIN  = UART0_RX_PIN
-)
-
-// UART on the RP2040
-var (
-	UART0  = &_UART0
-	_UART0 = UART{
-		Buffer: NewRingBuffer(),
-		Bus:    rp.UART0,
-	}
-)
-
-var DefaultUART = UART0
-
-func init() {
-	UART0.Interrupt = interrupt.New(rp.IRQ_UART0_IRQ, _UART0.handleInterrupt)
-}

src/machine/board_nodemcu.go

@@ -7,15 +7,15 @@ package machine
 
 // GPIO pins on the NodeMCU board.
 const (
-	D0 = GPIO16
-	D1 = GPIO5
-	D2 = GPIO4
-	D3 = GPIO0
-	D4 = GPIO2
-	D5 = GPIO14
-	D6 = GPIO12
-	D7 = GPIO13
-	D8 = GPIO15
+	D0 Pin = 16
+	D1 Pin = 5
+	D2 Pin = 4
+	D3 Pin = 0
+	D4 Pin = 2
+	D5 Pin = 14
+	D6 Pin = 12
+	D7 Pin = 13
+	D8 Pin = 15
 )
 
 // Onboard blue LED (on the AI-Thinker module).

src/machine/board_nrf51.go

@@ -1,44 +0,0 @@
-//go:build nrf51 || microbit
-// +build nrf51 microbit
-
-package machine
-
-func CPUFrequency() uint32 {
-	return 16000000
-}
-
-// Hardware pins
-const (
-	P0_00 Pin = 0
-	P0_01 Pin = 1
-	P0_02 Pin = 2
-	P0_03 Pin = 3
-	P0_04 Pin = 4
-	P0_05 Pin = 5
-	P0_06 Pin = 6
-	P0_07 Pin = 7
-	P0_08 Pin = 8
-	P0_09 Pin = 9
-	P0_10 Pin = 10
-	P0_11 Pin = 11
-	P0_12 Pin = 12
-	P0_13 Pin = 13
-	P0_14 Pin = 14
-	P0_15 Pin = 15
-	P0_16 Pin = 16
-	P0_17 Pin = 17
-	P0_18 Pin = 18
-	P0_19 Pin = 19
-	P0_20 Pin = 20
-	P0_21 Pin = 21
-	P0_22 Pin = 22
-	P0_23 Pin = 23
-	P0_24 Pin = 24
-	P0_25 Pin = 25
-	P0_26 Pin = 26
-	P0_27 Pin = 27
-	P0_28 Pin = 28
-	P0_29 Pin = 29
-	P0_30 Pin = 30
-	P0_31 Pin = 31
-)

src/machine/board_nrf52840-mdk.go

@@ -7,10 +7,10 @@ const HasLowFrequencyCrystal = true
 
 // LEDs on the nrf52840-mdk (nRF52840 dev board)
 const (
+	LED       Pin = LED_GREEN
 	LED_GREEN Pin = 22
 	LED_RED   Pin = 23
 	LED_BLUE  Pin = 24
-	LED       Pin = LED_GREEN
 )
 
 // UART pins

src/machine/board_nucleol031k6.go

@@ -8,6 +8,18 @@ import (
 	"runtime/interrupt"
 )
 
+const (
+	LED         = LED_BUILTIN
+	LED_BUILTIN = LED_GREEN
+	LED_GREEN   = PB3
+)
+
+const (
+	// This board does not have a user button, so
+	// use first GPIO pin by default
+	BUTTON = PA0
+)
+
 const (
 	// Arduino Pins
 	A0 = PA0 // ADC_IN0
@@ -33,18 +45,6 @@ const (
 	D13 = PB3  // SPI1_SCK
 )
 
-const (
-	LED         = LED_BUILTIN
-	LED_BUILTIN = LED_GREEN
-	LED_GREEN   = PB3
-)
-
-const (
-	// This board does not have a user button, so
-	// use first GPIO pin by default
-	BUTTON = PA0
-)
-
 const (
 	// UART pins
 	// PA2 and PA15 are connected to the ST-Link Virtual Com Port (VCP)

src/machine/board_nucleol432kc.go

@@ -8,6 +8,18 @@ import (
 	"runtime/interrupt"
 )
 
+const (
+	LED         = LED_BUILTIN
+	LED_BUILTIN = LED_GREEN
+	LED_GREEN   = PB3
+)
+
+const (
+	// This board does not have a user button, so
+	// use first GPIO pin by default
+	BUTTON = PA0
+)
+
 const (
 	// Arduino Pins
 	A0 = PA0
@@ -35,18 +47,6 @@ const (
 	D13 = PB3
 )
 
-const (
-	LED         = LED_BUILTIN
-	LED_BUILTIN = LED_GREEN
-	LED_GREEN   = PB3
-)
-
-const (
-	// This board does not have a user button, so
-	// use first GPIO pin by default
-	BUTTON = PA0
-)
-
 const (
 	// UART pins
 	// PA2 and PA15 are connected to the ST-Link Virtual Com Port (VCP)

src/machine/board_nucleol552ze.go

@@ -9,11 +9,11 @@ import (
 )
 
 const (
+	LED         = LED_BUILTIN
+	LED_BUILTIN = LED_GREEN
 	LED_GREEN   = PC7
 	LED_BLUE    = PB7
 	LED_RED     = PA9
-	LED_BUILTIN = LED_GREEN
-	LED         = LED_BUILTIN
 )
 
 const (

src/machine/board_particle_argon.go

@@ -8,6 +8,14 @@ const HasLowFrequencyCrystal = true
 // More info: https://docs.particle.io/datasheets/wi-fi/argon-datasheet/
 // Board diagram: https://docs.particle.io/assets/images/argon/argon-block-diagram.png
 
+// LEDs
+const (
+	LED       Pin = 44
+	LED_GREEN Pin = 14
+	LED_RED   Pin = 13
+	LED_BLUE  Pin = 15
+)
+
 // GPIOs
 const (
 	A0  Pin = 3
@@ -32,14 +40,6 @@ const (
 	D13 Pin = 47 // Also SCK
 )
 
-// LEDs
-const (
-	LED       Pin = 44
-	LED_GREEN Pin = 14
-	LED_RED   Pin = 13
-	LED_BLUE  Pin = 15
-)
-
 // UART
 var (
 	DefaultUART = UART0

src/machine/board_particle_boron.go

@@ -8,6 +8,14 @@ const HasLowFrequencyCrystal = true
 // More info: https://docs.particle.io/datasheets/cellular/boron-datasheet/
 // Board diagram: https://docs.particle.io/assets/images/boron/boron-block-diagram.png
 
+// LEDs
+const (
+	LED       Pin = 44
+	LED_GREEN Pin = 14
+	LED_RED   Pin = 13
+	LED_BLUE  Pin = 15
+)
+
 // GPIOs
 const (
 	A0  Pin = 3
@@ -32,14 +40,6 @@ const (
 	D13 Pin = 47 // Also SCK
 )
 
-// LEDs
-const (
-	LED       Pin = 44
-	LED_GREEN Pin = 14
-	LED_RED   Pin = 13
-	LED_BLUE  Pin = 15
-)
-
 // UART
 var (
 	DefaultUART = UART0

src/machine/board_particle_xenon.go

@@ -8,6 +8,14 @@ const HasLowFrequencyCrystal = true
 // More info: https://docs.particle.io/datasheets/discontinued/xenon-datasheet/
 // Board diagram: https://docs.particle.io/assets/images/xenon/xenon-block-diagram.png
 
+// LEDs
+const (
+	LED       Pin = 44
+	LED_GREEN Pin = 14
+	LED_RED   Pin = 13
+	LED_BLUE  Pin = 15
+)
+
 // GPIOs
 const (
 	A0  Pin = 3
@@ -32,14 +40,6 @@ const (
 	D13 Pin = 47 // Also SCK
 )
 
-// LEDs
-const (
-	LED       Pin = 44
-	LED_GREEN Pin = 14
-	LED_RED   Pin = 13
-	LED_BLUE  Pin = 15
-)
-
 // UART
 var (
 	DefaultUART = UART0

src/machine/board_pca10031.go

@@ -11,21 +11,21 @@ const HasLowFrequencyCrystal = true
 
 // LED on the pca10031
 const (
-	LED1      = LED_RED
-	LED2      = LED_GREEN
-	LED3      = LED_BLUE
-	LED_RED   = P0_21
-	LED_GREEN = P0_22
-	LED_BLUE  = P0_23
-	LED       = LED_RED
+	LED       Pin = LED_RED
+	LED1      Pin = LED_RED
+	LED2      Pin = LED_GREEN
+	LED3      Pin = LED_BLUE
+	LED_RED   Pin = 21
+	LED_GREEN Pin = 22
+	LED_BLUE  Pin = 23
 )
 
 var DefaultUART = UART0
 
 // UART pins
 const (
-	UART_TX_PIN = P0_09
-	UART_RX_PIN = P0_11
+	UART_TX_PIN Pin = 9
+	UART_RX_PIN Pin = 11
 )
 
 // I2C pins (disabled)