WIP shadow-stack based mark/sweep collector

.circleci/config.yml

@@ -1,252 +0,0 @@
-version: 2.1
-
-commands:
-  submodules:
-    steps:
-      - run:
-          name: "Pull submodules"
-          command: git submodule update --init
-  apt-dependencies:
-    parameters:
-      llvm:
-        type: string
-    steps:
-      - run:
-          name: "Install apt dependencies"
-          command: |
-            echo 'deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch<<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 \
-                python3 \
-                llvm<<parameters.llvm>>-dev \
-                clang<<parameters.llvm>> \
-                libclang<<parameters.llvm>>-dev \
-                lld<<parameters.llvm>> \
-                gcc-arm-linux-gnueabihf \
-                libc6-dev-armel-cross \
-                gcc-aarch64-linux-gnu \
-                libc6-dev-arm64-cross \
-                qemu-system-arm \
-                qemu-user \
-                gcc-avr \
-                avr-libc
-  install-node:
-    steps:
-      - run:
-          name: "Install node.js"
-          command: |
-            wget https://nodejs.org/dist/v10.15.1/node-v10.15.1-linux-x64.tar.xz
-            sudo tar -C /usr/local -xf node-v10.15.1-linux-x64.tar.xz
-            sudo ln -s /usr/local/node-v10.15.1-linux-x64/bin/node /usr/bin/node
-            rm node-v10.15.1-linux-x64.tar.xz
-  llvm-source-linux:
-    steps:
-      - restore_cache:
-          keys:
-            - llvm-source-8-v3
-      - run:
-          name: "Fetch LLVM source"
-          command: make llvm-source
-      - save_cache:
-          key: llvm-source-8-v3
-          paths:
-            - llvm
-  smoketest:
-    steps:
-      - run: make smoketest
-  smoketest-no-avr:
-    steps:
-      - run: make smoketest-no-avr
-  test-linux:
-    steps:
-      - checkout
-      - submodules
-      - apt-dependencies:
-          llvm: "-8"
-      - install-node
-      - restore_cache:
-          keys:
-            - go-cache-{{ checksum "Gopkg.lock" }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}
-            - go-cache-{{ checksum "Gopkg.lock" }}
-      - llvm-source-linux
-      - run: go install .
-      - run: go test -v
-      - run: make gen-device -j4
-      - smoketest
-      - save_cache:
-          key: go-cache-{{ checksum "Gopkg.lock" }}-{{ .Environment.CIRCLE_BUILD_NUM }}
-          paths:
-            - ~/.cache/go-build
-            - ~/.cache/tinygo
-      - run: make fmt-check
-  build-linux:
-    steps:
-      - checkout
-      - submodules
-      - run:
-          name: "Install apt dependencies"
-          command: |
-            sudo apt-get install \
-                python3 \
-                gcc-arm-linux-gnueabihf \
-                binutils-arm-none-eabi \
-                libc6-dev-armel-cross \
-                gcc-aarch64-linux-gnu \
-                libc6-dev-arm64-cross \
-                qemu-system-arm \
-                qemu-user \
-                gcc-avr \
-                avr-libc
-      - install-node
-      - restore_cache:
-          keys:
-            - go-cache-{{ checksum "Gopkg.lock" }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}
-            - go-cache-{{ checksum "Gopkg.lock" }}
-      - llvm-source-linux
-      - restore_cache:
-          keys:
-            - llvm-build-8-linux-v5
-      - run:
-          name: "Build LLVM"
-          command: |
-            if [ ! -f llvm-build/lib/liblldELF.a ]
-            then
-              # install dependencies
-              sudo apt-get install cmake clang ninja-build
-              # make build faster
-              export CC=clang
-              export CXX=clang++
-              # hack ninja to use less jobs
-              echo -e '#!/bin/sh\n/usr/bin/ninja -j3 "$@"' > /go/bin/ninja
-              chmod +x /go/bin/ninja
-              # build!
-              make llvm-build
-            fi
-      - save_cache:
-          key: llvm-build-8-linux-v5
-          paths:
-            llvm-build
-      - run:
-          name: "Create LLVM symlinks"
-          command: |
-            ln -s $PWD/llvm-build/bin/clang-8 /go/bin/clang-8
-            ln -s $PWD/llvm-build/bin/ld.lld  /go/bin/ld.lld-8
-            ln -s $PWD/llvm-build/bin/wasm-ld /go/bin/wasm-ld-8
-      - run:
-          name: "Test TinyGo"
-          command: make test
-      - run:
-          name: "Build TinyGo release"
-          command: |
-            make release -j3
-            cp -p build/release.tar.gz /tmp/tinygo.linux-amd64.tar.gz
-      - store_artifacts:
-          path: /tmp/tinygo.linux-amd64.tar.gz
-      - save_cache:
-          key: go-cache-{{ checksum "Gopkg.lock" }}-{{ .Environment.CIRCLE_BUILD_NUM }}
-          paths:
-            - ~/.cache/go-build
-            - ~/.cache/tinygo
-      - run:
-          name: "Extract release tarball"
-          command: |
-            mkdir -p ~/lib
-            tar -C ~/lib -xf /tmp/tinygo.linux-amd64.tar.gz
-            ln -s ~/lib/tinygo/bin/tinygo /go/bin/tinygo
-            tinygo version
-      - smoketest
-  build-macos:
-    steps:
-      - checkout
-      - submodules
-      - run:
-          name: "Install dependencies"
-          command: |
-            curl https://dl.google.com/go/go1.12.5.darwin-amd64.tar.gz -o go1.12.5.darwin-amd64.tar.gz
-            sudo tar -C /usr/local -xzf go1.12.5.darwin-amd64.tar.gz
-            ln -s /usr/local/go/bin/go /usr/local/bin/go
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu
-      - restore_cache:
-          keys:
-            - llvm-source-8-macos-v3
-      - run:
-          name: "Fetch LLVM source"
-          command: make llvm-source
-      - save_cache:
-          key: llvm-source-8-macos-v3
-          paths:
-            - llvm
-      - restore_cache:
-          keys:
-            - llvm-build-8-macos-v4
-      - run:
-          name: "Build LLVM"
-          command: |
-            if [ ! -f llvm-build/lib/liblldELF.a ]
-            then
-              # install dependencies
-              HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake ninja
-              # build!
-              make llvm-build
-            fi
-      - save_cache:
-          key: llvm-build-8-macos-v4
-          paths:
-            llvm-build
-      - run:
-          name: "Create LLVM symlinks"
-          command: |
-            ln -s $PWD/llvm-build/bin/clang-8 /usr/local/bin/clang-8
-      - run:
-          name: "Test TinyGo"
-          command: make test
-      - run:
-          name: "Build TinyGo release"
-          command: |
-            make release -j3
-            cp -p build/release.tar.gz /tmp/tinygo.darwin-amd64.tar.gz
-      - store_artifacts:
-          path: /tmp/tinygo.darwin-amd64.tar.gz
-      - run:
-          name: "Extract release tarball"
-          command: |
-            mkdir -p ~/lib
-            tar -C /usr/local/opt -xf /tmp/tinygo.darwin-amd64.tar.gz
-            ln -s /usr/local/opt/tinygo/bin/tinygo /usr/local/bin/tinygo
-            tinygo version
-      - smoketest-no-avr
-
-
-jobs:
-  test-llvm8-go111:
-    docker:
-      - image: circleci/golang:1.11
-    steps:
-      - test-linux
-  test-llvm8-go112:
-    docker:
-      - image: circleci/golang:1.12
-    steps:
-      - test-linux
-  build-linux:
-    docker:
-      - image: circleci/golang:1.12
-    steps:
-      - build-linux
-  build-macos:
-    macos:
-      xcode: "10.1.0"
-    steps:
-      - build-macos
-
-
-
-
-workflows:
-  test-all:
-    jobs:
-      - test-llvm8-go111
-      - test-llvm8-go112
-      - build-linux
-      - build-macos

.gitignore

@@ -10,5 +10,3 @@ src/device/stm32/*.s
 src/device/sam/*.go
 src/device/sam/*.s
 vendor
-llvm
-llvm-build

.gitmodules

@@ -13,4 +13,4 @@
 [submodule "lib/compiler-rt"]
 	path = lib/compiler-rt
 	url = https://github.com/llvm-mirror/compiler-rt.git
-	branch = release_80
+	branch = release_70

.travis.yml

@@ -0,0 +1,33 @@
+language: go
+
+go:
+  - "1.11"
+
+before_install:
+  - echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-7 main"            | sudo tee -a /etc/apt/sources.list
+  - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list
+  - sudo apt-get update -qq
+  - sudo apt-get install llvm-7-dev clang-7 libclang-7-dev binutils-arm-none-eabi qemu-system-arm --allow-unauthenticated -y
+  - sudo ln -s /usr/bin/clang-7 /usr/local/bin/cc # work around missing -no-pie in old GCC version
+
+install:
+  - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+  - dep ensure --vendor-only
+
+script:
+  - go install github.com/aykevl/tinygo
+  - go test -v .
+  - make gen-device
+  - tinygo build -o blinky1.nrf.elf    -target=pca10040     examples/blinky1
+  - tinygo build -o blinky2.nrf.elf    -target=pca10040     examples/blinky2
+  - tinygo build -o blinky2                                 examples/blinky2
+  - tinygo build -o test.nrf.elf       -target=pca10040     examples/test
+  - tinygo build -o blinky1.nrf51.elf  -target=microbit     examples/echo
+  - tinygo build -o test.nrf.elf       -target=nrf52840-mdk examples/blinky1
+  - tinygo build -o blinky1.nrf51d.elf -target=pca10031     examples/blinky1
+  - tinygo build -o blinky1.stm32.elf  -target=bluepill     examples/blinky1
+  - tinygo build -o blinky1.avr.o      -target=arduino      examples/blinky1 # TODO: avr-as/avr-gcc doesn't work
+  - tinygo build -o blinky1.reel.elf   -target=reelboard    examples/blinky1
+  - tinygo build -o blinky2.reel.elf   -target=reelboard    examples/blinky2
+  - tinygo build -o blinky1.pca10056.elf    -target=pca10056     examples/blinky1
+  - tinygo build -o blinky2.pca10056.elf    -target=pca10056     examples/blinky2

BUILDING.md

@@ -1,91 +0,0 @@
-# Building TinyGo
-
-TinyGo depends on LLVM and libclang, which are both big C++ libraries. It can
-also optionally use a built-in lld to ease cross compiling. There are two ways
-these can be linked: dynamically and statically. An install with `go install` is
-dynamic linking because it is fast and works almost out of the box on
-Debian-based systems with the right packages installed.
-
-This guide describes how to statically link TinyGo against LLVM, libclang and
-lld so that the binary can be easily moved between systems. It also shows how to
-build a release tarball that includes this binary and all necessary extra files.
-
-## Dependencies
-
-LLVM, Clang and LLD are quite light on dependencies, requiring only standard
-build tools to be built. Go is of course necessary to build TinyGo itself.
-
-  * Go (1.11+)
-  * [dep](https://golang.github.io/dep/)
-  * Standard build tools (gcc/clang)
-  * git
-  * CMake
-  * [Ninja](https://ninja-build.org/)
-
-The rest of this guide assumes you're running Linux, but it should be equivalent
-on a different system like Mac.
-
-## Download the source
-
-The first step is to download the TinyGo sources. Then, inside the directory,
-perform these steps:
-
-    dep ensure -vendor-only # download Go dependencies
-    make llvm-source        # download LLVM
-
-You can also store LLVM outside of the TinyGo root directory by setting the
-`LLVM_BUILDDIR`, `CLANG_SRC` and `LLD_SRC` make variables, but that is not
-covered by this guide.
-
-## Build LLVM, Clang, LLD
-
-Before starting the build, you may want to set the following environment
-variables to speed up the build. Most Linux distributions ship with GCC as the
-default compiler, but Clang is significantly faster and uses much less memory
-while producing binaries that are about as fast.
-
-    export CC=clang
-    export CXX=clang++
-
-The Makefile includes a default configuration that is good for most users. It
-builds a release version of LLVM (optimized, no asserts) and includes all
-targets supported by TinyGo:
-
-    make llvm-build
-
-This can take over an hour depending on the speed of your system.
-
-## Build TinyGo
-
-The last step of course is to build TinyGo itself. This can again be done with
-make:
-
-    make
-
-## Verify TinyGo
-
-Try running TinyGo:
-
-    ./build/tinygo help
-
-Also, make sure the `tinygo` binary really is statically linked. Check this
-using `ldd` (not to be confused with `lld`):
-
-    ldd ./build/tinygo
-
-The result should not contain libclang or libLLVM.
-
-## Make a release tarball
-
-Now that we have a working static build, it's time to make a release tarball:
-
-    make release
-
-The release tarball is stored in build/release.tar.gz, and can be extracted with
-the following command (for example in ~/lib):
-
-    tar -xvf path/to/release.tar.gz
-
-TinyGo will get extracted to a `tinygo` directory. You can then call it with:
-
-    ./tinygo/bin/tinygo

CHANGELOG.md

@@ -1,147 +0,0 @@
-0.6.0
----
-* **command line**
-  - some portability improvements
-  - make `$GOROOT` more robust and configurable
-  - check for Clang at the Homebrew install location as fallback
-* **compiler driver**
-  - support multiple variations of LLVM commands, for non-Debian distributions
-* **compiler**
-  - improve code quality in multiple ways
-  - make panic configurable, adding trap on panic
-  - refactor many internal parts of the compiler
-  - print all errors encountered during compilation
-  - implement calling function values of a named type
-  - implement returning values from blocking functions
-  - allow larger-than-int values to be sent across a channel
-  - implement complex arithmetic
-  - improve hashmap support
-  - add debuginfo for function arguments
-  - insert nil checks on stores (increasing code size)
-  - implement volatile operations as compiler builtins
-  - add `//go:inline` pragma
-  - add build tags for the Go stdlib version
-* **cgo**
-  - implement `char`, `enum` and `void*` types
-  - support `#include` for builtin headers
-  - improve typedef/struct/enum support
-  - only include symbols that are necessary, for broader support
-  - mark external function args as `nocapture`
-  - implement support for some `#define` constants
-  - implement support for multiple CGo files in a single package
-- **standard library**
-  - `machine`: remove microbit matrix (moved to drivers repository)
-  - `machine`: refactor pins to use `Pin` type instead of `GPIO`
-  - `runtime`: print more interface types on panic, including `error`
-* **targets**
-  - `arm`: print an error on HardFault (including stack overflows)
-  - `atsamd21`: fix a bug in the ADC peripheral
-  - `atsamd21`: add support for I2S
-  - `feather-m0`: add support for this board
-  - `nrf51`: fix a bug in I2C
-  - `stm32f103xx`: fix a bug in I2C
-  - `syscall`: implement `Exit` on unix
-  - `trinket-m0`: add support for this board
-  - `wasm`: make _main_ example smaller
-  - `wasm`: don't cache wasm file in the server, for ease of debugging
-  - `wasm`: work around bug #41508 that caused a deadlock while linking
-  - `wasm`: add support for `js.FuncOf`
-
-0.5.0
----
-- **compiler driver**
-  - use `wasm-ld` instead of `wasm-ld-8` on macOS
-  - drop dependency on `llvm-ar`
-  - fix linker script includes when running outside `TINYGOROOT`
-- **compiler**
-  - switch to LLVM 8
-  - add support for the Go 1.12 standard library (Go 1.11 is still supported)
-  - work around lack of escape analysis due to nil checks
-  - implement casting named structs and pointers to them
-  - fix int casting to use the source signedness
-  - fix some bugs around `make([]T, …)` with uncommon index types
-  - some other optimizations
-  - support interface asserts in interp for "math/rand" support
-  - resolve all func value targets at compile time (wasm-only at the moment)
-- **cgo**
-  - improve diagnostics
-  - implement C `struct`, `union`, and arrays
-  - fix CGo-related crash in libclang
-  - implement `C.struct_` types
-- **targets**
-  - all baremetal: pretend to be linux/arm instead of js/wasm
-  - `avr`: improve `uintptr` support
-  - `cortexm`: implement memmove intrinsic generated by LLVM
-  - `cortexm`: use the lld linker instead of `arm-none-eabi-ld`
-  - `darwin`: use custom syscall package that links to libSystem.dylib
-  - `microbit`: add blink example
-  - `samd21`: support I2C1
-  - `samd21`: machine/atsamd21: correct pad/pin handling when using both UART
-     and USBCDC interfaces at same time
-  - `stm32f4discovery`: add support for this board
-  - `wasm`: support async func values
-  - `wasm`: improve documentation and add extra example
-
-0.4.1
----
-- **compiler**
-  - fix `objcopy` replacement to include the .data section in the firmware image
-  - use `llvm-ar-7` on Linux to fix the Docker image
-
-0.4.0
----
-- **compiler**
-  - switch to the hardfloat ABI on ARM, which is more widely used
-  - avoid a dependency on `objcopy` (`arm-none-eabi-objcopy` etc.)
-  - fix a bug in `make([]T, n)` where `n` is 64-bits on a 32-bit platform
-  - adapt to a change in the AVR backend in LLVM 8
-  - directly support the .uf2 firmware format as used on Adafruit boards
-  - fix a bug when calling `panic()` at init time outside of the main package
-  - implement nil checks, which results in a ~5% increase in code size
-  - inline slice bounds checking, which results in a ~1% decrease in code size
-- **targets**
-  - `samd21`: fix a bug in port B pins
-  - `samd21`: implement SPI peripheral
-  - `samd21`: implement ADC peripheral
-  - `stm32`: fix a bug in timekeeping
-  - `wasm`: fix a bug in `wasm_exec.js` that caused corruption in linear memory
-     when running on Node.js.
-
-0.3.0
----
-- **compiler**
-  - remove old `-initinterp` flag
-  - add support for macOS
-- **cgo**
-  - add support for bool/float/complex types
-- **standard library**
-  - `device/arm`: add support to disable/enable hardware interrupts
-  - `machine`: add CPU frequency for nrf-based boards
-  - `syscall`: add support for darwin/amd64
-- **targets**
-  - `circuitplay_express`: add support for this board
-  - `microbit`: add regular pin constants
-  - `samd21`: fix time function for goroutine support
-  - `samd21`: add support for USB-CDC (serial over USB)
-  - `samd21`: add support for pins in port B
-  - `samd21`: add support for pullup and pulldown pins
-  - `wasm`: add support for Safari in example
-
-
-0.2.0
----
-- **command line**
-  - add version subcommand
-- **compiler**
-  - fix a bug in floating point comparisons with NaN values
-  - fix a bug when calling `panic` in package initialization code
-  - add support for comparing `complex64` and `complex128`
-- **cgo**
-  - add support for external globals
-  - add support for pointers and function pointers
-- **standard library**
-  - `fmt`: initial support, `fmt.Println` works
-  - `math`: support for most/all functions
-  - `os`: initial support (only stdin/stdout/stderr)
-  - `reflect`: initial support
-  - `syscall`: add support for amd64, arm, and arm64

CONTRIBUTING.md

@@ -1,48 +0,0 @@
-# How to contribute
-
-Thank you for your interest in improving TinyGo.
-
-We would like your help to make this project better, so we appreciate any contributions. See if one of the following descriptions matches your situation:
-
-### New to TinyGo
-
-We'd love to get your feedback on getting started with TinyGo. Run into any difficulty, confusion, or anything else? You are not alone. We want to know about your experience, so we can help the next people. Please open a Github issue with your questions, or you can also get in touch directly with us on our Slack channel at [https://gophers.slack.com/messages/CDJD3SUP6](https://gophers.slack.com/messages/CDJD3SUP6).
-
-### Something in TinyGo is not working as you expect
-
-Please open a Github issue with your problem, and we will be happy to assist.
-
-### Something in Go that you want/need does not appear to be in TinyGo
-
-We probably have not implemented it yet. Please take a look at our [Roadmap](https://github.com/tinygo-org/tinygo/wiki/Roadmap). Your pull request adding the functionality to TinyGo would be greatly appreciated.
-
-A long tail of small (and large) language features haven't been implemented yet. In almost all cases, the compiler will show a `todo:` error from `compiler/compiler.go` when you try to use it. You can try implementing it, or open a bug report with a small code sample that fails to compile.
-
-### Some specific hardware you want to use does not appear to be in TinyGo
-
-As above, we probably have not implemented it yet. Your contribution adding the hardware support to TinyGo would be greatly appreciated.
-
-Lots of targets/boards are still unsupported. Adding an architecture often requires a few compiler changes, but if the architecture is supported you can try implementing support for a new chip or board in `src/runtime`. For details, see [this wiki entry on adding archs/chips/boards](https://github.com/tinygo-org/tinygo/wiki/Adding-a-new-board).
-
-Microcontrollers have lots of peripherals (I2C, SPI, ADC, etc.) and many don't have an implementation yet in the `machine` package. Adding support for new peripherals is very useful.
-
-## How to use our Github repository
-
-The `master` branch of this repo will always have the latest released version of TinyGo. All of the active development work for the next release will take place in the `dev` branch. TinyGo will use semantic versioning and will create a tag/release for each release.
-
-Here is how to contribute back some code or documentation:
-
-- Fork repo
-- Create a feature branch off of the `dev` branch
-- Make some useful change
-- Make sure the tests still pass
-- Submit a pull request against the `dev` branch.
-- Be kind
-
-## How to run tests
-
-To run the tests:
-
-```
-make test
-```

Dockerfile

@@ -1,52 +1,46 @@
-# TinyGo base stage just installs LLVM 8 and the TinyGo compiler itself.
+# TinyGo base stage just installs LLVM 7 and the TinyGo compiler itself.
 FROM golang:latest AS tinygo-base
 
 RUN wget -O- https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && \
-    echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main" >> /etc/apt/sources.list && \
+    echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main" >> /etc/apt/sources.list && \
     apt-get update && \
-    apt-get install -y llvm-8-dev libclang-8-dev git
+    apt-get install -y llvm-7-dev libclang-7-dev
 
 RUN wget -O- https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 
-COPY . /go/src/github.com/tinygo-org/tinygo
+COPY . /go/src/github.com/aykevl/tinygo
 
-# remove submodules directories and re-init them to fix any hard-coded paths
-# after copying the tinygo directory in the previous step.
-RUN cd /go/src/github.com/tinygo-org/tinygo/ && \
-    rm -rf ./lib/* && \
-    git submodule update --init --recursive --force
-
-RUN cd /go/src/github.com/tinygo-org/tinygo/ && \
+RUN cd /go/src/github.com/aykevl/tinygo/ && \
     dep ensure --vendor-only && \
-    go install /go/src/github.com/tinygo-org/tinygo/
+    go install /go/src/github.com/aykevl/tinygo/
 
 # tinygo-wasm stage installs the needed dependencies to compile TinyGo programs for WASM.
 FROM tinygo-base AS tinygo-wasm
 
 COPY --from=tinygo-base /go/bin/tinygo /go/bin/tinygo
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/src /go/src/github.com/tinygo-org/tinygo/src
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/targets /go/src/github.com/tinygo-org/tinygo/targets
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/src /go/src/github.com/aykevl/tinygo/src
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/targets /go/src/github.com/aykevl/tinygo/targets
 
 RUN wget -O- https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && \
-    echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main" >> /etc/apt/sources.list && \
+    echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main" >> /etc/apt/sources.list && \
     apt-get update && \
-    apt-get install -y libllvm8 lld-8
+    apt-get install -y libllvm7 lld-7
 
 # tinygo-avr stage installs the needed dependencies to compile TinyGo programs for AVR microcontrollers.
 FROM tinygo-base AS tinygo-avr
 
 COPY --from=tinygo-base /go/bin/tinygo /go/bin/tinygo
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/src /go/src/github.com/tinygo-org/tinygo/src
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/targets /go/src/github.com/tinygo-org/tinygo/targets
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/Makefile /go/src/github.com/tinygo-org/tinygo/
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/tools /go/src/github.com/tinygo-org/tinygo/tools
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/lib /go/src/github.com/tinygo-org/tinygo/lib
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/src /go/src/github.com/aykevl/tinygo/src
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/targets /go/src/github.com/aykevl/tinygo/targets
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/Makefile /go/src/github.com/aykevl/tinygo/
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/tools /go/src/github.com/aykevl/tinygo/tools
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/lib /go/src/github.com/aykevl/tinygo/lib
 
-RUN cd /go/src/github.com/tinygo-org/tinygo/ && \
+RUN cd /go/src/github.com/aykevl/tinygo/ && \
     apt-get update && \
     apt-get install -y apt-utils python3 make binutils-avr gcc-avr avr-libc && \
     make gen-device-avr && \
-    apt-get remove -y python3 && \
+    apt-get remove -y python3 make && \
     apt-get autoremove -y && \
     apt-get clean
 
@@ -54,32 +48,32 @@ RUN cd /go/src/github.com/tinygo-org/tinygo/ && \
 FROM tinygo-base AS tinygo-arm
 
 COPY --from=tinygo-base /go/bin/tinygo /go/bin/tinygo
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/src /go/src/github.com/tinygo-org/tinygo/src
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/targets /go/src/github.com/tinygo-org/tinygo/targets
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/Makefile /go/src/github.com/tinygo-org/tinygo/
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/tools /go/src/github.com/tinygo-org/tinygo/tools
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/lib /go/src/github.com/tinygo-org/tinygo/lib
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/src /go/src/github.com/aykevl/tinygo/src
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/targets /go/src/github.com/aykevl/tinygo/targets
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/Makefile /go/src/github.com/aykevl/tinygo/
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/tools /go/src/github.com/aykevl/tinygo/tools
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/lib /go/src/github.com/aykevl/tinygo/lib
 
-RUN cd /go/src/github.com/tinygo-org/tinygo/ && \
+RUN cd /go/src/github.com/aykevl/tinygo/ && \
     apt-get update && \
-    apt-get install -y apt-utils python3 make clang-8 && \
+    apt-get install -y apt-utils python3 make binutils-arm-none-eabi clang-7 && \
     make gen-device-nrf && make gen-device-stm32 && \
-    apt-get remove -y python3 && \
+    apt-get remove -y python3 make && \
     apt-get autoremove -y && \
     apt-get clean
 
 # tinygo-all stage installs the needed dependencies to compile TinyGo programs for all platforms.
 FROM tinygo-wasm AS tinygo-all
 
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/Makefile /go/src/github.com/tinygo-org/tinygo/
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/tools /go/src/github.com/tinygo-org/tinygo/tools
-COPY --from=tinygo-base /go/src/github.com/tinygo-org/tinygo/lib /go/src/github.com/tinygo-org/tinygo/lib
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/Makefile /go/src/github.com/aykevl/tinygo/
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/tools /go/src/github.com/aykevl/tinygo/tools
+COPY --from=tinygo-base /go/src/github.com/aykevl/tinygo/lib /go/src/github.com/aykevl/tinygo/lib
 
-RUN cd /go/src/github.com/tinygo-org/tinygo/ && \
+RUN cd /go/src/github.com/aykevl/tinygo/ && \
     apt-get update && \
-    apt-get install -y apt-utils python3 make clang-8 binutils-avr gcc-avr avr-libc && \
+    apt-get install -y apt-utils python3 make binutils-arm-none-eabi clang-7 binutils-avr gcc-avr avr-libc && \
     make gen-device && \
-    apt-get remove -y python3 && \
+    apt-get remove -y python3 make && \
     apt-get autoremove -y && \
     apt-get clean
 

Gopkg.lock

@@ -3,49 +3,42 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:06519a2ec1d59040eaccec40206f9d0b59dc662db2a032f974d6d6b9a2bcb839"
-  name = "github.com/blakesmith/ar"
+  digest = "1:f250e2a6d7e4f9ebc5ba37e5e2ec91b46eb1399ee43f2fdaeb20cd4fd1aeee59"
+  name = "github.com/aykevl/go-llvm"
   packages = ["."]
   pruneopts = "UT"
-  revision = "8bd4349a67f2533b078dbc524689d15dba0f4659"
+  revision = "d8539684f173a591ea9474d6262ac47ef2277d64"
 
 [[projects]]
   branch = "master"
-  digest = "1:00b45e06c7843541372fc17d982242bd6adfc2fc382b6f2e9ef9ce53d87a50b9"
-  name = "github.com/marcinbor85/gohex"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "7a43cd876e46e0f6ddc553f10f91731a78e6e949"
-
-[[projects]]
-  branch = "master"
-  digest = "1:ba70784a3deee74c0ca3c87bcac3c2f93d3b2d27d8f237b768c358b45ba47da8"
+  digest = "1:d1102ae84d8c9318db4ce2ad2673eb2bf54569ab2a4a5d57e70d8aef726b681d"
   name = "golang.org/x/tools"
   packages = [
     "go/ast/astutil",
+    "go/buildutil",
+    "go/gcexportdata",
+    "go/internal/cgo",
+    "go/internal/gcimporter",
+    "go/loader",
+    "go/packages",
     "go/ssa",
+    "go/ssa/ssautil",
     "go/types/typeutil",
+    "internal/fastwalk",
+    "internal/gopathwalk",
+    "internal/semver",
   ]
   pruneopts = "UT"
-  revision = "8dcc6e70cdefe9a82236b6e195e4f4e2108fcb9f"
-
-[[projects]]
-  branch = "llvm8"
-  digest = "1:bf5539bdf6b3cc3ec1e45926db05d81180da11ce722fa1edcce3f0b4e1967da5"
-  name = "tinygo.org/x/go-llvm"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "7707ae5d1261a8929edea7336c8087ca8b520d8d"
+  revision = "3e7aa9e59977626dc60433e9aeadf1bb63d28295"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
   input-imports = [
-    "github.com/blakesmith/ar",
-    "github.com/marcinbor85/gohex",
-    "golang.org/x/tools/go/ast/astutil",
+    "github.com/aykevl/go-llvm",
+    "golang.org/x/tools/go/loader",
     "golang.org/x/tools/go/ssa",
-    "tinygo.org/x/go-llvm",
+    "golang.org/x/tools/go/ssa/ssautil",
   ]
   solver-name = "gps-cdcl"
   solver-version = 1

Gopkg.toml

@@ -1,6 +1,6 @@
 [[constraint]]
-  branch = "llvm8"
-  name = "tinygo.org/x/go-llvm"
+  branch = "master"
+  name = "github.com/aykevl/go-llvm"
 
 [[constraint]]
   branch = "master"

LICENSE

@@ -1,7 +1,4 @@
-Copyright (c) 2018-2019 TinyGo Authors. All rights reserved.
-
-TinyGo includes portions of the Go standard library.
-Copyright (c) 2009-2019 The Go Authors. All rights reserved.
+Copyright (c) 2018 Ayke van Laethem. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are

Makefile

@@ -1,42 +1,80 @@
 
 # aliases
-all: tinygo
-tinygo: build/tinygo
+all: tgo
+tgo: build/tgo
 
-.PHONY: all tinygo build/tinygo test llvm-build llvm-source clean fmt gen-device gen-device-nrf gen-device-avr
+.PHONY: all tgo run-test run-blinky run-blinky2 clean fmt gen-device gen-device-nrf gen-device-avr
 
-# Default build and source directories, as created by `make llvm-build`.
-LLVM_BUILDDIR ?= llvm-build
-CLANG_SRC ?= llvm/tools/clang
-LLD_SRC ?= llvm/tools/lld
+TARGET ?= unix
 
-LLVM_COMPONENTS = all-targets analysis asmparser asmprinter bitreader bitwriter codegen core coroutines debuginfodwarf executionengine instrumentation interpreter ipo irreader linker lto mc mcjit objcarcopts option profiledata scalaropts support target
+ifeq ($(TARGET),unix)
+# Regular *nix system.
+
+else ifeq ($(TARGET),pca10040)
+# PCA10040: nRF52832 development board
+OBJCOPY = arm-none-eabi-objcopy
+TGOFLAGS += -target $(TARGET)
+
+else ifeq ($(TARGET),microbit)
+# BBC micro:bit
+OBJCOPY = arm-none-eabi-objcopy
+TGOFLAGS += -target $(TARGET)
+
+else ifeq ($(TARGET),reelboard)
+# reel board
+OBJCOPY = arm-none-eabi-objcopy
+TGOFLAGS += -target $(TARGET)
+
+else ifeq ($(TARGET),bluepill)
+# "blue pill" development board
+# See: https://wiki.stm32duino.com/index.php?title=Blue_Pill
+OBJCOPY = arm-none-eabi-objcopy
+TGOFLAGS += -target $(TARGET)
+
+else ifeq ($(TARGET),arduino)
+OBJCOPY = avr-objcopy
+TGOFLAGS += -target $(TARGET)
+
+else
+$(error Unknown target)
 
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Linux)
-    START_GROUP = -Wl,--start-group
-    END_GROUP = -Wl,--end-group
 endif
 
-CLANG_LIBS = $(START_GROUP) $(abspath $(LLVM_BUILDDIR))/lib/libclang.a -lclangAnalysis -lclangARCMigrate -lclangAST -lclangASTMatchers -lclangBasic -lclangCodeGen -lclangCrossTU -lclangDriver -lclangDynamicASTMatchers -lclangEdit -lclangFormat -lclangFrontend -lclangFrontendTool -lclangHandleCXX -lclangHandleLLVM -lclangIndex -lclangLex -lclangParse -lclangRewrite -lclangRewriteFrontend -lclangSema -lclangSerialization -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangStaticAnalyzerFrontend -lclangTooling -lclangToolingASTDiff -lclangToolingCore -lclangToolingInclusions -lclangToolingRefactor $(END_GROUP) -lstdc++
-
-LLD_LIBS = $(START_GROUP) -llldCOFF -llldCommon -llldCore -llldDriver -llldELF -llldMachO -llldMinGW -llldReaderWriter -llldWasm -llldYAML $(END_GROUP)
 
 
-# For static linking.
-CGO_CPPFLAGS=$(shell $(LLVM_BUILDDIR)/bin/llvm-config --cppflags) -I$(abspath $(CLANG_SRC))/include -I$(abspath $(LLD_SRC))/include
-CGO_CXXFLAGS=-std=c++11
-CGO_LDFLAGS=-L$(LLVM_BUILDDIR)/lib $(CLANG_LIBS) $(LLD_LIBS) $(shell $(LLVM_BUILDDIR)/bin/llvm-config --ldflags --libs --system-libs $(LLVM_COMPONENTS))
+run-test: build/test
+	./build/test
 
+run-blinky: run-blinky2
+run-blinky2: build/blinky2
+	./build/blinky2
+
+ifeq ($(TARGET),pca10040)
+flash-%: build/%.hex
+	nrfjprog -f nrf52 --sectorerase --program $< --reset
+else ifeq ($(TARGET),microbit)
+flash-%: build/%.hex
+	openocd -f interface/cmsis-dap.cfg -f target/nrf51.cfg -c 'program $< reset exit'
+else ifeq ($(TARGET),reelboard)
+flash-%: build/%.hex
+	openocd -f interface/cmsis-dap.cfg -f target/nrf51.cfg -c 'program $< reset exit'
+else ifeq ($(TARGET),arduino)
+flash-%: build/%.hex
+	avrdude -c arduino -p atmega328p -P /dev/ttyACM0 -U flash:w:$<
+else ifeq ($(TARGET),bluepill)
+flash-%: build/%.hex
+	openocd -f interface/stlink-v2.cfg -f target/stm32f1x.cfg -c 'program $< reset exit'
+endif
 
 clean:
 	@rm -rf build
 
-FMT_PATHS = ./*.go cgo compiler interp ir loader src/device/arm src/examples src/machine src/os src/reflect src/runtime src/sync src/syscall
 fmt:
-	@gofmt -l -w $(FMT_PATHS)
-fmt-check:
-	@unformatted=$$(gofmt -l $(FMT_PATHS)); [ -z "$$unformatted" ] && exit 0; echo "Unformatted:"; for fn in $$unformatted; do echo "  $$fn"; done; exit 1
+	@go fmt . ./compiler ./interp ./loader ./ir ./src/device/arm ./src/examples/* ./src/machine ./src/runtime ./src/sync
+	@go fmt ./testdata/*.go
+
+test:
+	@go test -v .
 
 gen-device: gen-device-avr gen-device-nrf gen-device-sam gen-device-stm32
 
@@ -57,93 +95,19 @@ gen-device-stm32:
 	./tools/gen-device-svd.py lib/cmsis-svd/data/STMicro/ src/device/stm32/ --source=https://github.com/posborne/cmsis-svd/tree/master/data/STMicro
 	go fmt ./src/device/stm32
 
-
-# Get LLVM sources.
-llvm/README.txt:
-	git clone -b release_80 https://github.com/llvm-mirror/llvm.git llvm
-llvm/tools/clang/README.txt:
-	git clone -b release_80 https://github.com/llvm-mirror/clang.git llvm/tools/clang
-llvm/tools/lld/README.md:
-	git clone -b release_80 https://github.com/llvm-mirror/lld.git llvm/tools/lld
-llvm-source: llvm/README.txt llvm/tools/clang/README.txt llvm/tools/lld/README.md
-
-# Configure LLVM.
-llvm-build/build.ninja: llvm-source
-	mkdir -p llvm-build; cd llvm-build; cmake -G Ninja ../llvm "-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64;WebAssembly" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR" -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=OFF -DLIBCLANG_BUILD_STATIC=ON -DLLVM_ENABLE_TERMINFO=OFF -DLLVM_ENABLE_ZLIB=OFF
-
-# Build LLVM.
-llvm-build: llvm-build/build.ninja
-	cd llvm-build; ninja
-
-
 # Build the Go compiler.
-build/tinygo:
-	@if [ ! -f llvm-build/bin/llvm-config ]; then echo "Fetch and build LLVM first by running:\n  make llvm-source\n  make llvm-build"; exit 1; fi
-	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go build -o build/tinygo -tags byollvm .
+build/tgo: *.go compiler/*.go interp/*.go loader/*.go ir/*.go
+	@mkdir -p build
+	go build -o build/tgo -i .
 
-test:
-	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go test -v -tags byollvm .
+# Binary that can run on the host.
+build/%: src/examples/% src/examples/%/*.go build/tgo src/runtime/*.go
+	./build/tgo build $(TGOFLAGS) -size=short -o $@ $(subst src/,,$<)
 
-.PHONY: smoketest smoketest-no-avr
-smoketest: smoketest-no-avr
-	tinygo build -size short -o test.elf -target=arduino             examples/blinky1
-	tinygo build -size short -o test.elf -target=digispark           examples/blinky1
-smoketest-no-avr:
-	# test all examples
-	tinygo build -size short -o test.elf -target=pca10040            examples/blinky1
-	tinygo build -size short -o test.elf -target=pca10040            examples/adc
-	tinygo build -size short -o test.elf -target=pca10040            examples/blinkm
-	tinygo build -size short -o test.elf -target=pca10040            examples/blinky2
-	tinygo build -size short -o test.elf -target=pca10040            examples/button
-	tinygo build -size short -o test.elf -target=pca10040            examples/button2
-	tinygo build -size short -o test.elf -target=pca10040            examples/echo
-	tinygo build -size short -o test.elf -target=circuitplay-express examples/i2s
-	tinygo build -size short -o test.elf -target=pca10040            examples/mcp3008
-	tinygo build -size short -o test.elf -target=microbit            examples/microbit-blink
-	tinygo build -size short -o test.elf -target=pca10040            examples/pwm
-	tinygo build -size short -o test.elf -target=pca10040            examples/serial
-	tinygo build -size short -o test.elf -target=pca10040            examples/test
-	# test all targets/boards
-	tinygo build             -o test.elf                             examples/blinky2 # TODO: re-enable -size flag with MachO support
-	tinygo build -size short -o test.elf -target=microbit            examples/echo
-	tinygo build -size short -o test.elf -target=nrf52840-mdk        examples/blinky1
-	tinygo build -size short -o test.elf -target=pca10031            examples/blinky1
-	tinygo build -size short -o test.elf -target=bluepill            examples/blinky1
-	tinygo build -size short -o test.elf -target=reelboard           examples/blinky1
-	tinygo build -size short -o test.elf -target=reelboard           examples/blinky2
-	tinygo build -size short -o test.elf -target=pca10056            examples/blinky1
-	tinygo build -size short -o test.elf -target=pca10056            examples/blinky2
-	tinygo build -size short -o test.elf -target=itsybitsy-m0        examples/blinky1
-	tinygo build -size short -o test.elf -target=feather-m0          examples/blinky1
-	tinygo build -size short -o test.elf -target=trinket-m0          examples/blinky1
-	tinygo build -size short -o test.elf -target=circuitplay-express examples/blinky1
-	tinygo build -size short -o test.elf -target=stm32f4disco        examples/blinky1
-	tinygo build -size short -o test.elf -target=stm32f4disco        examples/blinky2
-	tinygo build -size short -o test.elf -target=circuitplay-express examples/i2s
-	tinygo build             -o wasm.wasm -target=wasm               examples/wasm/export
-	tinygo build             -o wasm.wasm -target=wasm               examples/wasm/main
+# ELF file that can run on a microcontroller.
+build/%.elf: src/examples/% src/examples/%/*.go build/tgo src/runtime/*.go
+	./build/tgo build $(TGOFLAGS) -size=short -o $@ $(subst src/,,$<)
 
-release: build/tinygo gen-device
-	@mkdir -p build/release/tinygo/bin
-	@mkdir -p build/release/tinygo/lib/clang/include
-	@mkdir -p build/release/tinygo/lib/CMSIS/CMSIS
-	@mkdir -p build/release/tinygo/lib/compiler-rt/lib
-	@mkdir -p build/release/tinygo/lib/nrfx
-	@mkdir -p build/release/tinygo/pkg/armv6m-none-eabi
-	@mkdir -p build/release/tinygo/pkg/armv7m-none-eabi
-	@mkdir -p build/release/tinygo/pkg/armv7em-none-eabi
-	@echo copying source files
-	@cp -p  build/tinygo                 build/release/tinygo/bin
-	@cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
-	@cp -rp lib/CMSIS/CMSIS/Include      build/release/tinygo/lib/CMSIS/CMSIS
-	@cp -rp lib/CMSIS/README.md          build/release/tinygo/lib/CMSIS
-	@cp -rp lib/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt/lib
-	@cp -rp lib/compiler-rt/LICENSE.TXT  build/release/tinygo/lib/compiler-rt
-	@cp -rp lib/compiler-rt/README.txt   build/release/tinygo/lib/compiler-rt
-	@cp -rp lib/nrfx/*                   build/release/tinygo/lib/nrfx
-	@cp -rp src                          build/release/tinygo/src
-	@cp -rp targets                      build/release/tinygo/targets
-	./build/tinygo build-builtins -target=armv6m-none-eabi  -o build/release/tinygo/pkg/armv6m-none-eabi/compiler-rt.a
-	./build/tinygo build-builtins -target=armv7m-none-eabi  -o build/release/tinygo/pkg/armv7m-none-eabi/compiler-rt.a
-	./build/tinygo build-builtins -target=armv7em-none-eabi -o build/release/tinygo/pkg/armv7em-none-eabi/compiler-rt.a
-	tar -czf build/release.tar.gz -C build/release tinygo
+# Convert executable to Intel hex file (for flashing).
+build/%.hex: build/%.elf
+	$(OBJCOPY) -O ihex $^ $@

README.md

@@ -1,74 +1,144 @@
-# TinyGo - Go compiler for small places
+# TinyGo - Go compiler for microcontrollers
 
-[![CircleCI](https://circleci.com/gh/tinygo-org/tinygo/tree/dev.svg?style=svg)](https://circleci.com/gh/tinygo-org/tinygo/tree/dev)
+[![Build Status](https://travis-ci.com/aykevl/tinygo.svg?branch=master)](https://travis-ci.com/aykevl/tinygo)
 
-TinyGo is a Go compiler intended for use in small places such as microcontrollers, WebAssembly (WASM), and command-line tools.
+> We never expected Go to be an embedded language and so it's got serious
+> problems [...].
 
-It reuses libraries used by the [Go language tools](https://golang.org/pkg/go/) alongside [LLVM](http://llvm.org) to provide an alternative way to compile programs written in the Go programming language.
+-- Rob Pike, [GopherCon 2014 Opening Keynote](https://www.youtube.com/watch?v=VoS7DsT1rdM&feature=youtu.be&t=2799)
 
-Here is an example program that blinks the built-in LED when run directly on any supported board with onboard LED:
+TinyGo is a project to bring Go to microcontrollers and small systems with a
+single processor core. It is similar to [emgo](https://github.com/ziutek/emgo)
+but a major difference is that I want to keep the Go memory model (which implies
+garbage collection of some sort). Another difference is that TinyGo uses LLVM
+internally instead of emitting C, which hopefully leads to smaller and more
+efficient code and certainly leads to more flexibility.
+
+My original reasoning was: if [Python](https://micropython.org/) can run on
+microcontrollers, then certainly [Go](https://golang.org/) should be able to and
+run on even lower level micros.
+
+Example program (blinky):
 
 ```go
-package main
-
 import (
-    "machine"
-    "time"
+	"machine"
+	"time"
 )
 
 func main() {
-    led := machine.LED
-    led.Configure(machine.PinConfig{Mode: machine.PinOutput})
-    for {
-        led.Low()
-        time.Sleep(time.Millisecond * 1000)
+	led := machine.GPIO{machine.LED}
+	led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
+	for {
+		led.Low()
+		time.Sleep(time.Millisecond * 1000)
 
-        led.High()
-        time.Sleep(time.Millisecond * 1000)
-    }
+		led.High()
+		time.Sleep(time.Millisecond * 1000)
+	}
 }
 ```
 
-The above program can be compiled and run without modification on an Arduino Uno, an Adafruit ItsyBitsy M0, or any of the supported boards that have a built-in LED, just by setting the correct TinyGo compiler target. For example, this compiles and flashes an Arduino Uno:
+Currently supported features:
 
-```shell
-tinygo flash -target arduino examples/blinky1
-```
+  * control flow
+  * many (but not all) basic types: most ints, floats, strings, structs
+  * function calling
+  * interfaces for basic types (with type switches and asserts)
+  * goroutines (very initial support)
+  * function pointers (non-blocking)
+  * interface methods
+  * standard library (but most packages won't work due to missing language
+    features)
+  * slices (partially)
+  * maps (very rough, unfinished)
+  * defer
+  * closures
+  * bound methods
+  * complex numbers (except for arithmetic)
+
+Not yet supported:
+
+  * complex arithmetic
+  * garbage collection
+  * recover
+  * channels
+  * introspection (if it ever gets implemented)
+  * ...
 
 ## Installation
 
-See the [getting started instructions](https://tinygo.org/getting-started/) for information on how to install TinyGo, as well as how to run the TinyGo compiler using our Docker container.
+See the [getting started instructions](https://tinygo.org/getting-started/).
 
-## Supported boards/targets
+### Running with Docker
 
-You can compile TinyGo programs for microcontrollers, WebAssembly and Linux.
+A docker container exists for easy access to the `tinygo` CLI:
 
-The following 14 microcontroller boards are currently supported:
+```sh
+$ docker run --rm -v $(pwd):/src tinygo/tinygo tinygo build -o /src/wasm.wasm -target wasm examples/wasm
+```
 
-* [Adafruit Circuit Playground Express](https://www.adafruit.com/product/3333)
-* [Adafruit Feather M0](https://www.adafruit.com/product/2772)
-* [Adafruit ItsyBitsy M0](https://www.adafruit.com/product/3727)
-* [Adafruit Trinket M0](https://www.adafruit.com/product/3500)
-* [Arduino Uno](https://store.arduino.cc/arduino-uno-rev3)
-* [BBC micro:bit](https://microbit.org/)
-* [ST Micro STM32F103XX "Bluepill"](http://wiki.stm32duino.com/index.php?title=Blue_Pill)
-* [ST Micro STM32F407 "Discovery"](https://www.st.com/en/evaluation-tools/stm32f4discovery.html)
-* [Digispark](http://digistump.com/products/1)
-* [Nordic Semiconductor PCA10031](https://www.nordicsemi.com/eng/Products/nRF51-Dongle)
-* [Nordic Semiconductor PCA10040](https://www.nordicsemi.com/eng/Products/Bluetooth-low-energy/nRF52-DK)
-* [Nordic Semiconductor PCA10056](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK)
-* [Makerdiary nRF52840-MDK](https://wiki.makerdiary.com/nrf52840-mdk/)
-* [Phytec reel board](https://www.phytec.eu/product-eu/internet-of-things/reelboard/)
+Note that you cannot run `tinygo flash` from inside the docker container,
+so it is less useful for microcontroller development.
 
-For more information, see [this list of boards](https://tinygo.org/microcontrollers/). Pull requests for additional support are welcome!
+## Supported targets
 
-## Currently supported features:
+The following architectures/systems are currently supported:
 
-For a description of currently supported Go language features, please see [https://tinygo.org/lang-support/](https://tinygo.org/lang-support/).
+  * ARM (Cortex-M)
+  * AVR (Arduino Uno)
+  * Linux
+  * WebAssembly
+
+For more information, see [this list of targets and
+boards](https://tinygo.org/targets/). Pull requests for
+broader support are welcome!
+
+## Analysis and optimizations
+
+The goal is to reduce code size (and increase performance) by performing all
+kinds of whole-program analysis passes. The official Go compiler doesn't do a
+whole lot of analysis (except for escape analysis) because it needs to be fast,
+but embedded programs are necessarily smaller so it becomes practical. And I
+think especially program size can be reduced by a large margin when actually
+trying to optimize for it.
+
+Implemented compiler passes:
+
+  * Analyse which functions are blocking. Blocking functions are functions that
+    call sleep, chan send, etc. Its parents are also blocking.
+  * Analyse whether the scheduler is needed. It is only needed when there are
+    `go` statements for blocking functions.
+  * Analyse whether a given type switch or type assert is possible with
+    [type-based alias analysis](https://en.wikipedia.org/wiki/Alias_analysis#Type-based_alias_analysis).
+    I would like to use flow-based alias analysis in the future, if feasible.
+  * Do basic dead code elimination of functions. This pass makes later passes
+    better and probably improves compile time as well.
+
+## Scope
+
+Goals:
+
+  * Have very small binary sizes. Don't pay for what you don't use.
+  * Support for most common microcontroller boards.
+  * Be usable on the web using WebAssembly.
+  * Good CGo support, with no more overhead than a regular function call.
+  * Support most standard library packages and compile most Go code without
+    modification.
+
+Non-goals:
+
+  * Using more than one core.
+  * Be efficient while using zillions of goroutines. However, good goroutine
+    support is certainly a goal.
+  * Be as fast as `gc`. However, LLVM will probably be better at optimizing
+    certain things so TinyGo might actually turn out to be faster for number
+    crunching.
+  * Be able to compile every Go program out there.
 
 ## Documentation
 
-Documentation is located on our web site at [https://tinygo.org/](https://tinygo.org/).
+Documentation is currently maintained on a dedicated web site located at [https://tinygo.org/](https://tinygo.org/).
 
 You can find the web site code at [https://github.com/tinygo-org/tinygo-site](https://github.com/tinygo-org/tinygo-site).
 
@@ -83,37 +153,26 @@ should arrive fairly quickly (under 1 min): https://invite.slack.golangbridge.or
 
 ## Contributing
 
-Your contributions are welcome!
+Patches are welcome!
 
-Please take a look at our [CONTRIBUTING.md](./CONTRIBUTING.md) document for details.
+If you want to contribute, here are some suggestions:
 
-## Project Scope
-
-Goals:
-
-* Have very small binary sizes. Don't pay for what you don't use.
-* Support for most common microcontroller boards.
-* Be usable on the web using WebAssembly.
-* Good CGo support, with no more overhead than a regular function call.
-* Support most standard library packages and compile most Go code without modification.
-
-Non-goals:
-
-* Using more than one core.
-* Be efficient while using zillions of goroutines. However, good goroutine support is certainly a goal.
-* Be as fast as `gc`. However, LLVM will probably be better at optimizing certain things so TinyGo might actually turn out to be faster for number crunching.
-* Be able to compile every Go program out there.
-
-## Why this project exists
-
-> We never expected Go to be an embedded language and so its got serious problems...
-
--- Rob Pike, [GopherCon 2014 Opening Keynote](https://www.youtube.com/watch?v=VoS7DsT1rdM&feature=youtu.be&t=2799)
-
-TinyGo is a project to bring Go to microcontrollers and small systems with a single processor core. It is similar to [emgo](https://github.com/ziutek/emgo) but a major difference is that we want to keep the Go memory model (which implies garbage collection of some sort). Another difference is that TinyGo uses LLVM internally instead of emitting C, which hopefully leads to smaller and more efficient code and certainly leads to more flexibility.
-
-The original reasoning was: if [Python](https://micropython.org/) can run on microcontrollers, then certainly [Go](https://golang.org/) should be able to run on even lower level micros.
+  * A long tail of small (and large) language features haven't been implemented
+    yet. In almost all cases, the compiler will show a `todo:` error from
+    `compiler/compiler.go` when you try to use it. You can try implementing it,
+    or open a bug report with a small code sample that fails to compile.
+  * Lots of targets/boards are still unsupported. Adding an architecture often
+    requires a few compiler changes, but if the architecture is supported you
+    can try implementing support for a new chip or board in `src/runtime`. For
+    details, see [this wiki entry on adding
+    archs/chips/boards](https://github.com/aykevl/tinygo/wiki/Adding-a-new-board).
+  * Microcontrollers have lots of peripherals and many don't have an
+    implementation yet in the `machine` package. Adding support for new
+    peripherals is very useful.
+  * Just raising bugs for things you'd like to see implemented is also a form of
+    contributing! It helps prioritization.
 
 ## License
 
-This project is licensed under the BSD 3-clause license, just like the [Go project](https://golang.org/LICENSE) itself.
+This project is licensed under the BSD 3-clause license, just like the
+[Go project](https://golang.org/LICENSE) itself.

buildcache.go

@@ -9,11 +9,9 @@ import (
 
 // Get the cache directory, usually ~/.cache/tinygo
 func cacheDir() string {
-	dir, err := os.UserCacheDir()
-	if err != nil {
-		panic("could not find cache dir: " + err.Error())
-	}
-	return filepath.Join(dir, "tinygo")
+	home := getHomeDir()
+	dir := filepath.Join(home, ".cache", "tinygo")
+	return dir
 }
 
 // Return the newest timestamp of all the file paths passed in. Used to check
@@ -82,45 +80,29 @@ func cacheStore(tmppath, name, configKey string, sourceFiles []string) (string,
 		return "", err
 	}
 	cachepath := filepath.Join(dir, name)
-	err = moveFile(tmppath, cachepath)
+	err = os.Rename(tmppath, cachepath)
 	if err != nil {
-		return "", err
+		inf, err := os.Open(tmppath)
+		if err != nil {
+			return "", err
+		}
+		defer inf.Close()
+		outf, err := os.Create(cachepath + ".tmp")
+		if err != nil {
+			return "", err
+		}
+
+		_, err = io.Copy(outf, inf)
+		if err != nil {
+			return "", err
+		}
+
+		err = os.Rename(cachepath+".tmp", cachepath)
+		if err != nil {
+			return "", err
+		}
+
+		return cachepath, outf.Close()
 	}
 	return cachepath, nil
 }
-
-// moveFile renames the file from src to dst. If renaming doesn't work (for
-// example, the rename crosses a filesystem boundary), the file is copied and
-// the old file is removed.
-func moveFile(src, dst string) error {
-	err := os.Rename(src, dst)
-	if err == nil {
-		// Success!
-		return nil
-	}
-	// Failed to move, probably a different filesystem.
-	// Do a copy + remove.
-	inf, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer inf.Close()
-	outpath := dst + ".tmp"
-	outf, err := os.Create(outpath)
-	if err != nil {
-		return err
-	}
-
-	_, err = io.Copy(outf, inf)
-	if err != nil {
-		os.Remove(outpath)
-		return err
-	}
-
-	err = os.Rename(dst+".tmp", dst)
-	if err != nil {
-		return err
-	}
-
-	return outf.Close()
-}

builtins.go

@@ -1,15 +1,11 @@
 package main
 
 import (
-	"errors"
-	"io"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
-	"time"
-
-	"github.com/blakesmith/ar"
 )
 
 // These are the GENERIC_SOURCES according to CMakeList.txt.
@@ -161,29 +157,16 @@ var aeabiBuiltins = []string{
 
 func builtinFiles(target string) []string {
 	builtins := append([]string{}, genericBuiltins...) // copy genericBuiltins
-	if strings.HasPrefix(target, "arm") {
+	if target[:3] == "arm" {
 		builtins = append(builtins, aeabiBuiltins...)
 	}
 	return builtins
 }
 
-// builtinsDir returns the directory where the sources for compiler-rt are kept.
-func builtinsDir() string {
-	return filepath.Join(sourceDir(), "lib", "compiler-rt", "lib", "builtins")
-}
-
 // Get the builtins archive, possibly generating it as needed.
 func loadBuiltins(target string) (path string, err error) {
-	// Try to load a precompiled compiler-rt library.
-	precompiledPath := filepath.Join(sourceDir(), "pkg", target, "compiler-rt.a")
-	if _, err := os.Stat(precompiledPath); err == nil {
-		// Found a precompiled compiler-rt for this OS/architecture. Return the
-		// path directly.
-		return precompiledPath, nil
-	}
-
 	outfile := "librt-" + target + ".a"
-	builtinsDir := builtinsDir()
+	builtinsDir := filepath.Join(sourceDir(), "lib", "compiler-rt", "lib", "builtins")
 
 	builtins := builtinFiles(target)
 	srcs := make([]string, len(builtins))
@@ -191,37 +174,13 @@ func loadBuiltins(target string) (path string, err error) {
 		srcs[i] = filepath.Join(builtinsDir, name)
 	}
 
-	if path, err := cacheLoad(outfile, commands["clang"][0], srcs); path != "" || err != nil {
+	if path, err := cacheLoad(outfile, commands["clang"], srcs); path != "" || err != nil {
 		return path, err
 	}
 
-	var cachepath string
-	err = compileBuiltins(target, func(path string) error {
-		path, err := cacheStore(path, outfile, commands["clang"][0], srcs)
-		cachepath = path
-		return err
-	})
-	return cachepath, err
-}
-
-// compileBuiltins compiles builtins from compiler-rt into a static library.
-// When it succeeds, it will call the callback with the resulting path. The path
-// will be removed after callback returns. If callback returns an error, this is
-// passed through to the return value of this function.
-func compileBuiltins(target string, callback func(path string) error) error {
-	builtinsDir := builtinsDir()
-
-	builtins := builtinFiles(target)
-	srcs := make([]string, len(builtins))
-	for i, name := range builtins {
-		srcs[i] = filepath.Join(builtinsDir, name)
-	}
-
-	dirPrefix := "tinygo-builtins"
-	remapDir := filepath.Join(os.TempDir(), dirPrefix)
-	dir, err := ioutil.TempDir(os.TempDir(), dirPrefix)
+	dir, err := ioutil.TempDir("", "tinygo-builtins")
 	if err != nil {
-		return err
+		return "", err
 	}
 	defer os.RemoveAll(dir)
 
@@ -236,59 +195,26 @@ func compileBuiltins(target string, callback func(path string) error) error {
 		objpath := filepath.Join(dir, objname+".o")
 		objs = append(objs, objpath)
 		srcpath := filepath.Join(builtinsDir, name)
-		// Note: -fdebug-prefix-map is necessary to make the output archive
-		// reproducible. Otherwise the temporary directory is stored in the
-		// archive itself, which varies each run.
-		err := execCommand(commands["clang"], "-c", "-Oz", "-g", "-Werror", "-Wall", "-std=c11", "-fshort-enums", "-nostdlibinc", "-ffunction-sections", "-fdata-sections", "--target="+target, "-fdebug-prefix-map="+dir+"="+remapDir, "-o", objpath, srcpath)
+		cmd := exec.Command(commands["clang"], "-c", "-Oz", "-g", "-Werror", "-Wall", "-std=c11", "-fshort-enums", "-nostdlibinc", "-ffunction-sections", "-fdata-sections", "--target="+target, "-o", objpath, srcpath)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		cmd.Dir = dir
+		err = cmd.Run()
 		if err != nil {
-			return &commandError{"failed to build", srcpath, err}
+			return "", err
 		}
 	}
 
 	// Put all builtins in an archive to link as a static library.
-	// Note: this does not create a symbol index, but ld.lld doesn't seem to
-	// care.
 	arpath := filepath.Join(dir, "librt.a")
-	arfile, err := os.Create(arpath)
+	cmd := exec.Command(commands["ar"], append([]string{"cr", arpath}, objs...)...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Dir = dir
+	err = cmd.Run()
 	if err != nil {
-		return err
-	}
-	defer arfile.Close()
-	arwriter := ar.NewWriter(arfile)
-	err = arwriter.WriteGlobalHeader()
-	if err != nil {
-		return &os.PathError{"write ar header", arpath, err}
-	}
-	for _, objpath := range objs {
-		name := filepath.Base(objpath)
-		objfile, err := os.Open(objpath)
-		if err != nil {
-			return err
-		}
-		defer objfile.Close()
-		st, err := objfile.Stat()
-		if err != nil {
-			return err
-		}
-		arwriter.WriteHeader(&ar.Header{
-			Name:    name,
-			ModTime: time.Unix(0, 0),
-			Uid:     0,
-			Gid:     0,
-			Mode:    0644,
-			Size:    st.Size(),
-		})
-		n, err := io.Copy(arwriter, objfile)
-		if err != nil {
-			return err
-		}
-		if n != st.Size() {
-			return errors.New("file modified during ar creation: " + arpath)
-		}
+		return "", err
 	}
 
-	// Give the caller the resulting file. The callback must copy the file,
-	// because after it returns the temporary directory will be removed.
-	arfile.Close()
-	return callback(arpath)
+	return cacheStore(arpath, outfile, commands["clang"], srcs)
 }

cgo/cgo.go

@@ -1,695 +0,0 @@
-// Package cgo implements CGo by modifying a loaded AST. It does this by parsing
-// the `import "C"` statements found in the source code with libclang and
-// generating stub function and global declarations.
-//
-// There are a few advantages to modifying the AST directly instead of doing CGo
-// as a preprocessing step, with the main advantage being that debug information
-// is kept intact as much as possible.
-package cgo
-
-// This file extracts the `import "C"` statement from the source and modifies
-// the AST for CGo. It does not use libclang directly: see libclang.go for the C
-// source file parsing.
-
-import (
-	"go/ast"
-	"go/token"
-	"sort"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/ast/astutil"
-)
-
-// cgoPackage holds all CGo-related information of a package.
-type cgoPackage struct {
-	generated       *ast.File
-	generatedPos    token.Pos
-	errors          []error
-	dir             string
-	fset            *token.FileSet
-	tokenFiles      map[string]*token.File
-	missingSymbols  map[string]struct{}
-	constants       map[string]constantInfo
-	functions       map[string]*functionInfo
-	globals         map[string]globalInfo
-	typedefs        map[string]*typedefInfo
-	elaboratedTypes map[string]*elaboratedTypeInfo
-	enums           map[string]enumInfo
-}
-
-// constantInfo stores some information about a CGo constant found by libclang
-// and declared in the Go AST.
-type constantInfo struct {
-	expr *ast.BasicLit
-	pos  token.Pos
-}
-
-// functionInfo stores some information about a CGo function found by libclang
-// and declared in the AST.
-type functionInfo struct {
-	args    []paramInfo
-	results *ast.FieldList
-	pos     token.Pos
-}
-
-// paramInfo is a parameter of a CGo function (see functionInfo).
-type paramInfo struct {
-	name     string
-	typeExpr ast.Expr
-}
-
-// typedefInfo contains information about a single typedef in C.
-type typedefInfo struct {
-	typeExpr ast.Expr
-	pos      token.Pos
-}
-
-// elaboratedTypeInfo contains some information about an elaborated type
-// (struct, union) found in the C AST.
-type elaboratedTypeInfo struct {
-	typeExpr ast.Expr
-	pos      token.Pos
-}
-
-// enumInfo contains information about an enum in the C.
-type enumInfo struct {
-	typeExpr ast.Expr
-	pos      token.Pos
-}
-
-// globalInfo contains information about a declared global variable in C.
-type globalInfo struct {
-	typeExpr ast.Expr
-	pos      token.Pos
-}
-
-// cgoAliases list type aliases between Go and C, for types that are equivalent
-// in both languages. See addTypeAliases.
-var cgoAliases = map[string]string{
-	"C.int8_t":    "int8",
-	"C.int16_t":   "int16",
-	"C.int32_t":   "int32",
-	"C.int64_t":   "int64",
-	"C.uint8_t":   "uint8",
-	"C.uint16_t":  "uint16",
-	"C.uint32_t":  "uint32",
-	"C.uint64_t":  "uint64",
-	"C.uintptr_t": "uintptr",
-}
-
-// builtinAliases are handled specially because they only exist on the Go side
-// of CGo, not on the CGo side (they're prefixed with "_Cgo_" there).
-var builtinAliases = map[string]struct{}{
-	"char":      struct{}{},
-	"schar":     struct{}{},
-	"uchar":     struct{}{},
-	"short":     struct{}{},
-	"ushort":    struct{}{},
-	"int":       struct{}{},
-	"uint":      struct{}{},
-	"long":      struct{}{},
-	"ulong":     struct{}{},
-	"longlong":  struct{}{},
-	"ulonglong": struct{}{},
-}
-
-// cgoTypes lists some C types with ambiguous sizes that must be retrieved
-// somehow from C. This is done by adding some typedefs to get the size of each
-// type.
-const cgoTypes = `
-typedef char                _Cgo_char;
-typedef signed char         _Cgo_schar;
-typedef unsigned char       _Cgo_uchar;
-typedef short               _Cgo_short;
-typedef unsigned short      _Cgo_ushort;
-typedef int                 _Cgo_int;
-typedef unsigned int        _Cgo_uint;
-typedef long                _Cgo_long;
-typedef unsigned long       _Cgo_ulong;
-typedef long long           _Cgo_longlong;
-typedef unsigned long long  _Cgo_ulonglong;
-`
-
-// Process extracts `import "C"` statements from the AST, parses the comment
-// with libclang, and modifies the AST to use this information. It returns a
-// newly created *ast.File that should be added to the list of to-be-parsed
-// files. If there is one or more error, it returns these in the []error slice
-// but still modifies the AST.
-func Process(files []*ast.File, dir string, fset *token.FileSet, cflags []string) (*ast.File, []error) {
-	p := &cgoPackage{
-		dir:             dir,
-		fset:            fset,
-		tokenFiles:      map[string]*token.File{},
-		missingSymbols:  map[string]struct{}{},
-		constants:       map[string]constantInfo{},
-		functions:       map[string]*functionInfo{},
-		globals:         map[string]globalInfo{},
-		typedefs:        map[string]*typedefInfo{},
-		elaboratedTypes: map[string]*elaboratedTypeInfo{},
-		enums:           map[string]enumInfo{},
-	}
-
-	// Add a new location for the following file.
-	generatedTokenPos := p.fset.AddFile(dir+"/!cgo.go", -1, 0)
-	generatedTokenPos.SetLines([]int{0})
-	p.generatedPos = generatedTokenPos.Pos(0)
-
-	// Construct a new in-memory AST for CGo declarations of this package.
-	unsafeImport := &ast.ImportSpec{
-		Path: &ast.BasicLit{
-			ValuePos: p.generatedPos,
-			Kind:     token.STRING,
-			Value:    "\"unsafe\"",
-		},
-		EndPos: p.generatedPos,
-	}
-	p.generated = &ast.File{
-		Package: p.generatedPos,
-		Name: &ast.Ident{
-			NamePos: p.generatedPos,
-			Name:    files[0].Name.Name,
-		},
-		Decls: []ast.Decl{
-			&ast.GenDecl{
-				TokPos: p.generatedPos,
-				Tok:    token.IMPORT,
-				Specs: []ast.Spec{
-					unsafeImport,
-				},
-			},
-		},
-		Imports: []*ast.ImportSpec{unsafeImport},
-	}
-
-	// Find all C.* symbols.
-	for _, f := range files {
-		astutil.Apply(f, p.findMissingCGoNames, nil)
-	}
-	for name := range builtinAliases {
-		p.missingSymbols["_Cgo_"+name] = struct{}{}
-	}
-
-	// Find `import "C"` statements in the file.
-	for _, f := range files {
-		for i := 0; i < len(f.Decls); i++ {
-			decl := f.Decls[i]
-			genDecl, ok := decl.(*ast.GenDecl)
-			if !ok {
-				continue
-			}
-			if len(genDecl.Specs) != 1 {
-				continue
-			}
-			spec, ok := genDecl.Specs[0].(*ast.ImportSpec)
-			if !ok {
-				continue
-			}
-			path, err := strconv.Unquote(spec.Path.Value)
-			if err != nil {
-				panic("could not parse import path: " + err.Error())
-			}
-			if path != "C" {
-				continue
-			}
-			cgoComment := genDecl.Doc.Text()
-
-			pos := genDecl.Pos()
-			if genDecl.Doc != nil {
-				pos = genDecl.Doc.Pos()
-			}
-			position := fset.PositionFor(pos, true)
-			p.parseFragment(cgoComment+cgoTypes, cflags, position.Filename, position.Line)
-
-			// Remove this import declaration.
-			f.Decls = append(f.Decls[:i], f.Decls[i+1:]...)
-			i--
-		}
-
-		// Print the AST, for debugging.
-		//ast.Print(fset, f)
-	}
-
-	// Declare functions found by libclang.
-	p.addFuncDecls()
-
-	// Declare stub function pointer values found by libclang.
-	p.addFuncPtrDecls()
-
-	// Declare globals found by libclang.
-	p.addConstDecls()
-
-	// Declare globals found by libclang.
-	p.addVarDecls()
-
-	// Forward C types to Go types (like C.uint32_t -> uint32).
-	p.addTypeAliases()
-
-	// Add type declarations for C types, declared using typedef in C.
-	p.addTypedefs()
-
-	// Add elaborated types for C structs and unions.
-	p.addElaboratedTypes()
-
-	// Add enum types and enum constants for C enums.
-	p.addEnumTypes()
-
-	// Patch the AST to use the declared types and functions.
-	for _, f := range files {
-		astutil.Apply(f, p.walker, nil)
-	}
-
-	// Print the newly generated in-memory AST, for debugging.
-	//ast.Print(fset, p.generated)
-
-	return p.generated, p.errors
-}
-
-// addFuncDecls adds the C function declarations found by libclang in the
-// comment above the `import "C"` statement.
-func (p *cgoPackage) addFuncDecls() {
-	names := make([]string, 0, len(p.functions))
-	for name := range p.functions {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		fn := p.functions[name]
-		obj := &ast.Object{
-			Kind: ast.Fun,
-			Name: "C." + name,
-		}
-		args := make([]*ast.Field, len(fn.args))
-		decl := &ast.FuncDecl{
-			Name: &ast.Ident{
-				NamePos: fn.pos,
-				Name:    "C." + name,
-				Obj:     obj,
-			},
-			Type: &ast.FuncType{
-				Func: fn.pos,
-				Params: &ast.FieldList{
-					Opening: fn.pos,
-					List:    args,
-					Closing: fn.pos,
-				},
-				Results: fn.results,
-			},
-		}
-		obj.Decl = decl
-		for i, arg := range fn.args {
-			args[i] = &ast.Field{
-				Names: []*ast.Ident{
-					&ast.Ident{
-						NamePos: fn.pos,
-						Name:    arg.name,
-						Obj: &ast.Object{
-							Kind: ast.Var,
-							Name: arg.name,
-							Decl: decl,
-						},
-					},
-				},
-				Type: arg.typeExpr,
-			}
-		}
-		p.generated.Decls = append(p.generated.Decls, decl)
-	}
-}
-
-// addFuncPtrDecls creates stub declarations of function pointer values. These
-// values will later be replaced with the real values in the compiler.
-// It adds code like the following to the AST:
-//
-//     var (
-//         C.add unsafe.Pointer
-//         C.mul unsafe.Pointer
-//         // ...
-//     )
-func (p *cgoPackage) addFuncPtrDecls() {
-	if len(p.functions) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.VAR,
-		Lparen: token.NoPos,
-		Rparen: token.NoPos,
-	}
-	names := make([]string, 0, len(p.functions))
-	for name := range p.functions {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		fn := p.functions[name]
-		obj := &ast.Object{
-			Kind: ast.Typ,
-			Name: "C." + name + "$funcaddr",
-		}
-		valueSpec := &ast.ValueSpec{
-			Names: []*ast.Ident{&ast.Ident{
-				NamePos: fn.pos,
-				Name:    "C." + name + "$funcaddr",
-				Obj:     obj,
-			}},
-			Type: &ast.SelectorExpr{
-				X: &ast.Ident{
-					NamePos: fn.pos,
-					Name:    "unsafe",
-				},
-				Sel: &ast.Ident{
-					NamePos: fn.pos,
-					Name:    "Pointer",
-				},
-			},
-		}
-		obj.Decl = valueSpec
-		gen.Specs = append(gen.Specs, valueSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// addConstDecls declares external C constants in the Go source.
-// It adds code like the following to the AST:
-//
-//     const (
-//         C.CONST_INT = 5
-//         C.CONST_FLOAT = 5.8
-//         // ...
-//     )
-func (p *cgoPackage) addConstDecls() {
-	if len(p.constants) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.CONST,
-		Lparen: token.NoPos,
-		Rparen: token.NoPos,
-	}
-	names := make([]string, 0, len(p.constants))
-	for name := range p.constants {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		constVal := p.constants[name]
-		obj := &ast.Object{
-			Kind: ast.Con,
-			Name: "C." + name,
-		}
-		valueSpec := &ast.ValueSpec{
-			Names: []*ast.Ident{&ast.Ident{
-				NamePos: constVal.pos,
-				Name:    "C." + name,
-				Obj:     obj,
-			}},
-			Values: []ast.Expr{constVal.expr},
-		}
-		obj.Decl = valueSpec
-		gen.Specs = append(gen.Specs, valueSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// addVarDecls declares external C globals in the Go source.
-// It adds code like the following to the AST:
-//
-//     var (
-//         C.globalInt  int
-//         C.globalBool bool
-//         // ...
-//     )
-func (p *cgoPackage) addVarDecls() {
-	if len(p.globals) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.VAR,
-		Lparen: token.NoPos,
-		Rparen: token.NoPos,
-	}
-	names := make([]string, 0, len(p.globals))
-	for name := range p.globals {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		global := p.globals[name]
-		obj := &ast.Object{
-			Kind: ast.Var,
-			Name: "C." + name,
-		}
-		valueSpec := &ast.ValueSpec{
-			Names: []*ast.Ident{&ast.Ident{
-				NamePos: global.pos,
-				Name:    "C." + name,
-				Obj:     obj,
-			}},
-			Type: global.typeExpr,
-		}
-		obj.Decl = valueSpec
-		gen.Specs = append(gen.Specs, valueSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// addTypeAliases aliases some built-in Go types with their equivalent C types.
-// It adds code like the following to the AST:
-//
-//     type (
-//         C.int8_t  = int8
-//         C.int16_t = int16
-//         // ...
-//     )
-func (p *cgoPackage) addTypeAliases() {
-	aliasKeys := make([]string, 0, len(cgoAliases))
-	for key := range cgoAliases {
-		aliasKeys = append(aliasKeys, key)
-	}
-	sort.Strings(aliasKeys)
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.TYPE,
-		Lparen: token.NoPos,
-		Rparen: token.NoPos,
-	}
-	for _, typeName := range aliasKeys {
-		goTypeName := cgoAliases[typeName]
-		obj := &ast.Object{
-			Kind: ast.Typ,
-			Name: typeName,
-		}
-		typeSpec := &ast.TypeSpec{
-			Name: &ast.Ident{
-				NamePos: token.NoPos,
-				Name:    typeName,
-				Obj:     obj,
-			},
-			Assign: p.generatedPos,
-			Type: &ast.Ident{
-				NamePos: token.NoPos,
-				Name:    goTypeName,
-			},
-		}
-		obj.Decl = typeSpec
-		gen.Specs = append(gen.Specs, typeSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-func (p *cgoPackage) addTypedefs() {
-	if len(p.typedefs) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.TYPE,
-	}
-	names := make([]string, 0, len(p.typedefs))
-	for name := range p.typedefs {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		typedef := p.typedefs[name]
-		typeName := "C." + name
-		isAlias := true
-		if strings.HasPrefix(name, "_Cgo_") {
-			typeName = "C." + name[len("_Cgo_"):]
-			isAlias = false // C.short etc. should not be aliased to the equivalent Go type (not portable)
-		}
-		if _, ok := cgoAliases[typeName]; ok {
-			// This is a type that also exists in Go (defined in stdint.h).
-			continue
-		}
-		obj := &ast.Object{
-			Kind: ast.Typ,
-			Name: typeName,
-		}
-		typeSpec := &ast.TypeSpec{
-			Name: &ast.Ident{
-				NamePos: typedef.pos,
-				Name:    typeName,
-				Obj:     obj,
-			},
-			Type: typedef.typeExpr,
-		}
-		if isAlias {
-			typeSpec.Assign = typedef.pos
-		}
-		obj.Decl = typeSpec
-		gen.Specs = append(gen.Specs, typeSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// addElaboratedTypes adds C elaborated types as aliases. These are the "struct
-// foo" or "union foo" types, often used in a typedef.
-//
-// See also:
-// https://en.cppreference.com/w/cpp/language/elaborated_type_specifier
-func (p *cgoPackage) addElaboratedTypes() {
-	if len(p.elaboratedTypes) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.TYPE,
-	}
-	names := make([]string, 0, len(p.elaboratedTypes))
-	for name := range p.elaboratedTypes {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		typ := p.elaboratedTypes[name]
-		typeName := "C." + name
-		obj := &ast.Object{
-			Kind: ast.Typ,
-			Name: typeName,
-		}
-		typeSpec := &ast.TypeSpec{
-			Name: &ast.Ident{
-				NamePos: typ.pos,
-				Name:    typeName,
-				Obj:     obj,
-			},
-			Type: typ.typeExpr,
-		}
-		obj.Decl = typeSpec
-		gen.Specs = append(gen.Specs, typeSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// addEnumTypes adds C enums to the AST. For example, the following C code:
-//
-//     enum option {
-//         optionA,
-//         optionB = 5,
-//     };
-//
-// is translated to the following Go code equivalent:
-//
-//     type C.enum_option int32
-//
-// The constants are treated just like macros so are inserted into the AST by
-// addConstDecls.
-// See also: https://en.cppreference.com/w/c/language/enum
-func (p *cgoPackage) addEnumTypes() {
-	if len(p.enums) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.TYPE,
-	}
-	names := make([]string, 0, len(p.enums))
-	for name := range p.enums {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		typ := p.enums[name]
-		typeName := "C.enum_" + name
-		obj := &ast.Object{
-			Kind: ast.Typ,
-			Name: typeName,
-		}
-		typeSpec := &ast.TypeSpec{
-			Name: &ast.Ident{
-				NamePos: typ.pos,
-				Name:    typeName,
-				Obj:     obj,
-			},
-			Type: typ.typeExpr,
-		}
-		obj.Decl = typeSpec
-		gen.Specs = append(gen.Specs, typeSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// findMissingCGoNames traverses the AST and finds all C.something names. Only
-// these symbols are extracted from the parsed C AST and converted to the Go
-// equivalent.
-func (p *cgoPackage) findMissingCGoNames(cursor *astutil.Cursor) bool {
-	switch node := cursor.Node().(type) {
-	case *ast.SelectorExpr:
-		x, ok := node.X.(*ast.Ident)
-		if !ok {
-			return true
-		}
-		if x.Name == "C" {
-			name := node.Sel.Name
-			if _, ok := builtinAliases[name]; ok {
-				name = "_Cgo_" + name
-			}
-			p.missingSymbols[name] = struct{}{}
-		}
-	}
-	return true
-}
-
-// walker replaces all "C".<something> expressions to literal "C.<something>"
-// expressions. Such expressions are impossible to write in Go (a dot cannot be
-// used in the middle of a name) so in practice all C identifiers live in a
-// separate namespace (no _Cgo_ hacks like in gc).
-func (p *cgoPackage) walker(cursor *astutil.Cursor) bool {
-	switch node := cursor.Node().(type) {
-	case *ast.CallExpr:
-		fun, ok := node.Fun.(*ast.SelectorExpr)
-		if !ok {
-			return true
-		}
-		x, ok := fun.X.(*ast.Ident)
-		if !ok {
-			return true
-		}
-		if _, ok := p.functions[fun.Sel.Name]; ok && x.Name == "C" {
-			node.Fun = &ast.Ident{
-				NamePos: x.NamePos,
-				Name:    "C." + fun.Sel.Name,
-			}
-		}
-	case *ast.SelectorExpr:
-		x, ok := node.X.(*ast.Ident)
-		if !ok {
-			return true
-		}
-		if x.Name == "C" {
-			name := "C." + node.Sel.Name
-			if _, ok := p.functions[node.Sel.Name]; ok {
-				name += "$funcaddr"
-			}
-			cursor.Replace(&ast.Ident{
-				NamePos: x.NamePos,
-				Name:    name,
-			})
-		}
-	}
-	return true
-}

cgo/libclang.go

@@ -1,674 +0,0 @@
-package cgo
-
-// This file parses a fragment of C with libclang and stores the result for AST
-// modification. It does not touch the AST itself.
-
-import (
-	"fmt"
-	"go/ast"
-	"go/scanner"
-	"go/token"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"unsafe"
-)
-
-/*
-#include <clang-c/Index.h> // if this fails, install libclang-8-dev
-#include <stdlib.h>
-#include <stdint.h>
-
-// This struct should be ABI-compatible on all platforms (uintptr_t has the same
-// alignment etc. as void*) but does not include void* pointers that are not
-// always real pointers.
-// The Go garbage collector assumes that all non-nil pointer-typed integers are
-// actually pointers. This is not always true, as data[1] often contains 0x1,
-// which is clearly not a valid pointer. Usually the GC won't catch this issue,
-// but occasionally it will leading to a crash with a vague error message.
-typedef struct {
-	enum CXCursorKind kind;
-	int xdata;
-	uintptr_t data[3];
-} GoCXCursor;
-
-// Forwarding functions. They are implemented in libclang_stubs.c and forward to
-// the real functions without doing anything else, thus they are entirely
-// compatible with the versions without tinygo_ prefix. The only difference is
-// the CXCursor type, which has been replaced with GoCXCursor.
-GoCXCursor tinygo_clang_getTranslationUnitCursor(CXTranslationUnit tu);
-unsigned tinygo_clang_visitChildren(GoCXCursor parent, CXCursorVisitor visitor, CXClientData client_data);
-CXString tinygo_clang_getCursorSpelling(GoCXCursor c);
-enum CXCursorKind tinygo_clang_getCursorKind(GoCXCursor c);
-CXType tinygo_clang_getCursorType(GoCXCursor c);
-GoCXCursor tinygo_clang_getTypeDeclaration(CXType t);
-CXType tinygo_clang_getTypedefDeclUnderlyingType(GoCXCursor c);
-CXType tinygo_clang_getCursorResultType(GoCXCursor c);
-int tinygo_clang_Cursor_getNumArguments(GoCXCursor c);
-GoCXCursor tinygo_clang_Cursor_getArgument(GoCXCursor c, unsigned i);
-CXSourceLocation tinygo_clang_getCursorLocation(GoCXCursor c);
-CXSourceRange tinygo_clang_getCursorExtent(GoCXCursor c);
-CXTranslationUnit tinygo_clang_Cursor_getTranslationUnit(GoCXCursor c);
-long long tinygo_clang_getEnumConstantDeclValue(GoCXCursor c);
-CXType tinygo_clang_getEnumDeclIntegerType(GoCXCursor c);
-
-int tinygo_clang_globals_visitor(GoCXCursor c, GoCXCursor parent, CXClientData client_data);
-int tinygo_clang_struct_visitor(GoCXCursor c, GoCXCursor parent, CXClientData client_data);
-int tinygo_clang_enum_visitor(GoCXCursor c, GoCXCursor parent, CXClientData client_data);
-*/
-import "C"
-
-// storedRefs stores references to types, used for clang_visitChildren.
-var storedRefs refMap
-
-var diagnosticSeverity = [...]string{
-	C.CXDiagnostic_Ignored: "ignored",
-	C.CXDiagnostic_Note:    "note",
-	C.CXDiagnostic_Warning: "warning",
-	C.CXDiagnostic_Error:   "error",
-	C.CXDiagnostic_Fatal:   "fatal",
-}
-
-func (p *cgoPackage) parseFragment(fragment string, cflags []string, posFilename string, posLine int) {
-	index := C.clang_createIndex(0, 0)
-	defer C.clang_disposeIndex(index)
-
-	// pretend to be a .c file
-	filenameC := C.CString(posFilename + "!cgo.c")
-	defer C.free(unsafe.Pointer(filenameC))
-
-	// fix up error locations
-	fragment = fmt.Sprintf("# %d %#v\n", posLine+1, posFilename) + fragment
-
-	fragmentC := C.CString(fragment)
-	defer C.free(unsafe.Pointer(fragmentC))
-
-	unsavedFile := C.struct_CXUnsavedFile{
-		Filename: filenameC,
-		Length:   C.ulong(len(fragment)),
-		Contents: fragmentC,
-	}
-
-	// convert Go slice of strings to C array of strings.
-	cmdargsC := C.malloc(C.size_t(len(cflags)) * C.size_t(unsafe.Sizeof(uintptr(0))))
-	defer C.free(cmdargsC)
-	cmdargs := (*[1 << 16]*C.char)(cmdargsC)
-	for i, cflag := range cflags {
-		s := C.CString(cflag)
-		cmdargs[i] = s
-		defer C.free(unsafe.Pointer(s))
-	}
-
-	var unit C.CXTranslationUnit
-	errCode := C.clang_parseTranslationUnit2(
-		index,
-		filenameC,
-		(**C.char)(cmdargsC), C.int(len(cflags)), // command line args
-		&unsavedFile, 1, // unsaved files
-		C.CXTranslationUnit_DetailedPreprocessingRecord,
-		&unit)
-	if errCode != 0 {
-		panic("loader: failed to parse source with libclang")
-	}
-	defer C.clang_disposeTranslationUnit(unit)
-
-	if numDiagnostics := int(C.clang_getNumDiagnostics(unit)); numDiagnostics != 0 {
-		addDiagnostic := func(diagnostic C.CXDiagnostic) {
-			spelling := getString(C.clang_getDiagnosticSpelling(diagnostic))
-			severity := diagnosticSeverity[C.clang_getDiagnosticSeverity(diagnostic)]
-			location := C.clang_getDiagnosticLocation(diagnostic)
-			var libclangFilename C.CXString
-			var line C.unsigned
-			var column C.unsigned
-			C.clang_getPresumedLocation(location, &libclangFilename, &line, &column)
-			filename := getString(libclangFilename)
-			if filepath.IsAbs(filename) {
-				// Relative paths for readability, like other Go parser errors.
-				relpath, err := filepath.Rel(p.dir, filename)
-				if err == nil {
-					filename = relpath
-				}
-			}
-			p.errors = append(p.errors, &scanner.Error{
-				Pos: token.Position{
-					Filename: filename,
-					Offset:   0, // not provided by clang_getPresumedLocation
-					Line:     int(line),
-					Column:   int(column),
-				},
-				Msg: severity + ": " + spelling,
-			})
-		}
-		for i := 0; i < numDiagnostics; i++ {
-			diagnostic := C.clang_getDiagnostic(unit, C.uint(i))
-			addDiagnostic(diagnostic)
-
-			// Child diagnostics (like notes on redefinitions).
-			diagnostics := C.clang_getChildDiagnostics(diagnostic)
-			for j := 0; j < int(C.clang_getNumDiagnosticsInSet(diagnostics)); j++ {
-				addDiagnostic(C.clang_getDiagnosticInSet(diagnostics, C.uint(j)))
-			}
-		}
-		return
-	}
-
-	ref := storedRefs.Put(p)
-	defer storedRefs.Remove(ref)
-	cursor := C.tinygo_clang_getTranslationUnitCursor(unit)
-	C.tinygo_clang_visitChildren(cursor, C.CXCursorVisitor(C.tinygo_clang_globals_visitor), C.CXClientData(ref))
-}
-
-//export tinygo_clang_globals_visitor
-func tinygo_clang_globals_visitor(c, parent C.GoCXCursor, client_data C.CXClientData) C.int {
-	p := storedRefs.Get(unsafe.Pointer(client_data)).(*cgoPackage)
-	kind := C.tinygo_clang_getCursorKind(c)
-	pos := p.getCursorPosition(c)
-	switch kind {
-	case C.CXCursor_FunctionDecl:
-		name := getString(C.tinygo_clang_getCursorSpelling(c))
-		if _, required := p.missingSymbols[name]; !required {
-			return C.CXChildVisit_Continue
-		}
-		cursorType := C.tinygo_clang_getCursorType(c)
-		if C.clang_isFunctionTypeVariadic(cursorType) != 0 {
-			return C.CXChildVisit_Continue // not supported
-		}
-		numArgs := int(C.tinygo_clang_Cursor_getNumArguments(c))
-		fn := &functionInfo{
-			pos: pos,
-		}
-		p.functions[name] = fn
-		for i := 0; i < numArgs; i++ {
-			arg := C.tinygo_clang_Cursor_getArgument(c, C.uint(i))
-			argName := getString(C.tinygo_clang_getCursorSpelling(arg))
-			argType := C.clang_getArgType(cursorType, C.uint(i))
-			if argName == "" {
-				argName = "$" + strconv.Itoa(i)
-			}
-			fn.args = append(fn.args, paramInfo{
-				name:     argName,
-				typeExpr: p.makeASTType(argType, pos),
-			})
-		}
-		resultType := C.tinygo_clang_getCursorResultType(c)
-		if resultType.kind != C.CXType_Void {
-			fn.results = &ast.FieldList{
-				List: []*ast.Field{
-					&ast.Field{
-						Type: p.makeASTType(resultType, pos),
-					},
-				},
-			}
-		}
-	case C.CXCursor_StructDecl:
-		typ := C.tinygo_clang_getCursorType(c)
-		name := getString(C.tinygo_clang_getCursorSpelling(c))
-		if _, required := p.missingSymbols["struct_"+name]; !required {
-			return C.CXChildVisit_Continue
-		}
-		p.makeASTType(typ, pos)
-	case C.CXCursor_TypedefDecl:
-		typedefType := C.tinygo_clang_getCursorType(c)
-		name := getString(C.clang_getTypedefName(typedefType))
-		if _, required := p.missingSymbols[name]; !required {
-			return C.CXChildVisit_Continue
-		}
-		p.makeASTType(typedefType, pos)
-	case C.CXCursor_VarDecl:
-		name := getString(C.tinygo_clang_getCursorSpelling(c))
-		if _, required := p.missingSymbols[name]; !required {
-			return C.CXChildVisit_Continue
-		}
-		cursorType := C.tinygo_clang_getCursorType(c)
-		p.globals[name] = globalInfo{
-			typeExpr: p.makeASTType(cursorType, pos),
-			pos:      pos,
-		}
-	case C.CXCursor_MacroDefinition:
-		name := getString(C.tinygo_clang_getCursorSpelling(c))
-		if _, required := p.missingSymbols[name]; !required {
-			return C.CXChildVisit_Continue
-		}
-		sourceRange := C.tinygo_clang_getCursorExtent(c)
-		start := C.clang_getRangeStart(sourceRange)
-		end := C.clang_getRangeEnd(sourceRange)
-		var file, endFile C.CXFile
-		var startOffset, endOffset C.unsigned
-		C.clang_getExpansionLocation(start, &file, nil, nil, &startOffset)
-		if file == nil {
-			panic("could not find file where macro is defined")
-		}
-		C.clang_getExpansionLocation(end, &endFile, nil, nil, &endOffset)
-		if file != endFile {
-			panic("expected start and end location of a #define to be in the same file")
-		}
-		if startOffset > endOffset {
-			panic("startOffset > endOffset")
-		}
-
-		// read file contents and extract the relevant byte range
-		tu := C.tinygo_clang_Cursor_getTranslationUnit(c)
-		var size C.size_t
-		sourcePtr := C.clang_getFileContents(tu, file, &size)
-		if endOffset >= C.uint(size) {
-			panic("endOffset lies after end of file")
-		}
-		source := string(((*[1 << 28]byte)(unsafe.Pointer(sourcePtr)))[startOffset:endOffset:endOffset])
-		if !strings.HasPrefix(source, name) {
-			panic(fmt.Sprintf("expected #define value to start with %#v, got %#v", name, source))
-		}
-		value := strings.TrimSpace(source[len(name):])
-		for len(value) != 0 && value[0] == '(' && value[len(value)-1] == ')' {
-			value = strings.TrimSpace(value[1 : len(value)-1])
-		}
-		if len(value) == 0 {
-			// Pretend it doesn't exist at all.
-			return C.CXChildVisit_Continue
-		}
-		// For information about integer literals:
-		// https://en.cppreference.com/w/cpp/language/integer_literal
-		if value[0] == '"' {
-			// string constant
-			p.constants[name] = constantInfo{&ast.BasicLit{pos, token.STRING, value}, pos}
-			return C.CXChildVisit_Continue
-		}
-		if value[0] == '\'' {
-			// char constant
-			p.constants[name] = constantInfo{&ast.BasicLit{pos, token.CHAR, value}, pos}
-			return C.CXChildVisit_Continue
-		}
-		// assume it's a number (int or float)
-		value = strings.Replace(value, "'", "", -1) // remove ' chars
-		value = strings.TrimRight(value, "lu")      // remove llu suffixes etc.
-		// find the first non-number
-		nonnum := byte(0)
-		for i := 0; i < len(value); i++ {
-			if value[i] < '0' || value[i] > '9' {
-				nonnum = value[i]
-				break
-			}
-		}
-		// determine number type based on the first non-number
-		switch nonnum {
-		case 0:
-			// no non-number found, must be an integer
-			p.constants[name] = constantInfo{&ast.BasicLit{pos, token.INT, value}, pos}
-		case 'x', 'X':
-			// hex integer constant
-			// TODO: may also be a floating point number per C++17.
-			p.constants[name] = constantInfo{&ast.BasicLit{pos, token.INT, value}, pos}
-		case '.', 'e':
-			// float constant
-			value = strings.TrimRight(value, "fFlL")
-			p.constants[name] = constantInfo{&ast.BasicLit{pos, token.FLOAT, value}, pos}
-		default:
-			// unknown type, ignore
-		}
-	}
-	return C.CXChildVisit_Continue
-}
-
-func getString(clangString C.CXString) (s string) {
-	rawString := C.clang_getCString(clangString)
-	s = C.GoString(rawString)
-	C.clang_disposeString(clangString)
-	return
-}
-
-// getCursorPosition returns a usable token.Pos from a libclang cursor. If the
-// file for this cursor has not been seen before, it is read from libclang
-// (which already has the file in memory) and added to the token.FileSet.
-func (p *cgoPackage) getCursorPosition(cursor C.GoCXCursor) token.Pos {
-	location := C.tinygo_clang_getCursorLocation(cursor)
-	var file C.CXFile
-	var line C.unsigned
-	var column C.unsigned
-	var offset C.unsigned
-	C.clang_getExpansionLocation(location, &file, &line, &column, &offset)
-	if line == 0 || file == nil {
-		// Invalid token.
-		return token.NoPos
-	}
-	filename := getString(C.clang_getFileName(file))
-	if _, ok := p.tokenFiles[filename]; !ok {
-		// File has not been seen before in this package, add line information
-		// now by reading the file from libclang.
-		tu := C.tinygo_clang_Cursor_getTranslationUnit(cursor)
-		var size C.size_t
-		sourcePtr := C.clang_getFileContents(tu, file, &size)
-		source := ((*[1 << 28]byte)(unsafe.Pointer(sourcePtr)))[:size:size]
-		lines := []int{0}
-		for i := 0; i < len(source)-1; i++ {
-			if source[i] == '\n' {
-				lines = append(lines, i+1)
-			}
-		}
-		f := p.fset.AddFile(filename, -1, int(size))
-		f.SetLines(lines)
-		p.tokenFiles[filename] = f
-	}
-	return p.tokenFiles[filename].Pos(int(offset))
-}
-
-// makeASTType return the ast.Expr for the given libclang type. In other words,
-// it converts a libclang type to a type in the Go AST.
-func (p *cgoPackage) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
-	var typeName string
-	switch typ.kind {
-	case C.CXType_Char_S, C.CXType_Char_U:
-		typeName = "C.char"
-	case C.CXType_SChar:
-		typeName = "C.schar"
-	case C.CXType_UChar:
-		typeName = "C.uchar"
-	case C.CXType_Short:
-		typeName = "C.short"
-	case C.CXType_UShort:
-		typeName = "C.ushort"
-	case C.CXType_Int:
-		typeName = "C.int"
-	case C.CXType_UInt:
-		typeName = "C.uint"
-	case C.CXType_Long:
-		typeName = "C.long"
-	case C.CXType_ULong:
-		typeName = "C.ulong"
-	case C.CXType_LongLong:
-		typeName = "C.longlong"
-	case C.CXType_ULongLong:
-		typeName = "C.ulonglong"
-	case C.CXType_Bool:
-		typeName = "bool"
-	case C.CXType_Float, C.CXType_Double, C.CXType_LongDouble:
-		switch C.clang_Type_getSizeOf(typ) {
-		case 4:
-			typeName = "float32"
-		case 8:
-			typeName = "float64"
-		default:
-			// Don't do anything, rely on the fallback code to show a somewhat
-			// sensible error message like "undeclared name: C.long double".
-		}
-	case C.CXType_Complex:
-		switch C.clang_Type_getSizeOf(typ) {
-		case 8:
-			typeName = "complex64"
-		case 16:
-			typeName = "complex128"
-		}
-	case C.CXType_Pointer:
-		pointeeType := C.clang_getPointeeType(typ)
-		if pointeeType.kind == C.CXType_Void {
-			// void* type is translated to Go as unsafe.Pointer
-			return &ast.SelectorExpr{
-				X: &ast.Ident{
-					NamePos: pos,
-					Name:    "unsafe",
-				},
-				Sel: &ast.Ident{
-					NamePos: pos,
-					Name:    "Pointer",
-				},
-			}
-		}
-		return &ast.StarExpr{
-			Star: pos,
-			X:    p.makeASTType(pointeeType, pos),
-		}
-	case C.CXType_ConstantArray:
-		return &ast.ArrayType{
-			Lbrack: pos,
-			Len: &ast.BasicLit{
-				ValuePos: pos,
-				Kind:     token.INT,
-				Value:    strconv.FormatInt(int64(C.clang_getArraySize(typ)), 10),
-			},
-			Elt: p.makeASTType(C.clang_getElementType(typ), pos),
-		}
-	case C.CXType_FunctionProto:
-		// Be compatible with gc, which uses the *[0]byte type for function
-		// pointer types.
-		// Return type [0]byte because this is a function type, not a pointer to
-		// this function type.
-		return &ast.ArrayType{
-			Lbrack: pos,
-			Len: &ast.BasicLit{
-				ValuePos: pos,
-				Kind:     token.INT,
-				Value:    "0",
-			},
-			Elt: &ast.Ident{
-				NamePos: pos,
-				Name:    "byte",
-			},
-		}
-	case C.CXType_Typedef:
-		name := getString(C.clang_getTypedefName(typ))
-		if _, ok := p.typedefs[name]; !ok {
-			p.typedefs[name] = nil // don't recurse
-			c := C.tinygo_clang_getTypeDeclaration(typ)
-			underlyingType := C.tinygo_clang_getTypedefDeclUnderlyingType(c)
-			expr := p.makeASTType(underlyingType, pos)
-			if strings.HasPrefix(name, "_Cgo_") {
-				expr := expr.(*ast.Ident)
-				typeSize := C.clang_Type_getSizeOf(underlyingType)
-				switch expr.Name {
-				case "C.char":
-					if typeSize != 1 {
-						// This happens for some very special purpose architectures
-						// (DSPs etc.) that are not currently targeted.
-						// https://www.embecosm.com/2017/04/18/non-8-bit-char-support-in-clang-and-llvm/
-						panic("unknown char width")
-					}
-					switch underlyingType.kind {
-					case C.CXType_Char_S:
-						expr.Name = "int8"
-					case C.CXType_Char_U:
-						expr.Name = "uint8"
-					}
-				case "C.schar", "C.short", "C.int", "C.long", "C.longlong":
-					switch typeSize {
-					case 1:
-						expr.Name = "int8"
-					case 2:
-						expr.Name = "int16"
-					case 4:
-						expr.Name = "int32"
-					case 8:
-						expr.Name = "int64"
-					}
-				case "C.uchar", "C.ushort", "C.uint", "C.ulong", "C.ulonglong":
-					switch typeSize {
-					case 1:
-						expr.Name = "uint8"
-					case 2:
-						expr.Name = "uint16"
-					case 4:
-						expr.Name = "uint32"
-					case 8:
-						expr.Name = "uint64"
-					}
-				}
-			}
-			p.typedefs[name] = &typedefInfo{
-				typeExpr: expr,
-				pos:      pos,
-			}
-		}
-		return &ast.Ident{
-			NamePos: pos,
-			Name:    "C." + name,
-		}
-	case C.CXType_Elaborated:
-		underlying := C.clang_Type_getNamedType(typ)
-		switch underlying.kind {
-		case C.CXType_Record:
-			return p.makeASTType(underlying, pos)
-		case C.CXType_Enum:
-			return p.makeASTType(underlying, pos)
-		default:
-			panic("unknown elaborated type")
-		}
-	case C.CXType_Record:
-		cursor := C.tinygo_clang_getTypeDeclaration(typ)
-		name := getString(C.tinygo_clang_getCursorSpelling(cursor))
-		var cgoName string
-		switch C.tinygo_clang_getCursorKind(cursor) {
-		case C.CXCursor_StructDecl:
-			cgoName = "struct_" + name
-		case C.CXCursor_UnionDecl:
-			cgoName = "union_" + name
-		default:
-			panic("unknown record declaration")
-		}
-		if _, ok := p.elaboratedTypes[cgoName]; !ok {
-			p.elaboratedTypes[cgoName] = nil // predeclare (to avoid endless recursion)
-			fieldList := &ast.FieldList{
-				Opening: pos,
-				Closing: pos,
-			}
-			ref := storedRefs.Put(struct {
-				fieldList *ast.FieldList
-				pkg       *cgoPackage
-			}{fieldList, p})
-			defer storedRefs.Remove(ref)
-			C.tinygo_clang_visitChildren(cursor, C.CXCursorVisitor(C.tinygo_clang_struct_visitor), C.CXClientData(ref))
-			switch C.tinygo_clang_getCursorKind(cursor) {
-			case C.CXCursor_StructDecl:
-				p.elaboratedTypes[cgoName] = &elaboratedTypeInfo{
-					typeExpr: &ast.StructType{
-						Struct: pos,
-						Fields: fieldList,
-					},
-					pos: pos,
-				}
-			case C.CXCursor_UnionDecl:
-				if len(fieldList.List) > 1 {
-					// Insert a special field at the front (of zero width) as a
-					// marker that this is struct is actually a union. This is done
-					// by giving the field a name that cannot be expressed directly
-					// in Go.
-					// Other parts of the compiler look at the first element in a
-					// struct (of size > 2) to know whether this is a union.
-					// Note that we don't have to insert it for single-element
-					// unions as they're basically equivalent to a struct.
-					unionMarker := &ast.Field{
-						Type: &ast.StructType{
-							Struct: pos,
-						},
-					}
-					unionMarker.Names = []*ast.Ident{
-						&ast.Ident{
-							NamePos: pos,
-							Name:    "C union",
-							Obj: &ast.Object{
-								Kind: ast.Var,
-								Name: "C union",
-								Decl: unionMarker,
-							},
-						},
-					}
-					fieldList.List = append([]*ast.Field{unionMarker}, fieldList.List...)
-				}
-				p.elaboratedTypes[cgoName] = &elaboratedTypeInfo{
-					typeExpr: &ast.StructType{
-						Struct: pos,
-						Fields: fieldList,
-					},
-					pos: pos,
-				}
-			default:
-				panic("unreachable")
-			}
-		}
-		return &ast.Ident{
-			NamePos: pos,
-			Name:    "C." + cgoName,
-		}
-	case C.CXType_Enum:
-		cursor := C.tinygo_clang_getTypeDeclaration(typ)
-		name := getString(C.tinygo_clang_getCursorSpelling(cursor))
-		underlying := C.tinygo_clang_getEnumDeclIntegerType(cursor)
-		if name == "" {
-			// anonymous enum
-			ref := storedRefs.Put(p)
-			defer storedRefs.Remove(ref)
-			C.tinygo_clang_visitChildren(cursor, C.CXCursorVisitor(C.tinygo_clang_enum_visitor), C.CXClientData(ref))
-			return p.makeASTType(underlying, pos)
-		} else {
-			// named enum
-			if _, ok := p.enums[name]; !ok {
-				ref := storedRefs.Put(p)
-				defer storedRefs.Remove(ref)
-				C.tinygo_clang_visitChildren(cursor, C.CXCursorVisitor(C.tinygo_clang_enum_visitor), C.CXClientData(ref))
-				p.enums[name] = enumInfo{
-					typeExpr: p.makeASTType(underlying, pos),
-					pos:      pos,
-				}
-			}
-			return &ast.Ident{
-				NamePos: pos,
-				Name:    "C.enum_" + name,
-			}
-		}
-	}
-	if typeName == "" {
-		// Report this as an error.
-		spelling := getString(C.clang_getTypeSpelling(typ))
-		p.errors = append(p.errors, scanner.Error{
-			Pos: p.fset.PositionFor(pos, true),
-			Msg: fmt.Sprintf("unknown C type: %v (libclang type kind %d)", spelling, typ.kind),
-		})
-		// Fallback, probably incorrect but at least the error points to an odd
-		// type name.
-		typeName = "C." + spelling
-	}
-	return &ast.Ident{
-		NamePos: pos,
-		Name:    typeName,
-	}
-}
-
-//export tinygo_clang_struct_visitor
-func tinygo_clang_struct_visitor(c, parent C.GoCXCursor, client_data C.CXClientData) C.int {
-	passed := storedRefs.Get(unsafe.Pointer(client_data)).(struct {
-		fieldList *ast.FieldList
-		pkg       *cgoPackage
-	})
-	fieldList := passed.fieldList
-	p := passed.pkg
-	if C.tinygo_clang_getCursorKind(c) != C.CXCursor_FieldDecl {
-		panic("expected field inside cursor")
-	}
-	name := getString(C.tinygo_clang_getCursorSpelling(c))
-	typ := C.tinygo_clang_getCursorType(c)
-	field := &ast.Field{
-		Type: p.makeASTType(typ, p.getCursorPosition(c)),
-	}
-	field.Names = []*ast.Ident{
-		&ast.Ident{
-			NamePos: p.getCursorPosition(c),
-			Name:    name,
-			Obj: &ast.Object{
-				Kind: ast.Var,
-				Name: name,
-				Decl: field,
-			},
-		},
-	}
-	fieldList.List = append(fieldList.List, field)
-	return C.CXChildVisit_Continue
-}
-
-//export tinygo_clang_enum_visitor
-func tinygo_clang_enum_visitor(c, parent C.GoCXCursor, client_data C.CXClientData) C.int {
-	p := storedRefs.Get(unsafe.Pointer(client_data)).(*cgoPackage)
-	name := getString(C.tinygo_clang_getCursorSpelling(c))
-	pos := p.getCursorPosition(c)
-	value := C.tinygo_clang_getEnumConstantDeclValue(c)
-	p.constants[name] = constantInfo{
-		expr: &ast.BasicLit{pos, token.INT, strconv.FormatInt(int64(value), 10)},
-		pos:  pos,
-	}
-	return C.CXChildVisit_Continue
-}

cgo/libclang_config.go

@@ -1,11 +0,0 @@
-// +build !byollvm
-
-package cgo
-
-/*
-#cgo linux  CFLAGS: -I/usr/lib/llvm-8/include
-#cgo darwin CFLAGS: -I/usr/local/opt/llvm/include
-#cgo linux  LDFLAGS: -L/usr/lib/llvm-8/lib -lclang
-#cgo darwin LDFLAGS: -L/usr/local/opt/llvm/lib -lclang -lffi
-*/
-import "C"

cgo/libclang_stubs.c

@@ -1,66 +0,0 @@
-
-// This file implements some small trampoline functions. The signatures
-// are slightly different from the ones defined in libclang.go, but they
-// should be ABI compatible.
-
-#include <clang-c/Index.h> // if this fails, install libclang-8-dev
-
-CXCursor tinygo_clang_getTranslationUnitCursor(CXTranslationUnit tu) {
-	return clang_getTranslationUnitCursor(tu);
-}
-
-unsigned tinygo_clang_visitChildren(CXCursor parent, CXCursorVisitor visitor, CXClientData client_data) {
-	return clang_visitChildren(parent, visitor, client_data);
-}
-
-CXString tinygo_clang_getCursorSpelling(CXCursor c) {
-	return clang_getCursorSpelling(c);
-}
-
-enum CXCursorKind tinygo_clang_getCursorKind(CXCursor c) {
-	return clang_getCursorKind(c);
-}
-
-CXType tinygo_clang_getCursorType(CXCursor c) {
-	return clang_getCursorType(c);
-}
-
-CXCursor tinygo_clang_getTypeDeclaration(CXType t) {
-	return clang_getTypeDeclaration(t);
-}
-
-CXType tinygo_clang_getTypedefDeclUnderlyingType(CXCursor c) {
-	return clang_getTypedefDeclUnderlyingType(c);
-}
-
-CXType tinygo_clang_getCursorResultType(CXCursor c) {
-	return clang_getCursorResultType(c);
-}
-
-int tinygo_clang_Cursor_getNumArguments(CXCursor c) {
-	return clang_Cursor_getNumArguments(c);
-}
-
-CXCursor tinygo_clang_Cursor_getArgument(CXCursor c, unsigned i) {
-	return clang_Cursor_getArgument(c, i);
-}
-
-CXSourceLocation tinygo_clang_getCursorLocation(CXCursor c) {
-	return clang_getCursorLocation(c);
-}
-
-CXSourceRange tinygo_clang_getCursorExtent(CXCursor c) {
-	return clang_getCursorExtent(c);
-}
-
-CXTranslationUnit tinygo_clang_Cursor_getTranslationUnit(CXCursor c) {
-	return clang_Cursor_getTranslationUnit(c);
-}
-
-long long tinygo_clang_getEnumConstantDeclValue(CXCursor c) {
-	return clang_getEnumConstantDeclValue(c);
-}
-
-CXType tinygo_clang_getEnumDeclIntegerType(CXCursor c) {
-	return clang_getEnumDeclIntegerType(c);
-}

cgo/sync.go

@@ -1,46 +0,0 @@
-package cgo
-
-import (
-	"sync"
-	"unsafe"
-)
-
-// #include <stdlib.h>
-import "C"
-
-// refMap is a convenient way to store opaque references that can be passed to
-// C. It is useful if an API uses function pointers and you cannot pass a Go
-// pointer but only a C pointer.
-type refMap struct {
-	refs map[unsafe.Pointer]interface{}
-	lock sync.Mutex
-}
-
-// Put stores a value in the map. It can later be retrieved using Get. It must
-// be removed using Remove to avoid memory leaks.
-func (m *refMap) Put(v interface{}) unsafe.Pointer {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	if m.refs == nil {
-		m.refs = make(map[unsafe.Pointer]interface{}, 1)
-	}
-	ref := C.malloc(1)
-	m.refs[ref] = v
-	return ref
-}
-
-// Get returns a stored value previously inserted with Put. Use the same
-// reference as you got from Put.
-func (m *refMap) Get(ref unsafe.Pointer) interface{} {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	return m.refs[ref]
-}
-
-// Remove deletes a single reference from the map.
-func (m *refMap) Remove(ref unsafe.Pointer) {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	delete(m.refs, ref)
-	C.free(ref)
-}

commands.go

@@ -1,44 +0,0 @@
-package main
-
-import (
-	"errors"
-	"os"
-	"os/exec"
-	"runtime"
-	"strings"
-)
-
-// Commands used by the compilation process might have different file names
-// across operating systems and distributions.
-var commands = map[string][]string{
-	"clang":   {"clang-8"},
-	"ld.lld":  {"ld.lld-8", "ld.lld"},
-	"wasm-ld": {"wasm-ld-8", "wasm-ld"},
-}
-
-func init() {
-	// Add the path to a Homebrew-installed LLVM 8 for ease of use (no need to
-	// manually set $PATH).
-	if runtime.GOOS == "darwin" {
-		commands["clang"] = append(commands["clang"], "/usr/local/opt/llvm/bin/clang-8")
-		commands["ld.lld"] = append(commands["ld.lld"], "/usr/local/opt/llvm/bin/ld.lld")
-		commands["wasm-ld"] = append(commands["wasm-ld"], "/usr/local/opt/llvm/bin/wasm-ld")
-	}
-}
-
-func execCommand(cmdNames []string, args ...string) error {
-	for _, cmdName := range cmdNames {
-		cmd := exec.Command(cmdName, args...)
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		err := cmd.Run()
-		if err != nil {
-			if err, ok := err.(*exec.Error); ok && err.Err == exec.ErrNotFound {
-				// this command was not found, try the next
-				continue
-			}
-		}
-		return nil
-	}
-	return errors.New("none of these commands were found in your $PATH: " + strings.Join(cmdNames, " "))
-}

compiler/asserts.go

@@ -1,154 +0,0 @@
-package compiler
-
-// This file implements functions that do certain safety checks that are
-// required by the Go programming language.
-
-import (
-	"go/types"
-
-	"tinygo.org/x/go-llvm"
-)
-
-// emitLookupBoundsCheck emits a bounds check before doing a lookup into a
-// slice. This is required by the Go language spec: an index out of bounds must
-// cause a panic.
-func (c *Compiler) emitLookupBoundsCheck(frame *Frame, arrayLen, index llvm.Value, indexType types.Type) {
-	if frame.fn.IsNoBounds() {
-		// The //go:nobounds pragma was added to the function to avoid bounds
-		// checking.
-		return
-	}
-
-	if index.Type().IntTypeWidth() < arrayLen.Type().IntTypeWidth() {
-		// Sometimes, the index can be e.g. an uint8 or int8, and we have to
-		// correctly extend that type.
-		if indexType.(*types.Basic).Info()&types.IsUnsigned == 0 {
-			index = c.builder.CreateZExt(index, arrayLen.Type(), "")
-		} else {
-			index = c.builder.CreateSExt(index, arrayLen.Type(), "")
-		}
-	} else if index.Type().IntTypeWidth() > arrayLen.Type().IntTypeWidth() {
-		// The index is bigger than the array length type, so extend it.
-		arrayLen = c.builder.CreateZExt(arrayLen, index.Type(), "")
-	}
-
-	faultBlock := c.ctx.AddBasicBlock(frame.fn.LLVMFn, "lookup.outofbounds")
-	nextBlock := c.ctx.AddBasicBlock(frame.fn.LLVMFn, "lookup.next")
-	frame.blockExits[frame.currentBlock] = nextBlock // adjust outgoing block for phi nodes
-
-	// Now do the bounds check: index >= arrayLen
-	outOfBounds := c.builder.CreateICmp(llvm.IntUGE, index, arrayLen, "")
-	c.builder.CreateCondBr(outOfBounds, faultBlock, nextBlock)
-
-	// Fail: this is a nil pointer, exit with a panic.
-	c.builder.SetInsertPointAtEnd(faultBlock)
-	c.createRuntimeCall("lookupPanic", nil, "")
-	c.builder.CreateUnreachable()
-
-	// Ok: this is a valid pointer.
-	c.builder.SetInsertPointAtEnd(nextBlock)
-}
-
-// emitSliceBoundsCheck emits a bounds check before a slicing operation to make
-// sure it is within bounds.
-//
-// This function is both used for slicing a slice (low and high have their
-// normal meaning) and for creating a new slice, where 'capacity' means the
-// biggest possible slice capacity, 'low' means len and 'high' means cap. The
-// logic is the same in both cases.
-func (c *Compiler) emitSliceBoundsCheck(frame *Frame, capacity, low, high llvm.Value, lowType, highType *types.Basic) {
-	if frame.fn.IsNoBounds() {
-		// The //go:nobounds pragma was added to the function to avoid bounds
-		// checking.
-		return
-	}
-
-	// Extend the capacity integer to be at least as wide as low and high.
-	capacityType := capacity.Type()
-	if low.Type().IntTypeWidth() > capacityType.IntTypeWidth() {
-		capacityType = low.Type()
-	}
-	if high.Type().IntTypeWidth() > capacityType.IntTypeWidth() {
-		capacityType = high.Type()
-	}
-	if capacityType != capacity.Type() {
-		capacity = c.builder.CreateZExt(capacity, capacityType, "")
-	}
-
-	// Extend low and high to be the same size as capacity.
-	if low.Type().IntTypeWidth() < capacityType.IntTypeWidth() {
-		if lowType.Info()&types.IsUnsigned != 0 {
-			low = c.builder.CreateZExt(low, capacityType, "")
-		} else {
-			low = c.builder.CreateSExt(low, capacityType, "")
-		}
-	}
-	if high.Type().IntTypeWidth() < capacityType.IntTypeWidth() {
-		if highType.Info()&types.IsUnsigned != 0 {
-			high = c.builder.CreateZExt(high, capacityType, "")
-		} else {
-			high = c.builder.CreateSExt(high, capacityType, "")
-		}
-	}
-
-	faultBlock := c.ctx.AddBasicBlock(frame.fn.LLVMFn, "slice.outofbounds")
-	nextBlock := c.ctx.AddBasicBlock(frame.fn.LLVMFn, "slice.next")
-	frame.blockExits[frame.currentBlock] = nextBlock // adjust outgoing block for phi nodes
-
-	// Now do the bounds check: low > high || high > capacity
-	outOfBounds1 := c.builder.CreateICmp(llvm.IntUGT, low, high, "slice.lowhigh")
-	outOfBounds2 := c.builder.CreateICmp(llvm.IntUGT, high, capacity, "slice.highcap")
-	outOfBounds := c.builder.CreateOr(outOfBounds1, outOfBounds2, "slice.outofbounds")
-	c.builder.CreateCondBr(outOfBounds, faultBlock, nextBlock)
-
-	// Fail: this is a nil pointer, exit with a panic.
-	c.builder.SetInsertPointAtEnd(faultBlock)
-	c.createRuntimeCall("slicePanic", nil, "")
-	c.builder.CreateUnreachable()
-
-	// Ok: this is a valid pointer.
-	c.builder.SetInsertPointAtEnd(nextBlock)
-}
-
-// emitNilCheck checks whether the given pointer is nil, and panics if it is. It
-// has no effect in well-behaved programs, but makes sure no uncaught nil
-// pointer dereferences exist in valid Go code.
-func (c *Compiler) emitNilCheck(frame *Frame, ptr llvm.Value, blockPrefix string) {
-	// Check whether we need to emit this check at all.
-	if !ptr.IsAGlobalValue().IsNil() {
-		return
-	}
-
-	// Check whether this is a nil pointer.
-	faultBlock := c.ctx.AddBasicBlock(frame.fn.LLVMFn, blockPrefix+".nil")
-	nextBlock := c.ctx.AddBasicBlock(frame.fn.LLVMFn, blockPrefix+".next")
-	frame.blockExits[frame.currentBlock] = nextBlock // adjust outgoing block for phi nodes
-
-	// Compare against nil.
-	var isnil llvm.Value
-	if ptr.Type().PointerAddressSpace() == 0 {
-		// Do the nil check using the isnil builtin, which marks the parameter
-		// as nocapture.
-		// The reason it has to go through a builtin, is that a regular icmp
-		// instruction may capture the pointer in LLVM semantics, see
-		// https://reviews.llvm.org/D60047 for details. Pointer capturing
-		// unfortunately breaks escape analysis, so we use this trick to let the
-		// functionattr pass know that this pointer doesn't really escape.
-		ptr = c.builder.CreateBitCast(ptr, c.i8ptrType, "")
-		isnil = c.createRuntimeCall("isnil", []llvm.Value{ptr}, "")
-	} else {
-		// Do the nil check using a regular icmp. This can happen with function
-		// pointers on AVR, which don't benefit from escape analysis anyway.
-		nilptr := llvm.ConstPointerNull(ptr.Type())
-		isnil = c.builder.CreateICmp(llvm.IntEQ, ptr, nilptr, "")
-	}
-	c.builder.CreateCondBr(isnil, faultBlock, nextBlock)
-
-	// Fail: this is a nil pointer, exit with a panic.
-	c.builder.SetInsertPointAtEnd(faultBlock)
-	c.createRuntimeCall("nilPanic", nil, "")
-	c.builder.CreateUnreachable()
-
-	// Ok: this is a valid pointer.
-	c.builder.SetInsertPointAtEnd(nextBlock)
-}

compiler/calls.go

@@ -1,8 +1,8 @@
 package compiler
 
 import (
+	"github.com/aykevl/go-llvm"
 	"golang.org/x/tools/go/ssa"
-	"tinygo.org/x/go-llvm"
 )
 
 // For a description of the calling convention in prose, see:
@@ -21,8 +21,7 @@ func (c *Compiler) createRuntimeCall(fnName string, args []llvm.Value, name stri
 	}
 	fn := c.ir.GetFunction(member.(*ssa.Function))
 	if !fn.IsExported() {
-		args = append(args, llvm.Undef(c.i8ptrType))            // unused context parameter
-		args = append(args, llvm.ConstPointerNull(c.i8ptrType)) // coroutine handle
+		args = append(args, llvm.Undef(c.i8ptrType)) // unused context parameter
 	}
 	return c.createCall(fn.LLVMFn, args, name)
 }
@@ -55,25 +54,6 @@ func (c *Compiler) expandFormalParamType(t llvm.Type) []llvm.Type {
 	}
 }
 
-// Expand an argument type to a list of offsets from the start of the object.
-// Used together with expandFormalParam to get the offset of each value from the
-// start of the non-expanded value.
-func (c *Compiler) expandFormalParamOffsets(t llvm.Type) []uint64 {
-	switch t.TypeKind() {
-	case llvm.StructTypeKind:
-		fields := c.flattenAggregateTypeOffsets(t)
-		if len(fields) <= MaxFieldsPerParam {
-			return fields
-		} else {
-			// failed to lower
-			return []uint64{0}
-		}
-	default:
-		// TODO: split small arrays
-		return []uint64{0}
-	}
-}
-
 // Equivalent of expandFormalParamType for parameter values.
 func (c *Compiler) expandFormalParam(v llvm.Value) []llvm.Value {
 	switch v.Type().TypeKind() {
@@ -111,27 +91,6 @@ func (c *Compiler) flattenAggregateType(t llvm.Type) []llvm.Type {
 	}
 }
 
-// Return the offsets from the start of the object if this object type were
-// flattened like in flattenAggregate. Used together with flattenAggregate to
-// know the start indices of each value in the non-flattened object.
-func (c *Compiler) flattenAggregateTypeOffsets(t llvm.Type) []uint64 {
-	switch t.TypeKind() {
-	case llvm.StructTypeKind:
-		fields := make([]uint64, 0, t.StructElementTypesCount())
-		for fieldIndex, field := range t.StructElementTypes() {
-			suboffsets := c.flattenAggregateTypeOffsets(field)
-			offset := c.targetData.ElementOffset(t, fieldIndex)
-			for i := range suboffsets {
-				suboffsets[i] += offset
-			}
-			fields = append(fields, suboffsets...)
-		}
-		return fields
-	default:
-		return []uint64{0}
-	}
-}
-
 // Break down a struct into its elementary types for argument passing. The value
 // equivalent of flattenAggregateType
 func (c *Compiler) flattenAggregate(v llvm.Value) []llvm.Value {
@@ -163,7 +122,10 @@ func (c *Compiler) collapseFormalParamInternal(t llvm.Type, fields []llvm.Value)
 	switch t.TypeKind() {
 	case llvm.StructTypeKind:
 		if len(c.flattenAggregateType(t)) <= MaxFieldsPerParam {
-			value := c.getZeroValue(t)
+			value, err := c.getZeroValue(t)
+			if err != nil {
+				panic("could not get zero value of struct: " + err.Error())
+			}
 			for i, subtyp := range t.StructElementTypes() {
 				structField, remaining := c.collapseFormalParamInternal(subtyp, fields)
 				fields = remaining

compiler/channel.go

@@ -1,79 +0,0 @@
-package compiler
-
-// This file lowers channel operations (make/send/recv/close) to runtime calls
-// or pseudo-operations that are lowered during goroutine lowering.
-
-import (
-	"go/types"
-
-	"golang.org/x/tools/go/ssa"
-	"tinygo.org/x/go-llvm"
-)
-
-// emitMakeChan returns a new channel value for the given channel type.
-func (c *Compiler) emitMakeChan(expr *ssa.MakeChan) (llvm.Value, error) {
-	chanType := c.mod.GetTypeByName("runtime.channel")
-	size := c.targetData.TypeAllocSize(chanType)
-	sizeValue := llvm.ConstInt(c.uintptrType, size, false)
-	ptr := c.createRuntimeCall("alloc", []llvm.Value{sizeValue}, "chan.alloc")
-	ptr = c.builder.CreateBitCast(ptr, llvm.PointerType(chanType, 0), "chan")
-	return ptr, nil
-}
-
-// emitChanSend emits a pseudo chan send operation. It is lowered to the actual
-// channel send operation during goroutine lowering.
-func (c *Compiler) emitChanSend(frame *Frame, instr *ssa.Send) {
-	ch := c.getValue(frame, instr.Chan)
-	chanValue := c.getValue(frame, instr.X)
-
-	// store value-to-send
-	valueType := c.getLLVMType(instr.X.Type())
-	valueAlloca, valueAllocaCast, valueAllocaSize := c.createTemporaryAlloca(valueType, "chan.value")
-	c.builder.CreateStore(chanValue, valueAlloca)
-
-	// Do the send.
-	coroutine := c.createRuntimeCall("getCoroutine", nil, "")
-	valueSize := llvm.ConstInt(c.uintptrType, c.targetData.TypeAllocSize(chanValue.Type()), false)
-	c.createRuntimeCall("chanSend", []llvm.Value{coroutine, ch, valueAllocaCast, valueSize}, "")
-
-	// End the lifetime of the alloca.
-	// This also works around a bug in CoroSplit, at least in LLVM 8:
-	// https://bugs.llvm.org/show_bug.cgi?id=41742
-	c.emitLifetimeEnd(valueAllocaCast, valueAllocaSize)
-}
-
-// emitChanRecv emits a pseudo chan receive operation. It is lowered to the
-// actual channel receive operation during goroutine lowering.
-func (c *Compiler) emitChanRecv(frame *Frame, unop *ssa.UnOp) llvm.Value {
-	valueType := c.getLLVMType(unop.X.Type().(*types.Chan).Elem())
-	ch := c.getValue(frame, unop.X)
-
-	// Allocate memory to receive into.
-	valueAlloca, valueAllocaCast, valueAllocaSize := c.createTemporaryAlloca(valueType, "chan.value")
-
-	// Do the receive.
-	coroutine := c.createRuntimeCall("getCoroutine", nil, "")
-	valueSize := llvm.ConstInt(c.uintptrType, c.targetData.TypeAllocSize(valueType), false)
-	c.createRuntimeCall("chanRecv", []llvm.Value{coroutine, ch, valueAllocaCast, valueSize}, "")
-	received := c.builder.CreateLoad(valueAlloca, "chan.received")
-	c.emitLifetimeEnd(valueAllocaCast, valueAllocaSize)
-
-	if unop.CommaOk {
-		commaOk := c.createRuntimeCall("getTaskPromiseData", []llvm.Value{coroutine}, "chan.commaOk.wide")
-		commaOk = c.builder.CreateTrunc(commaOk, c.ctx.Int1Type(), "chan.commaOk")
-		tuple := llvm.Undef(c.ctx.StructType([]llvm.Type{valueType, c.ctx.Int1Type()}, false))
-		tuple = c.builder.CreateInsertValue(tuple, received, 0, "")
-		tuple = c.builder.CreateInsertValue(tuple, commaOk, 1, "")
-		return tuple
-	} else {
-		return received
-	}
-}
-
-// emitChanClose closes the given channel.
-func (c *Compiler) emitChanClose(frame *Frame, param ssa.Value) {
-	valueType := c.getLLVMType(param.Type().(*types.Chan).Elem())
-	valueSize := llvm.ConstInt(c.uintptrType, c.targetData.TypeAllocSize(valueType), false)
-	ch := c.getValue(frame, param)
-	c.createRuntimeCall("chanClose", []llvm.Value{ch, valueSize}, "")
-}

compiler/defer.go

@@ -14,9 +14,9 @@ package compiler
 //     frames.
 
 import (
-	"github.com/tinygo-org/tinygo/ir"
+	"github.com/aykevl/go-llvm"
+	"github.com/aykevl/tinygo/ir"
 	"golang.org/x/tools/go/ssa"
-	"tinygo.org/x/go-llvm"
 )
 
 // deferInitFunc sets up this function for future deferred calls. It must be
@@ -36,7 +36,7 @@ func (c *Compiler) deferInitFunc(frame *Frame) {
 
 // emitDefer emits a single defer instruction, to be run when this function
 // returns.
-func (c *Compiler) emitDefer(frame *Frame, instr *ssa.Defer) {
+func (c *Compiler) emitDefer(frame *Frame, instr *ssa.Defer) error {
 	// The pointer to the previous defer struct, which we will replace to
 	// make a linked list.
 	next := c.builder.CreateLoad(frame.deferPtr, "defer.next")
@@ -56,12 +56,18 @@ func (c *Compiler) emitDefer(frame *Frame, instr *ssa.Defer) {
 
 		// Collect all values to be put in the struct (starting with
 		// runtime._defer fields, followed by the call parameters).
-		itf := c.getValue(frame, instr.Call.Value) // interface
+		itf, err := c.parseExpr(frame, instr.Call.Value) // interface
+		if err != nil {
+			return err
+		}
 		receiverValue := c.builder.CreateExtractValue(itf, 1, "invoke.func.receiver")
 		values = []llvm.Value{callback, next, receiverValue}
 		valueTypes = append(valueTypes, c.i8ptrType)
 		for _, arg := range instr.Call.Args {
-			val := c.getValue(frame, arg)
+			val, err := c.parseExpr(frame, arg)
+			if err != nil {
+				return err
+			}
 			values = append(values, val)
 			valueTypes = append(valueTypes, val.Type())
 		}
@@ -80,7 +86,10 @@ func (c *Compiler) emitDefer(frame *Frame, instr *ssa.Defer) {
 		// runtime._defer fields).
 		values = []llvm.Value{callback, next}
 		for _, param := range instr.Call.Args {
-			llvmParam := c.getValue(frame, param)
+			llvmParam, err := c.parseExpr(frame, param)
+			if err != nil {
+				return err
+			}
 			values = append(values, llvmParam)
 			valueTypes = append(valueTypes, llvmParam.Type())
 		}
@@ -92,7 +101,10 @@ func (c *Compiler) emitDefer(frame *Frame, instr *ssa.Defer) {
 		// pointer.
 		// TODO: ignore this closure entirely and put pointers to the free
 		// variables directly in the defer struct, avoiding a memory allocation.
-		closure := c.getValue(frame, instr.Call.Value)
+		closure, err := c.parseExpr(frame, instr.Call.Value)
+		if err != nil {
+			return err
+		}
 		context := c.builder.CreateExtractValue(closure, 0, "")
 
 		// Get the callback number.
@@ -108,7 +120,10 @@ func (c *Compiler) emitDefer(frame *Frame, instr *ssa.Defer) {
 		// context pointer).
 		values = []llvm.Value{callback, next}
 		for _, param := range instr.Call.Args {
-			llvmParam := c.getValue(frame, param)
+			llvmParam, err := c.parseExpr(frame, param)
+			if err != nil {
+				return err
+			}
 			values = append(values, llvmParam)
 			valueTypes = append(valueTypes, llvmParam.Type())
 		}
@@ -116,13 +131,15 @@ func (c *Compiler) emitDefer(frame *Frame, instr *ssa.Defer) {
 		valueTypes = append(valueTypes, context.Type())
 
 	} else {
-		c.addError(instr.Pos(), "todo: defer on uncommon function call type")
-		return
+		return c.makeError(instr.Pos(), "todo: defer on uncommon function call type")
 	}
 
 	// Make a struct out of the collected values to put in the defer frame.
 	deferFrameType := c.ctx.StructType(valueTypes, false)
-	deferFrame := c.getZeroValue(deferFrameType)
+	deferFrame, err := c.getZeroValue(deferFrameType)
+	if err != nil {
+		return err
+	}
 	for i, value := range values {
 		deferFrame = c.builder.CreateInsertValue(deferFrame, value, i, "")
 	}
@@ -134,10 +151,11 @@ func (c *Compiler) emitDefer(frame *Frame, instr *ssa.Defer) {
 	// Push it on top of the linked list by replacing deferPtr.
 	allocaCast := c.builder.CreateBitCast(alloca, next.Type(), "defer.alloca.cast")
 	c.builder.CreateStore(allocaCast, frame.deferPtr)
+	return nil
 }
 
 // emitRunDefers emits code to run all deferred functions.
-func (c *Compiler) emitRunDefers(frame *Frame) {
+func (c *Compiler) emitRunDefers(frame *Frame) error {
 	// Add a loop like the following:
 	//     for stack != nil {
 	//         _stack := stack
@@ -172,13 +190,13 @@ func (c *Compiler) emitRunDefers(frame *Frame) {
 	//     stack = stack.next
 	//     switch stack.callback {
 	c.builder.SetInsertPointAtEnd(loop)
-	nextStackGEP := c.builder.CreateInBoundsGEP(deferData, []llvm.Value{
+	nextStackGEP := c.builder.CreateGEP(deferData, []llvm.Value{
 		llvm.ConstInt(c.ctx.Int32Type(), 0, false),
 		llvm.ConstInt(c.ctx.Int32Type(), 1, false), // .next field
 	}, "stack.next.gep")
 	nextStack := c.builder.CreateLoad(nextStackGEP, "stack.next")
 	c.builder.CreateStore(nextStack, frame.deferPtr)
-	gep := c.builder.CreateInBoundsGEP(deferData, []llvm.Value{
+	gep := c.builder.CreateGEP(deferData, []llvm.Value{
 		llvm.ConstInt(c.ctx.Int32Type(), 0, false),
 		llvm.ConstInt(c.ctx.Int32Type(), 0, false), // .callback field
 	}, "callback.gep")
@@ -202,7 +220,11 @@ func (c *Compiler) emitRunDefers(frame *Frame) {
 			// Get the real defer struct type and cast to it.
 			valueTypes := []llvm.Type{c.uintptrType, llvm.PointerType(c.mod.GetTypeByName("runtime._defer"), 0), c.i8ptrType}
 			for _, arg := range callback.Args {
-				valueTypes = append(valueTypes, c.getLLVMType(arg.Type()))
+				llvmType, err := c.getLLVMType(arg.Type())
+				if err != nil {
+					return err
+				}
+				valueTypes = append(valueTypes, llvmType)
 			}
 			deferFrameType := c.ctx.StructType(valueTypes, false)
 			deferFramePtr := c.builder.CreateBitCast(deferData, llvm.PointerType(deferFrameType, 0), "deferFrame")
@@ -211,7 +233,7 @@ func (c *Compiler) emitRunDefers(frame *Frame) {
 			forwardParams := []llvm.Value{}
 			zero := llvm.ConstInt(c.ctx.Int32Type(), 0, false)
 			for i := 2; i < len(valueTypes); i++ {
-				gep := c.builder.CreateInBoundsGEP(deferFramePtr, []llvm.Value{zero, llvm.ConstInt(c.ctx.Int32Type(), uint64(i), false)}, "gep")
+				gep := c.builder.CreateGEP(deferFramePtr, []llvm.Value{zero, llvm.ConstInt(c.ctx.Int32Type(), uint64(i), false)}, "gep")
 				forwardParam := c.builder.CreateLoad(gep, "param")
 				forwardParams = append(forwardParams, forwardParam)
 			}
@@ -221,10 +243,10 @@ func (c *Compiler) emitRunDefers(frame *Frame) {
 			// with a strict calling convention.
 			forwardParams = append(forwardParams, llvm.Undef(c.i8ptrType))
 
-			// Parent coroutine handle.
-			forwardParams = append(forwardParams, llvm.Undef(c.i8ptrType))
-
-			fnPtr, _ := c.getInvokeCall(frame, callback)
+			fnPtr, _, err := c.getInvokeCall(frame, callback)
+			if err != nil {
+				return err
+			}
 			c.createCall(fnPtr, forwardParams, "")
 
 		case *ir.Function:
@@ -233,7 +255,11 @@ func (c *Compiler) emitRunDefers(frame *Frame) {
 			// Get the real defer struct type and cast to it.
 			valueTypes := []llvm.Type{c.uintptrType, llvm.PointerType(c.mod.GetTypeByName("runtime._defer"), 0)}
 			for _, param := range callback.Params {
-				valueTypes = append(valueTypes, c.getLLVMType(param.Type()))
+				llvmType, err := c.getLLVMType(param.Type())
+				if err != nil {
+					return err
+				}
+				valueTypes = append(valueTypes, llvmType)
 			}
 			deferFrameType := c.ctx.StructType(valueTypes, false)
 			deferFramePtr := c.builder.CreateBitCast(deferData, llvm.PointerType(deferFrameType, 0), "deferFrame")
@@ -242,7 +268,7 @@ func (c *Compiler) emitRunDefers(frame *Frame) {
 			forwardParams := []llvm.Value{}
 			zero := llvm.ConstInt(c.ctx.Int32Type(), 0, false)
 			for i := range callback.Params {
-				gep := c.builder.CreateInBoundsGEP(deferFramePtr, []llvm.Value{zero, llvm.ConstInt(c.ctx.Int32Type(), uint64(i+2), false)}, "gep")
+				gep := c.builder.CreateGEP(deferFramePtr, []llvm.Value{zero, llvm.ConstInt(c.ctx.Int32Type(), uint64(i+2), false)}, "gep")
 				forwardParam := c.builder.CreateLoad(gep, "param")
 				forwardParams = append(forwardParams, forwardParam)
 			}
@@ -251,9 +277,6 @@ func (c *Compiler) emitRunDefers(frame *Frame) {
 			// function, but we have to pass one anyway.
 			forwardParams = append(forwardParams, llvm.Undef(c.i8ptrType))
 
-			// Parent coroutine handle.
-			forwardParams = append(forwardParams, llvm.Undef(c.i8ptrType))
-
 			// Call real function.
 			c.createCall(callback.LLVMFn, forwardParams, "")
 
@@ -263,7 +286,11 @@ func (c *Compiler) emitRunDefers(frame *Frame) {
 			valueTypes := []llvm.Type{c.uintptrType, llvm.PointerType(c.mod.GetTypeByName("runtime._defer"), 0)}
 			params := fn.Signature.Params()
 			for i := 0; i < params.Len(); i++ {
-				valueTypes = append(valueTypes, c.getLLVMType(params.At(i).Type()))
+				llvmType, err := c.getLLVMType(params.At(i).Type())
+				if err != nil {
+					return err
+				}
+				valueTypes = append(valueTypes, llvmType)
 			}
 			valueTypes = append(valueTypes, c.i8ptrType) // closure
 			deferFrameType := c.ctx.StructType(valueTypes, false)
@@ -273,14 +300,11 @@ func (c *Compiler) emitRunDefers(frame *Frame) {
 			forwardParams := []llvm.Value{}
 			zero := llvm.ConstInt(c.ctx.Int32Type(), 0, false)
 			for i := 2; i < len(valueTypes); i++ {
-				gep := c.builder.CreateInBoundsGEP(deferFramePtr, []llvm.Value{zero, llvm.ConstInt(c.ctx.Int32Type(), uint64(i), false)}, "")
+				gep := c.builder.CreateGEP(deferFramePtr, []llvm.Value{zero, llvm.ConstInt(c.ctx.Int32Type(), uint64(i), false)}, "")
 				forwardParam := c.builder.CreateLoad(gep, "param")
 				forwardParams = append(forwardParams, forwardParam)
 			}
 
-			// Parent coroutine handle.
-			forwardParams = append(forwardParams, llvm.Undef(c.i8ptrType))
-
 			// Call deferred function.
 			c.createCall(fn.LLVMFn, forwardParams, "")
 
@@ -301,4 +325,5 @@ func (c *Compiler) emitRunDefers(frame *Frame) {
 
 	// End of loop.
 	c.builder.SetInsertPointAtEnd(end)
+	return nil
 }

compiler/errors.go

@@ -12,7 +12,3 @@ func (c *Compiler) makeError(pos token.Pos, msg string) types.Error {
 		Msg:  msg,
 	}
 }
-
-func (c *Compiler) addError(pos token.Pos, msg string) {
-	c.diagnostics = append(c.diagnostics, c.makeError(pos, msg))
-}

compiler/func-lowering.go

@@ -1,269 +0,0 @@
-package compiler
-
-// This file lowers func values into their final form. This is necessary for
-// funcValueSwitch, which needs full program analysis.
-
-import (
-	"sort"
-	"strconv"
-
-	"tinygo.org/x/go-llvm"
-)
-
-// funcSignatureInfo keeps information about a single signature and its uses.
-type funcSignatureInfo struct {
-	sig                     llvm.Value   // *uint8 to identify the signature
-	funcValueWithSignatures []llvm.Value // slice of runtime.funcValueWithSignature
-}
-
-// funcWithUses keeps information about a single function used as func value and
-// the assigned function ID. More commonly used functions are assigned a lower
-// ID.
-type funcWithUses struct {
-	funcPtr  llvm.Value
-	useCount int // how often this function is used in a func value
-	id       int // assigned ID
-}
-
-// Slice to sort functions by their use counts, or else their name if they're
-// used equally often.
-type funcWithUsesList []*funcWithUses
-
-func (l funcWithUsesList) Len() int { return len(l) }
-func (l funcWithUsesList) Less(i, j int) bool {
-	if l[i].useCount != l[j].useCount {
-		// return the reverse: we want the highest use counts sorted first
-		return l[i].useCount > l[j].useCount
-	}
-	iName := l[i].funcPtr.Name()
-	jName := l[j].funcPtr.Name()
-	return iName < jName
-}
-func (l funcWithUsesList) Swap(i, j int) {
-	l[i], l[j] = l[j], l[i]
-}
-
-// LowerFuncValue lowers the runtime.funcValueWithSignature type and
-// runtime.getFuncPtr function to their final form.
-func (c *Compiler) LowerFuncValues() {
-	if c.funcImplementation() != funcValueSwitch {
-		return
-	}
-
-	// Find all func values used in the program with their signatures.
-	funcValueWithSignaturePtr := llvm.PointerType(c.mod.GetTypeByName("runtime.funcValueWithSignature"), 0)
-	signatures := map[string]*funcSignatureInfo{}
-	for global := c.mod.FirstGlobal(); !global.IsNil(); global = llvm.NextGlobal(global) {
-		if global.Type() != funcValueWithSignaturePtr {
-			continue
-		}
-		sig := llvm.ConstExtractValue(global.Initializer(), []uint32{1})
-		name := sig.Name()
-		if info, ok := signatures[name]; ok {
-			info.funcValueWithSignatures = append(info.funcValueWithSignatures, global)
-		} else {
-			signatures[name] = &funcSignatureInfo{
-				sig:                     sig,
-				funcValueWithSignatures: []llvm.Value{global},
-			}
-		}
-	}
-
-	// Sort the signatures, for deterministic execution.
-	names := make([]string, 0, len(signatures))
-	for name := range signatures {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-
-	for _, name := range names {
-		info := signatures[name]
-		functions := make(funcWithUsesList, len(info.funcValueWithSignatures))
-		for i, use := range info.funcValueWithSignatures {
-			var useCount int
-			for _, use2 := range getUses(use) {
-				useCount += len(getUses(use2))
-			}
-			functions[i] = &funcWithUses{
-				funcPtr:  llvm.ConstExtractValue(use.Initializer(), []uint32{0}).Operand(0),
-				useCount: useCount,
-			}
-		}
-		sort.Sort(functions)
-
-		for i, fn := range functions {
-			fn.id = i + 1
-			for _, ptrtoint := range getUses(fn.funcPtr) {
-				if ptrtoint.IsAConstantExpr().IsNil() || ptrtoint.Opcode() != llvm.PtrToInt {
-					continue
-				}
-				for _, funcValueWithSignatureConstant := range getUses(ptrtoint) {
-					for _, funcValueWithSignatureGlobal := range getUses(funcValueWithSignatureConstant) {
-						for _, use := range getUses(funcValueWithSignatureGlobal) {
-							if ptrtoint.IsAConstantExpr().IsNil() || ptrtoint.Opcode() != llvm.PtrToInt {
-								panic("expected const ptrtoint")
-							}
-							use.ReplaceAllUsesWith(llvm.ConstInt(c.uintptrType, uint64(fn.id), false))
-						}
-					}
-				}
-			}
-		}
-
-		for _, getFuncPtrCall := range getUses(info.sig) {
-			if getFuncPtrCall.IsACallInst().IsNil() {
-				continue
-			}
-			if getFuncPtrCall.CalledValue().Name() != "runtime.getFuncPtr" {
-				panic("expected all call uses to be runtime.getFuncPtr")
-			}
-			funcID := getFuncPtrCall.Operand(1)
-			switch len(functions) {
-			case 0:
-				// There are no functions used in a func value that implement
-				// this signature. The only possible value is a nil value.
-				for _, inttoptr := range getUses(getFuncPtrCall) {
-					if inttoptr.IsAIntToPtrInst().IsNil() {
-						panic("expected inttoptr")
-					}
-					nilptr := llvm.ConstPointerNull(inttoptr.Type())
-					inttoptr.ReplaceAllUsesWith(nilptr)
-					inttoptr.EraseFromParentAsInstruction()
-				}
-				getFuncPtrCall.EraseFromParentAsInstruction()
-			case 1:
-				// There is exactly one function with this signature that is
-				// used in a func value. The func value itself can be either nil
-				// or this one function.
-				c.builder.SetInsertPointBefore(getFuncPtrCall)
-				zero := llvm.ConstInt(c.uintptrType, 0, false)
-				isnil := c.builder.CreateICmp(llvm.IntEQ, funcID, zero, "")
-				funcPtrNil := llvm.ConstPointerNull(functions[0].funcPtr.Type())
-				funcPtr := c.builder.CreateSelect(isnil, funcPtrNil, functions[0].funcPtr, "")
-				for _, inttoptr := range getUses(getFuncPtrCall) {
-					if inttoptr.IsAIntToPtrInst().IsNil() {
-						panic("expected inttoptr")
-					}
-					inttoptr.ReplaceAllUsesWith(funcPtr)
-					inttoptr.EraseFromParentAsInstruction()
-				}
-				getFuncPtrCall.EraseFromParentAsInstruction()
-			default:
-				// There are multiple functions used in a func value that
-				// implement this signature.
-				// What we'll do is transform the following:
-				//     rawPtr := runtime.getFuncPtr(fn)
-				//     if func.rawPtr == nil {
-				//         runtime.nilPanic()
-				//     }
-				//     result := func.rawPtr(...args, func.context)
-				// into this:
-				//     if false {
-				//         runtime.nilPanic()
-				//     }
-				//     var result // Phi
-				//     switch fn.id {
-				//     case 0:
-				//         runtime.nilPanic()
-				//     case 1:
-				//         result = call first implementation...
-				//     case 2:
-				//         result = call second implementation...
-				//     default:
-				//         unreachable
-				//     }
-
-				// Remove some casts, checks, and the old call which we're going
-				// to replace.
-				var funcCall llvm.Value
-				for _, inttoptr := range getUses(getFuncPtrCall) {
-					if inttoptr.IsAIntToPtrInst().IsNil() {
-						panic("expected inttoptr")
-					}
-					for _, ptrUse := range getUses(inttoptr) {
-						if !ptrUse.IsABitCastInst().IsNil() {
-							for _, bitcastUse := range getUses(ptrUse) {
-								if bitcastUse.IsACallInst().IsNil() || bitcastUse.CalledValue().Name() != "runtime.isnil" {
-									panic("expected a call to runtime.isnil")
-								}
-								bitcastUse.ReplaceAllUsesWith(llvm.ConstInt(c.ctx.Int1Type(), 0, false))
-								bitcastUse.EraseFromParentAsInstruction()
-							}
-							ptrUse.EraseFromParentAsInstruction()
-						} else if !ptrUse.IsACallInst().IsNil() && ptrUse.CalledValue() == inttoptr {
-							if !funcCall.IsNil() {
-								panic("multiple calls on a single runtime.getFuncPtr")
-							}
-							funcCall = ptrUse
-						} else {
-							panic("unexpected getFuncPtrCall")
-						}
-					}
-				}
-				if funcCall.IsNil() {
-					panic("expected exactly one call use of a runtime.getFuncPtr")
-				}
-
-				// The block that cannot be reached with correct funcValues (to
-				// help the optimizer).
-				c.builder.SetInsertPointBefore(funcCall)
-				defaultBlock := llvm.AddBasicBlock(funcCall.InstructionParent().Parent(), "func.default")
-				c.builder.SetInsertPointAtEnd(defaultBlock)
-				c.builder.CreateUnreachable()
-
-				// Create the switch.
-				c.builder.SetInsertPointBefore(funcCall)
-				sw := c.builder.CreateSwitch(funcID, defaultBlock, len(functions)+1)
-
-				// Split right after the switch. We will need to insert a few
-				// basic blocks in this gap.
-				nextBlock := c.splitBasicBlock(sw, llvm.NextBasicBlock(sw.InstructionParent()), "func.next")
-
-				// The 0 case, which is actually a nil check.
-				nilBlock := llvm.InsertBasicBlock(nextBlock, "func.nil")
-				c.builder.SetInsertPointAtEnd(nilBlock)
-				c.createRuntimeCall("nilPanic", nil, "")
-				c.builder.CreateUnreachable()
-				sw.AddCase(llvm.ConstInt(c.uintptrType, 0, false), nilBlock)
-
-				// Gather the list of parameters for every call we're going to
-				// make.
-				callParams := make([]llvm.Value, funcCall.OperandsCount()-1)
-				for i := range callParams {
-					callParams[i] = funcCall.Operand(i)
-				}
-
-				// If the call produces a value, we need to get it using a PHI
-				// node.
-				phiBlocks := make([]llvm.BasicBlock, len(functions))
-				phiValues := make([]llvm.Value, len(functions))
-				for i, fn := range functions {
-					// Insert a switch case.
-					bb := llvm.InsertBasicBlock(nextBlock, "func.call"+strconv.Itoa(fn.id))
-					c.builder.SetInsertPointAtEnd(bb)
-					result := c.builder.CreateCall(fn.funcPtr, callParams, "")
-					c.builder.CreateBr(nextBlock)
-					sw.AddCase(llvm.ConstInt(c.uintptrType, uint64(fn.id), false), bb)
-					phiBlocks[i] = bb
-					phiValues[i] = result
-				}
-				// Create the PHI node so that the call result flows into the
-				// next block (after the split). This is only necessary when the
-				// call produced a value.
-				if funcCall.Type().TypeKind() != llvm.VoidTypeKind {
-					c.builder.SetInsertPointBefore(nextBlock.FirstInstruction())
-					phi := c.builder.CreatePHI(funcCall.Type(), "")
-					phi.AddIncoming(phiValues, phiBlocks)
-					funcCall.ReplaceAllUsesWith(phi)
-				}
-
-				// Finally, remove the old instructions.
-				funcCall.EraseFromParentAsInstruction()
-				for _, inttoptr := range getUses(getFuncPtrCall) {
-					inttoptr.EraseFromParentAsInstruction()
-				}
-				getFuncPtrCall.EraseFromParentAsInstruction()
-			}
-		}
-	}
-}

compiler/func.go

@@ -1,202 +0,0 @@
-package compiler
-
-// This file implements function values and closures. It may need some lowering
-// in a later step, see func-lowering.go.
-
-import (
-	"go/types"
-
-	"golang.org/x/tools/go/ssa"
-	"tinygo.org/x/go-llvm"
-)
-
-type funcValueImplementation int
-
-const (
-	funcValueNone funcValueImplementation = iota
-
-	// A func value is implemented as a pair of pointers:
-	//     {context, function pointer}
-	// where the context may be a pointer to a heap-allocated struct containing
-	// the free variables, or it may be undef if the function being pointed to
-	// doesn't need a context. The function pointer is a regular function
-	// pointer.
-	funcValueDoubleword
-
-	// As funcValueDoubleword, but with the function pointer replaced by a
-	// unique ID per function signature. Function values are called by using a
-	// switch statement and choosing which function to call.
-	funcValueSwitch
-)
-
-// funcImplementation picks an appropriate func value implementation for the
-// target.
-func (c *Compiler) funcImplementation() funcValueImplementation {
-	if c.GOARCH == "wasm" {
-		return funcValueSwitch
-	} else {
-		return funcValueDoubleword
-	}
-}
-
-// createFuncValue creates a function value from a raw function pointer with no
-// context.
-func (c *Compiler) createFuncValue(funcPtr, context llvm.Value, sig *types.Signature) llvm.Value {
-	var funcValueScalar llvm.Value
-	switch c.funcImplementation() {
-	case funcValueDoubleword:
-		// Closure is: {context, function pointer}
-		funcValueScalar = funcPtr
-	case funcValueSwitch:
-		sigGlobal := c.getFuncSignature(sig)
-		funcValueWithSignatureGlobalName := funcPtr.Name() + "$withSignature"
-		funcValueWithSignatureGlobal := c.mod.NamedGlobal(funcValueWithSignatureGlobalName)
-		if funcValueWithSignatureGlobal.IsNil() {
-			funcValueWithSignatureType := c.mod.GetTypeByName("runtime.funcValueWithSignature")
-			funcValueWithSignature := llvm.ConstNamedStruct(funcValueWithSignatureType, []llvm.Value{
-				llvm.ConstPtrToInt(funcPtr, c.uintptrType),
-				sigGlobal,
-			})
-			funcValueWithSignatureGlobal = llvm.AddGlobal(c.mod, funcValueWithSignatureType, funcValueWithSignatureGlobalName)
-			funcValueWithSignatureGlobal.SetInitializer(funcValueWithSignature)
-			funcValueWithSignatureGlobal.SetGlobalConstant(true)
-			funcValueWithSignatureGlobal.SetLinkage(llvm.InternalLinkage)
-		}
-		funcValueScalar = llvm.ConstPtrToInt(funcValueWithSignatureGlobal, c.uintptrType)
-	default:
-		panic("unimplemented func value variant")
-	}
-	funcValueType := c.getFuncType(sig)
-	funcValue := llvm.Undef(funcValueType)
-	funcValue = c.builder.CreateInsertValue(funcValue, context, 0, "")
-	funcValue = c.builder.CreateInsertValue(funcValue, funcValueScalar, 1, "")
-	return funcValue
-}
-
-// getFuncSignature returns a global for identification of a particular function
-// signature. It is used in runtime.funcValueWithSignature and in calls to
-// getFuncPtr.
-func (c *Compiler) getFuncSignature(sig *types.Signature) llvm.Value {
-	typeCodeName := getTypeCodeName(sig)
-	sigGlobalName := "reflect/types.type:" + typeCodeName
-	sigGlobal := c.mod.NamedGlobal(sigGlobalName)
-	if sigGlobal.IsNil() {
-		sigGlobal = llvm.AddGlobal(c.mod, c.ctx.Int8Type(), sigGlobalName)
-		sigGlobal.SetInitializer(llvm.Undef(c.ctx.Int8Type()))
-		sigGlobal.SetGlobalConstant(true)
-		sigGlobal.SetLinkage(llvm.InternalLinkage)
-	}
-	return sigGlobal
-}
-
-// extractFuncScalar returns some scalar that can be used in comparisons. It is
-// a cheap operation.
-func (c *Compiler) extractFuncScalar(funcValue llvm.Value) llvm.Value {
-	return c.builder.CreateExtractValue(funcValue, 1, "")
-}
-
-// extractFuncContext extracts the context pointer from this function value. It
-// is a cheap operation.
-func (c *Compiler) extractFuncContext(funcValue llvm.Value) llvm.Value {
-	return c.builder.CreateExtractValue(funcValue, 0, "")
-}
-
-// decodeFuncValue extracts the context and the function pointer from this func
-// value. This may be an expensive operation.
-func (c *Compiler) decodeFuncValue(funcValue llvm.Value, sig *types.Signature) (funcPtr, context llvm.Value, err error) {
-	context = c.builder.CreateExtractValue(funcValue, 0, "")
-	switch c.funcImplementation() {
-	case funcValueDoubleword:
-		funcPtr = c.builder.CreateExtractValue(funcValue, 1, "")
-	case funcValueSwitch:
-		llvmSig := c.getRawFuncType(sig)
-		sigGlobal := c.getFuncSignature(sig)
-		funcPtr = c.createRuntimeCall("getFuncPtr", []llvm.Value{funcValue, sigGlobal}, "")
-		funcPtr = c.builder.CreateIntToPtr(funcPtr, llvmSig, "")
-	default:
-		panic("unimplemented func value variant")
-	}
-	return
-}
-
-// getFuncType returns the type of a func value given a signature.
-func (c *Compiler) getFuncType(typ *types.Signature) llvm.Type {
-	switch c.funcImplementation() {
-	case funcValueDoubleword:
-		rawPtr := c.getRawFuncType(typ)
-		return c.ctx.StructType([]llvm.Type{c.i8ptrType, rawPtr}, false)
-	case funcValueSwitch:
-		return c.mod.GetTypeByName("runtime.funcValue")
-	default:
-		panic("unimplemented func value variant")
-	}
-}
-
-// getRawFuncType returns a LLVM function pointer type for a given signature.
-func (c *Compiler) getRawFuncType(typ *types.Signature) llvm.Type {
-	// Get the return type.
-	var returnType llvm.Type
-	switch typ.Results().Len() {
-	case 0:
-		// No return values.
-		returnType = c.ctx.VoidType()
-	case 1:
-		// Just one return value.
-		returnType = c.getLLVMType(typ.Results().At(0).Type())
-	default:
-		// Multiple return values. Put them together in a struct.
-		// This appears to be the common way to handle multiple return values in
-		// LLVM.
-		members := make([]llvm.Type, typ.Results().Len())
-		for i := 0; i < typ.Results().Len(); i++ {
-			members[i] = c.getLLVMType(typ.Results().At(i).Type())
-		}
-		returnType = c.ctx.StructType(members, false)
-	}
-
-	// Get the parameter types.
-	var paramTypes []llvm.Type
-	if typ.Recv() != nil {
-		recv := c.getLLVMType(typ.Recv().Type())
-		if recv.StructName() == "runtime._interface" {
-			// This is a call on an interface, not a concrete type.
-			// The receiver is not an interface, but a i8* type.
-			recv = c.i8ptrType
-		}
-		paramTypes = append(paramTypes, c.expandFormalParamType(recv)...)
-	}
-	for i := 0; i < typ.Params().Len(); i++ {
-		subType := c.getLLVMType(typ.Params().At(i).Type())
-		paramTypes = append(paramTypes, c.expandFormalParamType(subType)...)
-	}
-	// All functions take these parameters at the end.
-	paramTypes = append(paramTypes, c.i8ptrType) // context
-	paramTypes = append(paramTypes, c.i8ptrType) // parent coroutine
-
-	// Make a func type out of the signature.
-	return llvm.PointerType(llvm.FunctionType(returnType, paramTypes, false), c.funcPtrAddrSpace)
-}
-
-// parseMakeClosure makes a function value (with context) from the given
-// closure expression.
-func (c *Compiler) parseMakeClosure(frame *Frame, expr *ssa.MakeClosure) (llvm.Value, error) {
-	if len(expr.Bindings) == 0 {
-		panic("unexpected: MakeClosure without bound variables")
-	}
-	f := c.ir.GetFunction(expr.Fn.(*ssa.Function))
-
-	// Collect all bound variables.
-	boundVars := make([]llvm.Value, len(expr.Bindings))
-	for i, binding := range expr.Bindings {
-		// The context stores the bound variables.
-		llvmBoundVar := c.getValue(frame, binding)
-		boundVars[i] = llvmBoundVar
-	}
-
-	// Store the bound variables in a single object, allocating it on the heap
-	// if necessary.
-	context := c.emitPointerPack(boundVars)
-
-	// Create the closure.
-	return c.createFuncValue(f.LLVMFn, context, f.Signature), nil
-}

compiler/gc-pass-shadowstack.go

@@ -0,0 +1,199 @@
+package compiler
+
+// This file implements a compiler pass to move GC pointers to a "shadow stack"
+// that can easily be scanned by a garbage collector, even without platform
+// support.
+// For more information, see:
+//    https://llvm.org/docs/GarbageCollection.html#the-shadow-stack-gc
+
+import (
+	"github.com/aykevl/go-llvm"
+)
+
+// AddGCRoots moves pointer values to shadow stack frames when this function (or
+// any function it calls) may allocate something. This allows the GC to scan the
+// stack in a highly portable way.
+func (c *Compiler) AddGCRoots() {
+	alloc := c.mod.NamedFunction("runtime.alloc")
+	if alloc.IsNil() {
+		return
+	}
+
+	// Find all functions that do memory allocation.
+	worklist := []llvm.Value{alloc}
+	allocSet := make(map[llvm.Value]struct{})
+	allocList := make([]llvm.Value, 0, 4)
+	for len(worklist) != 0 {
+		// Pick the topmost.
+		f := worklist[len(worklist)-1]
+		worklist = worklist[:len(worklist)-1]
+		if _, ok := allocSet[f]; ok {
+			continue // already added to list
+		}
+		// Add to set of allocating functions.
+		allocSet[f] = struct{}{}
+		allocList = append(allocList, f)
+
+		// Add all callees to the worklist.
+		for _, use := range getUses(f) {
+			if use.IsACallInst().IsNil() {
+				// TODO: function pointers
+				panic("allocating function " + f.Name() + " used as function pointer")
+			}
+			parent := use.InstructionParent().Parent()
+			for i := 0; i < use.OperandsCount()-1; i++ {
+				if use.Operand(i) == f {
+					// TODO: function pointers
+					panic("allocating function " + f.Name() + " used as function pointer in " + parent.Name())
+				}
+			}
+			worklist = append(worklist, parent)
+		}
+	}
+
+	i8ptrPtrType := llvm.PointerType(c.i8ptrType, 0)
+	gcrootType := llvm.FunctionType(c.ctx.VoidType(), []llvm.Type{i8ptrPtrType, c.i8ptrType}, false)
+	gcroot := llvm.AddFunction(c.mod, "llvm.gcroot", gcrootType)
+
+	// Process every function that needs to save pointers to the shadow stack.
+	for _, fn := range allocList {
+		if fn == alloc {
+			// runtime.alloc itself should not be treated this way, it is a
+			// special case.
+			continue
+		}
+
+		// Check all instructions in this function and see whether the value
+		// needs to be kept on the shadow stack.
+		var values []llvm.Value // values to be kept in the shadow stack
+		for bb := fn.EntryBasicBlock(); !bb.IsNil(); bb = llvm.NextBasicBlock(bb) {
+			for inst := bb.FirstInstruction(); !inst.IsNil(); inst = llvm.NextInstruction(inst) {
+				if !typeHasPointer(inst.Type()) {
+					// This instruction does not result in a pointer value.
+					continue
+				}
+				// Check whether any of the uses may occur after a call to
+				// runtime.alloca. For example, if there are no call
+				// instructions between the definition and the use, then the
+				// pointer does not have to be stored in the shadow stack.
+				for _, use := range getUses(inst) {
+					if crossesAllocatingInst(inst, use, allocSet) {
+						values = append(values, inst)
+						break
+					}
+				}
+			}
+		}
+		if len(values) == 0 {
+			// The children of this function do allocations, but there is
+			// nothing to keep in a stack frame for this function.
+			continue
+		}
+		fn.SetGC("shadow-stack")
+
+		// Convert all values to be kept in the shadow stack to actually be in
+		// the shadow stack.
+		firstInst := fn.EntryBasicBlock().FirstInstruction()
+		for _, value := range values {
+			valueUses := getUses(value)
+			c.builder.SetInsertPointBefore(firstInst)
+			alloca := c.builder.CreateAlloca(value.Type(), "gcroot.value")
+			c.builder.SetInsertPointBefore(llvm.NextInstruction(value))
+			c.builder.CreateStore(value, alloca)
+			metadata := c.gcTypeMetadata(alloca.Type().ElementType())
+			allocaCast := alloca
+			if alloca.Type() != i8ptrPtrType {
+				allocaCast = c.builder.CreateBitCast(alloca, i8ptrPtrType, "")
+			}
+			c.builder.CreateCall(gcroot, []llvm.Value{allocaCast, metadata}, "")
+			for _, use := range valueUses {
+				c.builder.SetInsertPointBefore(use)
+				load := c.builder.CreateLoad(alloca, "")
+				for i := 0; i < use.OperandsCount(); i++ {
+					if use.Operand(i) == value {
+						use.SetOperand(i, load)
+					}
+				}
+			}
+		}
+	}
+	println(c.IR())
+}
+
+// typeHasPointer returns true if (and only if) the given type contains a
+// pointer value.
+func typeHasPointer(typ llvm.Type) bool {
+	switch typ.TypeKind() {
+	case llvm.PointerTypeKind:
+		return true
+	case llvm.ArrayTypeKind, llvm.VectorTypeKind:
+		return typeHasPointer(typ.ElementType())
+	case llvm.StructTypeKind:
+		return false
+		for _, subtyp := range typ.StructElementTypes() {
+			if typeHasPointer(subtyp) {
+				return true
+			}
+		}
+		return false
+	default:
+		return false
+	}
+}
+
+// gcTypeMetadata returns a pointer value to be used in the llvm.gcroot
+// intrinsic. It is either a null pointer or a number which is the number of
+// words in the stack slot for this value.
+func (c *Compiler) gcTypeMetadata(typ llvm.Type) llvm.Value {
+	if typ.TypeKind() == llvm.PointerTypeKind {
+		// Simple pointer. This is a common case, so signal this fact by setting
+		// the pointer to null.
+		return llvm.ConstPointerNull(c.i8ptrType)
+	}
+	if typ.TypeKind() == llvm.StructTypeKind {
+		// Check for structs that only contain a pointer at the start.
+		// We can pretend that such structs are a simple pointer, as the GC only
+		// needs to read the first word.
+		subTypes := typ.StructElementTypes()
+		onlyFirstPointer := subTypes[0].TypeKind() == llvm.PointerTypeKind
+		for _, subType := range subTypes[1:] {
+			if typeHasPointer(subType) {
+				onlyFirstPointer = false
+			}
+		}
+		if onlyFirstPointer {
+			// Types like string and slice.
+			return llvm.ConstPointerNull(c.i8ptrType)
+		}
+	}
+	allocaSize := c.targetData.TypeAllocSize(typ)
+	pointerAlignment := uint64(c.targetData.PrefTypeAlignment(c.i8ptrType))
+	numWords := allocaSize / pointerAlignment
+	// TODO: only return the number until all pointers are included in this
+	// struct, not more.
+	metadata := llvm.ConstIntToPtr(llvm.ConstInt(c.uintptrType, numWords, false), c.i8ptrType)
+	return metadata
+}
+
+// crossesAllocatingInst returns true if the given value may be used across a
+// call to runtime.alloc. This check is very conservative.
+func crossesAllocatingInst(from, to llvm.Value, allocSet map[llvm.Value]struct{}) bool {
+	if from.InstructionParent() != to.InstructionParent() {
+		// Don't try to check the CFG, conservatively assume there is an alloca
+		// in between these instructions.
+		return true
+	}
+	for inst := llvm.NextInstruction(from); inst != to; inst = llvm.NextInstruction(inst) {
+		if inst.IsACallInst().IsNil() {
+			// Not a call instruction thus not an alloca instruction.
+			continue
+		}
+		if _, ok := allocSet[inst.CalledValue()]; ok {
+			// This call is to a function that may do an allocation, or is even
+			// runtime.alloc itself.
+			// TODO: function pointers
+			return true
+		}
+	}
+	return false
+}

compiler/goroutine-lowering.go

@@ -1,598 +0,0 @@
-package compiler
-
-// This file lowers goroutine pseudo-functions into coroutines scheduled by a
-// scheduler at runtime. It uses coroutine support in LLVM for this
-// transformation: https://llvm.org/docs/Coroutines.html
-//
-// For example, take the following code:
-//
-//     func main() {
-//         go foo()
-//         time.Sleep(2 * time.Second)
-//         println("some other operation")
-//         i := bar()
-//         println("done", *i)
-//     }
-//
-//     func foo() {
-//         for {
-//             println("foo!")
-//             time.Sleep(time.Second)
-//         }
-//     }
-//
-//     func bar() *int {
-//         time.Sleep(time.Second)
-//         println("blocking operation completed)
-//         return new(int)
-//     }
-//
-// It is transformed by the IR generator in compiler.go into the following
-// pseudo-Go code:
-//
-//     func main() {
-//         fn := runtime.makeGoroutine(foo)
-//         fn()
-//         time.Sleep(2 * time.Second)
-//         println("some other operation")
-//         i := bar() // imagine an 'await' keyword in front of this call
-//         println("done", *i)
-//     }
-//
-//     func foo() {
-//         for {
-//             println("foo!")
-//             time.Sleep(time.Second)
-//         }
-//     }
-//
-//     func bar() *int {
-//         time.Sleep(time.Second)
-//         println("blocking operation completed)
-//         return new(int)
-//     }
-//
-// The pass in this file transforms this code even further, to the following
-// async/await style pseudocode:
-//
-//     func main(parent) {
-//         hdl := llvm.makeCoroutine()
-//         foo(nil)                                // do not pass the parent coroutine: this is an independent goroutine
-//         runtime.sleepTask(hdl, 2 * time.Second) // ask the scheduler to re-activate this coroutine at the right time
-//         llvm.suspend(hdl)                       // suspend point
-//         println("some other operation")
-//         var i *int                              // allocate space on the stack for the return value
-//         runtime.setTaskPromisePtr(hdl, &i)      // store return value alloca in our coroutine promise
-//         bar(hdl)                                // await, pass a continuation (hdl) to bar
-//         llvm.suspend(hdl)                       // suspend point, wait for the callee to re-activate
-//         println("done", *i)
-//         runtime.activateTask(parent)            // re-activate the parent (nop, there is no parent)
-//     }
-//
-//     func foo(parent) {
-//         hdl := llvm.makeCoroutine()
-//         for {
-//             println("foo!")
-//             runtime.sleepTask(hdl, time.Second) // ask the scheduler to re-activate this coroutine at the right time
-//             llvm.suspend(hdl)                   // suspend point
-//         }
-//     }
-//
-//     func bar(parent) {
-//         hdl := llvm.makeCoroutine()
-//         runtime.sleepTask(hdl, time.Second) // ask the scheduler to re-activate this coroutine at the right time
-//         llvm.suspend(hdl)                   // suspend point
-//         println("blocking operation completed)
-//         runtime.activateTask(parent)        // re-activate the parent coroutine before returning
-//     }
-//
-// The real LLVM code is more complicated, but this is the general idea.
-//
-// The LLVM coroutine passes will then process this file further transforming
-// these three functions into coroutines. Most of the actual work is done by the
-// scheduler, which runs in the background scheduling all coroutines.
-
-import (
-	"errors"
-	"strings"
-
-	"tinygo.org/x/go-llvm"
-)
-
-type asyncFunc struct {
-	taskHandle       llvm.Value
-	cleanupBlock     llvm.BasicBlock
-	suspendBlock     llvm.BasicBlock
-	unreachableBlock llvm.BasicBlock
-}
-
-// LowerGoroutines is a pass called during optimization that transforms the IR
-// into one where all blocking functions are turned into goroutines and blocking
-// calls into await calls.
-func (c *Compiler) LowerGoroutines() error {
-	needsScheduler, err := c.markAsyncFunctions()
-	if err != nil {
-		return err
-	}
-
-	uses := getUses(c.mod.NamedFunction("runtime.callMain"))
-	if len(uses) != 1 || uses[0].IsACallInst().IsNil() {
-		panic("expected exactly 1 call of runtime.callMain, check the entry point")
-	}
-	mainCall := uses[0]
-
-	// Replace call of runtime.callMain() with a real call to main.main(),
-	// optionally followed by a call to runtime.scheduler().
-	c.builder.SetInsertPointBefore(mainCall)
-	realMain := c.mod.NamedFunction(c.ir.MainPkg().Pkg.Path() + ".main")
-	c.builder.CreateCall(realMain, []llvm.Value{llvm.Undef(c.i8ptrType), llvm.ConstPointerNull(c.i8ptrType)}, "")
-	if needsScheduler {
-		c.createRuntimeCall("scheduler", nil, "")
-	}
-	mainCall.EraseFromParentAsInstruction()
-
-	if !needsScheduler {
-		go_scheduler := c.mod.NamedFunction("go_scheduler")
-		if !go_scheduler.IsNil() {
-			// This is the WebAssembly backend.
-			// There is no need to export the go_scheduler function, but it is
-			// still exported. Make sure it is optimized away.
-			go_scheduler.SetLinkage(llvm.InternalLinkage)
-		}
-	}
-
-	// main.main was set to external linkage during IR construction. Set it to
-	// internal linkage to enable interprocedural optimizations.
-	realMain.SetLinkage(llvm.InternalLinkage)
-	c.mod.NamedFunction("runtime.alloc").SetLinkage(llvm.InternalLinkage)
-	c.mod.NamedFunction("runtime.free").SetLinkage(llvm.InternalLinkage)
-	c.mod.NamedFunction("runtime.sleepTask").SetLinkage(llvm.InternalLinkage)
-	c.mod.NamedFunction("runtime.setTaskPromisePtr").SetLinkage(llvm.InternalLinkage)
-	c.mod.NamedFunction("runtime.getTaskPromisePtr").SetLinkage(llvm.InternalLinkage)
-	c.mod.NamedFunction("runtime.scheduler").SetLinkage(llvm.InternalLinkage)
-
-	return nil
-}
-
-// markAsyncFunctions does the bulk of the work of lowering goroutines. It
-// determines whether a scheduler is needed, and if it is, it transforms
-// blocking operations into goroutines and blocking calls into await calls.
-//
-// It does the following operations:
-//    * Find all blocking functions.
-//    * Determine whether a scheduler is necessary. If not, it skips the
-//      following operations.
-//    * Transform call instructions into await calls.
-//    * Transform return instructions into final suspends.
-//    * Set up the coroutine frames for async functions.
-//    * Transform blocking calls into their async equivalents.
-func (c *Compiler) markAsyncFunctions() (needsScheduler bool, err error) {
-	var worklist []llvm.Value
-
-	sleep := c.mod.NamedFunction("time.Sleep")
-	if !sleep.IsNil() {
-		worklist = append(worklist, sleep)
-	}
-	deadlockStub := c.mod.NamedFunction("runtime.deadlockStub")
-	if !deadlockStub.IsNil() {
-		worklist = append(worklist, deadlockStub)
-	}
-	chanSend := c.mod.NamedFunction("runtime.chanSend")
-	if !chanSend.IsNil() {
-		worklist = append(worklist, chanSend)
-	}
-	chanRecv := c.mod.NamedFunction("runtime.chanRecv")
-	if !chanRecv.IsNil() {
-		worklist = append(worklist, chanRecv)
-	}
-
-	if len(worklist) == 0 {
-		// There are no blocking operations, so no need to transform anything.
-		return false, c.lowerMakeGoroutineCalls()
-	}
-
-	// Find all async functions.
-	// Keep reducing this worklist by marking a function as recursively async
-	// from the worklist and pushing all its parents that are non-async.
-	// This is somewhat similar to a worklist in a mark-sweep garbage collector:
-	// the work items are then grey objects.
-	asyncFuncs := make(map[llvm.Value]*asyncFunc)
-	asyncList := make([]llvm.Value, 0, 4)
-	for len(worklist) != 0 {
-		// Pick the topmost.
-		f := worklist[len(worklist)-1]
-		worklist = worklist[:len(worklist)-1]
-		if _, ok := asyncFuncs[f]; ok {
-			continue // already processed
-		}
-		// Add to set of async functions.
-		asyncFuncs[f] = &asyncFunc{}
-		asyncList = append(asyncList, f)
-
-		// Add all callees to the worklist.
-		for _, use := range getUses(f) {
-			if use.IsConstant() && use.Opcode() == llvm.BitCast {
-				bitcastUses := getUses(use)
-				for _, call := range bitcastUses {
-					if call.IsACallInst().IsNil() || call.CalledValue().Name() != "runtime.makeGoroutine" {
-						return false, errors.New("async function " + f.Name() + " incorrectly used in bitcast, expected runtime.makeGoroutine")
-					}
-				}
-				// This is a go statement. Do not mark the parent as async, as
-				// starting a goroutine is not a blocking operation.
-				continue
-			}
-			if use.IsACallInst().IsNil() {
-				// Not a call instruction. Maybe a store to a global? In any
-				// case, this requires support for async calls across function
-				// pointers which is not yet supported.
-				return false, errors.New("async function " + f.Name() + " used as function pointer")
-			}
-			parent := use.InstructionParent().Parent()
-			for i := 0; i < use.OperandsCount()-1; i++ {
-				if use.Operand(i) == f {
-					return false, errors.New("async function " + f.Name() + " used as function pointer in " + parent.Name())
-				}
-			}
-			worklist = append(worklist, parent)
-		}
-	}
-
-	// Check whether a scheduler is needed.
-	makeGoroutine := c.mod.NamedFunction("runtime.makeGoroutine")
-	if c.GOOS == "js" && strings.HasPrefix(c.Triple, "wasm") {
-		// JavaScript always needs a scheduler, as in general no blocking
-		// operations are possible. Blocking operations block the browser UI,
-		// which is very bad.
-		needsScheduler = true
-	} else {
-		// Only use a scheduler when an async goroutine is started. When the
-		// goroutine is not async (does not do any blocking operation), no
-		// scheduler is necessary as it can be called directly.
-		for _, use := range getUses(makeGoroutine) {
-			// Input param must be const bitcast of function.
-			bitcast := use.Operand(0)
-			if !bitcast.IsConstant() || bitcast.Opcode() != llvm.BitCast {
-				panic("expected const bitcast operand of runtime.makeGoroutine")
-			}
-			goroutine := bitcast.Operand(0)
-			if _, ok := asyncFuncs[goroutine]; ok {
-				needsScheduler = true
-				break
-			}
-		}
-	}
-
-	if !needsScheduler {
-		// No scheduler is needed. Do not transform all functions here.
-		// However, make sure that all go calls (which are all non-async) are
-		// transformed into regular calls.
-		return false, c.lowerMakeGoroutineCalls()
-	}
-
-	// Create a few LLVM intrinsics for coroutine support.
-
-	coroIdType := llvm.FunctionType(c.ctx.TokenType(), []llvm.Type{c.ctx.Int32Type(), c.i8ptrType, c.i8ptrType, c.i8ptrType}, false)
-	coroIdFunc := llvm.AddFunction(c.mod, "llvm.coro.id", coroIdType)
-
-	coroSizeType := llvm.FunctionType(c.ctx.Int32Type(), nil, false)
-	coroSizeFunc := llvm.AddFunction(c.mod, "llvm.coro.size.i32", coroSizeType)
-
-	coroBeginType := llvm.FunctionType(c.i8ptrType, []llvm.Type{c.ctx.TokenType(), c.i8ptrType}, false)
-	coroBeginFunc := llvm.AddFunction(c.mod, "llvm.coro.begin", coroBeginType)
-
-	coroSuspendType := llvm.FunctionType(c.ctx.Int8Type(), []llvm.Type{c.ctx.TokenType(), c.ctx.Int1Type()}, false)
-	coroSuspendFunc := llvm.AddFunction(c.mod, "llvm.coro.suspend", coroSuspendType)
-
-	coroEndType := llvm.FunctionType(c.ctx.Int1Type(), []llvm.Type{c.i8ptrType, c.ctx.Int1Type()}, false)
-	coroEndFunc := llvm.AddFunction(c.mod, "llvm.coro.end", coroEndType)
-
-	coroFreeType := llvm.FunctionType(c.i8ptrType, []llvm.Type{c.ctx.TokenType(), c.i8ptrType}, false)
-	coroFreeFunc := llvm.AddFunction(c.mod, "llvm.coro.free", coroFreeType)
-
-	// Transform all async functions into coroutines.
-	for _, f := range asyncList {
-		if f == sleep || f == deadlockStub || f == chanSend || f == chanRecv {
-			continue
-		}
-
-		frame := asyncFuncs[f]
-		frame.cleanupBlock = c.ctx.AddBasicBlock(f, "task.cleanup")
-		frame.suspendBlock = c.ctx.AddBasicBlock(f, "task.suspend")
-		frame.unreachableBlock = c.ctx.AddBasicBlock(f, "task.unreachable")
-
-		// Scan for async calls and return instructions that need to have
-		// suspend points inserted.
-		var asyncCalls []llvm.Value
-		var returns []llvm.Value
-		for bb := f.EntryBasicBlock(); !bb.IsNil(); bb = llvm.NextBasicBlock(bb) {
-			for inst := bb.FirstInstruction(); !inst.IsNil(); inst = llvm.NextInstruction(inst) {
-				if !inst.IsACallInst().IsNil() {
-					callee := inst.CalledValue()
-					if _, ok := asyncFuncs[callee]; !ok || callee == sleep || callee == deadlockStub || callee == chanSend || callee == chanRecv {
-						continue
-					}
-					asyncCalls = append(asyncCalls, inst)
-				} else if !inst.IsAReturnInst().IsNil() {
-					returns = append(returns, inst)
-				}
-			}
-		}
-
-		// Coroutine setup.
-		c.builder.SetInsertPointBefore(f.EntryBasicBlock().FirstInstruction())
-		taskState := c.builder.CreateAlloca(c.mod.GetTypeByName("runtime.taskState"), "task.state")
-		stateI8 := c.builder.CreateBitCast(taskState, c.i8ptrType, "task.state.i8")
-		id := c.builder.CreateCall(coroIdFunc, []llvm.Value{
-			llvm.ConstInt(c.ctx.Int32Type(), 0, false),
-			stateI8,
-			llvm.ConstNull(c.i8ptrType),
-			llvm.ConstNull(c.i8ptrType),
-		}, "task.token")
-		size := c.builder.CreateCall(coroSizeFunc, nil, "task.size")
-		if c.targetData.TypeAllocSize(size.Type()) > c.targetData.TypeAllocSize(c.uintptrType) {
-			size = c.builder.CreateTrunc(size, c.uintptrType, "task.size.uintptr")
-		} else if c.targetData.TypeAllocSize(size.Type()) < c.targetData.TypeAllocSize(c.uintptrType) {
-			size = c.builder.CreateZExt(size, c.uintptrType, "task.size.uintptr")
-		}
-		data := c.createRuntimeCall("alloc", []llvm.Value{size}, "task.data")
-		frame.taskHandle = c.builder.CreateCall(coroBeginFunc, []llvm.Value{id, data}, "task.handle")
-
-		// Modify async calls so this function suspends right after the child
-		// returns, because the child is probably not finished yet. Wait until
-		// the child reactivates the parent.
-		for _, inst := range asyncCalls {
-			inst.SetOperand(inst.OperandsCount()-2, frame.taskHandle)
-
-			// Split this basic block.
-			await := c.splitBasicBlock(inst, llvm.NextBasicBlock(c.builder.GetInsertBlock()), "task.await")
-
-			// Allocate space for the return value.
-			var retvalAlloca llvm.Value
-			if inst.Type().TypeKind() != llvm.VoidTypeKind {
-				c.builder.SetInsertPointBefore(inst.InstructionParent().Parent().EntryBasicBlock().FirstInstruction())
-				retvalAlloca = c.builder.CreateAlloca(inst.Type(), "coro.retvalAlloca")
-				c.builder.SetInsertPointBefore(inst)
-				data := c.builder.CreateBitCast(retvalAlloca, c.i8ptrType, "")
-				c.createRuntimeCall("setTaskPromisePtr", []llvm.Value{frame.taskHandle, data}, "")
-			}
-
-			// Suspend.
-			c.builder.SetInsertPointAtEnd(inst.InstructionParent())
-			continuePoint := c.builder.CreateCall(coroSuspendFunc, []llvm.Value{
-				llvm.ConstNull(c.ctx.TokenType()),
-				llvm.ConstInt(c.ctx.Int1Type(), 0, false),
-			}, "")
-			sw := c.builder.CreateSwitch(continuePoint, frame.suspendBlock, 2)
-			sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 0, false), await)
-			sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 1, false), frame.cleanupBlock)
-
-			if inst.Type().TypeKind() != llvm.VoidTypeKind {
-				// Load the return value from the alloca. The callee has
-				// written the return value to it.
-				c.builder.SetInsertPointBefore(await.FirstInstruction())
-				retval := c.builder.CreateLoad(retvalAlloca, "coro.retval")
-				inst.ReplaceAllUsesWith(retval)
-			}
-		}
-
-		// Replace return instructions with suspend points that should
-		// reactivate the parent coroutine.
-		for _, inst := range returns {
-			// These properties were added by the functionattrs pass. Remove
-			// them, because now we start using the parameter.
-			// https://llvm.org/docs/Passes.html#functionattrs-deduce-function-attributes
-			for _, kind := range []string{"nocapture", "readnone"} {
-				kindID := llvm.AttributeKindID(kind)
-				f.RemoveEnumAttributeAtIndex(f.ParamsCount(), kindID)
-			}
-
-			c.builder.SetInsertPointBefore(inst)
-
-			var parentHandle llvm.Value
-			if f.Linkage() == llvm.ExternalLinkage {
-				// Exported function.
-				// Note that getTaskPromisePtr will panic if it is called with
-				// a nil pointer, so blocking exported functions that try to
-				// return anything will not work.
-				parentHandle = llvm.ConstPointerNull(c.i8ptrType)
-			} else {
-				parentHandle = f.LastParam()
-				if parentHandle.IsNil() || parentHandle.Name() != "parentHandle" {
-					// sanity check
-					panic("trying to make exported function async")
-				}
-			}
-
-			// Store return values.
-			switch inst.OperandsCount() {
-			case 0:
-				// Nothing to return.
-			case 1:
-				// Return this value by writing to the pointer stored in the
-				// parent handle. The parent coroutine has made an alloca that
-				// we can write to to store our return value.
-				returnValuePtr := c.createRuntimeCall("getTaskPromisePtr", []llvm.Value{parentHandle}, "coro.parentData")
-				alloca := c.builder.CreateBitCast(returnValuePtr, llvm.PointerType(inst.Operand(0).Type(), 0), "coro.parentAlloca")
-				c.builder.CreateStore(inst.Operand(0), alloca)
-			default:
-				panic("unreachable")
-			}
-
-			// Reactivate the parent coroutine. This adds it back to the run
-			// queue, so it is started again by the scheduler when possible
-			// (possibly right after the following suspend).
-			c.createRuntimeCall("activateTask", []llvm.Value{parentHandle}, "")
-
-			// Suspend this coroutine.
-			// It would look like this is unnecessary, but if this
-			// suspend point is left out, it leads to undefined
-			// behavior somehow (with the unreachable instruction).
-			continuePoint := c.builder.CreateCall(coroSuspendFunc, []llvm.Value{
-				llvm.ConstNull(c.ctx.TokenType()),
-				llvm.ConstInt(c.ctx.Int1Type(), 0, false),
-			}, "ret")
-			sw := c.builder.CreateSwitch(continuePoint, frame.suspendBlock, 2)
-			sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 0, false), frame.unreachableBlock)
-			sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 1, false), frame.cleanupBlock)
-			inst.EraseFromParentAsInstruction()
-		}
-
-		// Coroutine cleanup. Free resources associated with this coroutine.
-		c.builder.SetInsertPointAtEnd(frame.cleanupBlock)
-		mem := c.builder.CreateCall(coroFreeFunc, []llvm.Value{id, frame.taskHandle}, "task.data.free")
-		c.createRuntimeCall("free", []llvm.Value{mem}, "")
-		c.builder.CreateBr(frame.suspendBlock)
-
-		// Coroutine suspend. A call to llvm.coro.suspend() will branch here.
-		c.builder.SetInsertPointAtEnd(frame.suspendBlock)
-		c.builder.CreateCall(coroEndFunc, []llvm.Value{frame.taskHandle, llvm.ConstInt(c.ctx.Int1Type(), 0, false)}, "unused")
-		returnType := f.Type().ElementType().ReturnType()
-		if returnType.TypeKind() == llvm.VoidTypeKind {
-			c.builder.CreateRetVoid()
-		} else {
-			c.builder.CreateRet(llvm.Undef(returnType))
-		}
-
-		// Coroutine exit. All final suspends (return instructions) will branch
-		// here.
-		c.builder.SetInsertPointAtEnd(frame.unreachableBlock)
-		c.builder.CreateUnreachable()
-	}
-
-	// Replace calls to runtime.getCoroutineCall with the coroutine of this
-	// frame.
-	for _, getCoroutineCall := range getUses(c.mod.NamedFunction("runtime.getCoroutine")) {
-		frame := asyncFuncs[getCoroutineCall.InstructionParent().Parent()]
-		getCoroutineCall.ReplaceAllUsesWith(frame.taskHandle)
-		getCoroutineCall.EraseFromParentAsInstruction()
-	}
-
-	// Transform calls to time.Sleep() into coroutine suspend points.
-	for _, sleepCall := range getUses(sleep) {
-		// sleepCall must be a call instruction.
-		frame := asyncFuncs[sleepCall.InstructionParent().Parent()]
-		duration := sleepCall.Operand(0)
-
-		// Set task state to TASK_STATE_SLEEP and set the duration.
-		c.builder.SetInsertPointBefore(sleepCall)
-		c.createRuntimeCall("sleepTask", []llvm.Value{frame.taskHandle, duration}, "")
-
-		// Yield to scheduler.
-		continuePoint := c.builder.CreateCall(coroSuspendFunc, []llvm.Value{
-			llvm.ConstNull(c.ctx.TokenType()),
-			llvm.ConstInt(c.ctx.Int1Type(), 0, false),
-		}, "")
-		wakeup := c.splitBasicBlock(sleepCall, llvm.NextBasicBlock(c.builder.GetInsertBlock()), "task.wakeup")
-		c.builder.SetInsertPointBefore(sleepCall)
-		sw := c.builder.CreateSwitch(continuePoint, frame.suspendBlock, 2)
-		sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 0, false), wakeup)
-		sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 1, false), frame.cleanupBlock)
-		sleepCall.EraseFromParentAsInstruction()
-	}
-
-	// Transform calls to runtime.deadlockStub into coroutine suspends (without
-	// resume).
-	for _, deadlockCall := range getUses(deadlockStub) {
-		// deadlockCall must be a call instruction.
-		frame := asyncFuncs[deadlockCall.InstructionParent().Parent()]
-
-		// Exit coroutine.
-		c.builder.SetInsertPointBefore(deadlockCall)
-		continuePoint := c.builder.CreateCall(coroSuspendFunc, []llvm.Value{
-			llvm.ConstNull(c.ctx.TokenType()),
-			llvm.ConstInt(c.ctx.Int1Type(), 0, false),
-		}, "")
-		c.splitBasicBlock(deadlockCall, llvm.NextBasicBlock(c.builder.GetInsertBlock()), "task.wakeup.dead")
-		c.builder.SetInsertPointBefore(deadlockCall)
-		sw := c.builder.CreateSwitch(continuePoint, frame.suspendBlock, 2)
-		sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 0, false), frame.unreachableBlock)
-		sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 1, false), frame.cleanupBlock)
-		deadlockCall.EraseFromParentAsInstruction()
-	}
-
-	// Transform calls to runtime.chanSend into channel send operations.
-	for _, sendOp := range getUses(chanSend) {
-		// sendOp must be a call instruction.
-		frame := asyncFuncs[sendOp.InstructionParent().Parent()]
-
-		// Yield to scheduler.
-		c.builder.SetInsertPointBefore(llvm.NextInstruction(sendOp))
-		continuePoint := c.builder.CreateCall(coroSuspendFunc, []llvm.Value{
-			llvm.ConstNull(c.ctx.TokenType()),
-			llvm.ConstInt(c.ctx.Int1Type(), 0, false),
-		}, "")
-		sw := c.builder.CreateSwitch(continuePoint, frame.suspendBlock, 2)
-		wakeup := c.splitBasicBlock(sw, llvm.NextBasicBlock(c.builder.GetInsertBlock()), "task.sent")
-		sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 0, false), wakeup)
-		sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 1, false), frame.cleanupBlock)
-	}
-
-	// Transform calls to runtime.chanRecv into channel receive operations.
-	for _, recvOp := range getUses(chanRecv) {
-		// recvOp must be a call instruction.
-		frame := asyncFuncs[recvOp.InstructionParent().Parent()]
-
-		// Yield to scheduler.
-		c.builder.SetInsertPointBefore(llvm.NextInstruction(recvOp))
-		continuePoint := c.builder.CreateCall(coroSuspendFunc, []llvm.Value{
-			llvm.ConstNull(c.ctx.TokenType()),
-			llvm.ConstInt(c.ctx.Int1Type(), 0, false),
-		}, "")
-		sw := c.builder.CreateSwitch(continuePoint, frame.suspendBlock, 2)
-		wakeup := c.splitBasicBlock(sw, llvm.NextBasicBlock(c.builder.GetInsertBlock()), "task.received")
-		c.builder.SetInsertPointAtEnd(recvOp.InstructionParent())
-		sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 0, false), wakeup)
-		sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 1, false), frame.cleanupBlock)
-	}
-
-	return true, c.lowerMakeGoroutineCalls()
-}
-
-// Lower runtime.makeGoroutine calls to regular call instructions. This is done
-// after the regular goroutine transformations. The started goroutines are
-// either non-blocking (in which case they can be called directly) or blocking,
-// in which case they will ask the scheduler themselves to be rescheduled.
-func (c *Compiler) lowerMakeGoroutineCalls() error {
-	// The following Go code:
-	//   go startedGoroutine()
-	//
-	// Is translated to the following during IR construction, to preserve the
-	// fact that this function should be called as a new goroutine.
-	//   %0 = call i8* @runtime.makeGoroutine(i8* bitcast (void (i8*, i8*)* @main.startedGoroutine to i8*), i8* undef, i8* null)
-	//   %1 = bitcast i8* %0 to void (i8*, i8*)*
-	//   call void %1(i8* undef, i8* undef)
-	//
-	// This function rewrites it to a direct call:
-	//   call void @main.startedGoroutine(i8* undef, i8* null)
-
-	makeGoroutine := c.mod.NamedFunction("runtime.makeGoroutine")
-	for _, goroutine := range getUses(makeGoroutine) {
-		bitcastIn := goroutine.Operand(0)
-		origFunc := bitcastIn.Operand(0)
-		uses := getUses(goroutine)
-		if len(uses) != 1 || uses[0].IsABitCastInst().IsNil() {
-			return errors.New("expected exactly 1 bitcast use of runtime.makeGoroutine")
-		}
-		bitcastOut := uses[0]
-		uses = getUses(bitcastOut)
-		if len(uses) != 1 || uses[0].IsACallInst().IsNil() {
-			return errors.New("expected exactly 1 call use of runtime.makeGoroutine bitcast")
-		}
-		realCall := uses[0]
-
-		// Create call instruction.
-		var params []llvm.Value
-		for i := 0; i < realCall.OperandsCount()-1; i++ {
-			params = append(params, realCall.Operand(i))
-		}
-		params[len(params)-1] = llvm.ConstPointerNull(c.i8ptrType) // parent coroutine handle (must be nil)
-		c.builder.SetInsertPointBefore(realCall)
-		c.builder.CreateCall(origFunc, params, "")
-		realCall.EraseFromParentAsInstruction()
-		bitcastOut.EraseFromParentAsInstruction()
-		goroutine.EraseFromParentAsInstruction()
-	}
-
-	return nil
-}

compiler/inlineasm.go

@@ -1,155 +0,0 @@
-package compiler
-
-// This file implements inline asm support by calling special functions.
-
-import (
-	"fmt"
-	"go/constant"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/ssa"
-	"tinygo.org/x/go-llvm"
-)
-
-// This is a compiler builtin, which reads the given register by name:
-//
-//     func ReadRegister(name string) uintptr
-//
-// The register name must be a constant, for example "sp".
-func (c *Compiler) emitReadRegister(args []ssa.Value) (llvm.Value, error) {
-	fnType := llvm.FunctionType(c.uintptrType, []llvm.Type{}, false)
-	regname := constant.StringVal(args[0].(*ssa.Const).Value)
-	target := llvm.InlineAsm(fnType, "mov $0, "+regname, "=r", false, false, 0)
-	return c.builder.CreateCall(target, nil, ""), nil
-}
-
-// This is a compiler builtin, which emits a piece of inline assembly with no
-// operands or return values. It is useful for trivial instructions, like wfi in
-// ARM or sleep in AVR.
-//
-//     func Asm(asm string)
-//
-// The provided assembly must be a constant.
-func (c *Compiler) emitAsm(args []ssa.Value) (llvm.Value, error) {
-	// Magic function: insert inline assembly instead of calling it.
-	fnType := llvm.FunctionType(c.ctx.VoidType(), []llvm.Type{}, false)
-	asm := constant.StringVal(args[0].(*ssa.Const).Value)
-	target := llvm.InlineAsm(fnType, asm, "", true, false, 0)
-	return c.builder.CreateCall(target, nil, ""), nil
-}
-
-// This is a compiler builtin, which allows assembly to be called in a flexible
-// way.
-//
-//     func AsmFull(asm string, regs map[string]interface{})
-//
-// The asm parameter must be a constant string. The regs parameter must be
-// provided immediately. For example:
-//
-//     arm.AsmFull(
-//         "str {value}, {result}",
-//         map[string]interface{}{
-//             "value":  1
-//             "result": &dest,
-//         })
-func (c *Compiler) emitAsmFull(frame *Frame, instr *ssa.CallCommon) (llvm.Value, error) {
-	asmString := constant.StringVal(instr.Args[0].(*ssa.Const).Value)
-	registers := map[string]llvm.Value{}
-	registerMap := instr.Args[1].(*ssa.MakeMap)
-	for _, r := range *registerMap.Referrers() {
-		switch r := r.(type) {
-		case *ssa.DebugRef:
-			// ignore
-		case *ssa.MapUpdate:
-			if r.Block() != registerMap.Block() {
-				return llvm.Value{}, c.makeError(instr.Pos(), "register value map must be created in the same basic block")
-			}
-			key := constant.StringVal(r.Key.(*ssa.Const).Value)
-			//println("value:", r.Value.(*ssa.MakeInterface).X.String())
-			registers[key] = c.getValue(frame, r.Value.(*ssa.MakeInterface).X)
-		case *ssa.Call:
-			if r.Common() == instr {
-				break
-			}
-		default:
-			return llvm.Value{}, c.makeError(instr.Pos(), "don't know how to handle argument to inline assembly: "+r.String())
-		}
-	}
-	// TODO: handle dollar signs in asm string
-	registerNumbers := map[string]int{}
-	var err error
-	argTypes := []llvm.Type{}
-	args := []llvm.Value{}
-	constraints := []string{}
-	asmString = regexp.MustCompile("\\{[a-zA-Z]+\\}").ReplaceAllStringFunc(asmString, func(s string) string {
-		// TODO: skip strings like {r4} etc. that look like ARM push/pop
-		// instructions.
-		name := s[1 : len(s)-1]
-		if _, ok := registers[name]; !ok {
-			if err == nil {
-				err = c.makeError(instr.Pos(), "unknown register name: "+name)
-			}
-			return s
-		}
-		if _, ok := registerNumbers[name]; !ok {
-			registerNumbers[name] = len(registerNumbers)
-			argTypes = append(argTypes, registers[name].Type())
-			args = append(args, registers[name])
-			switch registers[name].Type().TypeKind() {
-			case llvm.IntegerTypeKind:
-				constraints = append(constraints, "r")
-			case llvm.PointerTypeKind:
-				constraints = append(constraints, "*m")
-			default:
-				err = c.makeError(instr.Pos(), "unknown type in inline assembly for value: "+name)
-				return s
-			}
-		}
-		return fmt.Sprintf("${%v}", registerNumbers[name])
-	})
-	if err != nil {
-		return llvm.Value{}, err
-	}
-	fnType := llvm.FunctionType(c.ctx.VoidType(), argTypes, false)
-	target := llvm.InlineAsm(fnType, asmString, strings.Join(constraints, ","), true, false, 0)
-	return c.builder.CreateCall(target, args, ""), nil
-}
-
-// This is a compiler builtin which emits an inline SVCall instruction. It can
-// be one of:
-//
-//     func SVCall0(num uintptr) uintptr
-//     func SVCall1(num uintptr, a1 interface{}) uintptr
-//     func SVCall2(num uintptr, a1, a2 interface{}) uintptr
-//     func SVCall3(num uintptr, a1, a2, a3 interface{}) uintptr
-//     func SVCall4(num uintptr, a1, a2, a3, a4 interface{}) uintptr
-//
-// The num parameter must be a constant. All other parameters may be any scalar
-// value supported by LLVM inline assembly.
-func (c *Compiler) emitSVCall(frame *Frame, args []ssa.Value) (llvm.Value, error) {
-	num, _ := constant.Uint64Val(args[0].(*ssa.Const).Value)
-	llvmArgs := []llvm.Value{}
-	argTypes := []llvm.Type{}
-	asm := "svc #" + strconv.FormatUint(num, 10)
-	constraints := "={r0}"
-	for i, arg := range args[1:] {
-		arg = arg.(*ssa.MakeInterface).X
-		if i == 0 {
-			constraints += ",0"
-		} else {
-			constraints += ",{r" + strconv.Itoa(i) + "}"
-		}
-		llvmValue := c.getValue(frame, arg)
-		llvmArgs = append(llvmArgs, llvmValue)
-		argTypes = append(argTypes, llvmValue.Type())
-	}
-	// Implement the ARM calling convention by marking r1-r3 as
-	// clobbered. r0 is used as an output register so doesn't have to be
-	// marked as clobbered.
-	constraints += ",~{r1},~{r2},~{r3}"
-	fnType := llvm.FunctionType(c.uintptrType, argTypes, false)
-	target := llvm.InlineAsm(fnType, asm, constraints, true, false, 0)
-	return c.builder.CreateCall(target, llvmArgs, ""), nil
-}

compiler/interface-lowering.go

@@ -4,6 +4,7 @@ package compiler
 // form, optimizing them in the process.
 //
 // During SSA construction, the following pseudo-calls are created:
+//     runtime.makeInterface(typecode, methodSet)
 //     runtime.typeAssert(typecode, assertedType)
 //     runtime.interfaceImplements(typecode, interfaceMethodSet)
 //     runtime.interfaceMethod(typecode, interfaceMethodSet, signature)
@@ -13,13 +14,16 @@ package compiler
 //
 // This pass lowers the above functions to their final form:
 //
+// makeInterface:
+//     Replaced with a constant typecode.
+//
 // typeAssert:
 //     Replaced with an icmp instruction so it can be directly used in a type
 //     switch. This is very easy to optimize for LLVM: it will often translate a
 //     type switch into a regular switch statement.
 //     When this type assert is not possible (the type is never used in an
-//     interface), this call is replaced with a constant false to optimize the
-//     type assert away completely.
+//     interface with makeInterface), this call is replaced with a constant
+//     false to optimize the type assert away completely.
 //
 // interfaceImplements:
 //     This call is translated into a call that checks whether the underlying
@@ -45,7 +49,7 @@ import (
 	"sort"
 	"strings"
 
-	"tinygo.org/x/go-llvm"
+	"github.com/aykevl/go-llvm"
 )
 
 // signatureInfo is a Go signature of an interface method. It does not represent
@@ -100,6 +104,15 @@ func (t *typeInfo) getMethod(signature *signatureInfo) *methodInfo {
 	panic("could not find method")
 }
 
+// id returns the fully-qualified type name including import path, removing the
+// $type suffix.
+func (t *typeInfo) id() string {
+	if !strings.HasSuffix(t.name, "$type") {
+		panic("concrete type does not have $type suffix: " + t.name)
+	}
+	return t.name[:len(t.name)-len("$type")]
+}
+
 // typeInfoSlice implements sort.Slice, sorting the most commonly used types
 // first.
 type typeInfoSlice []*typeInfo
@@ -162,36 +175,25 @@ func (c *Compiler) LowerInterfaces() {
 
 // run runs the pass itself.
 func (p *lowerInterfacesPass) run() {
-	// Collect all type codes.
-	typecodeIDPtr := llvm.PointerType(p.mod.GetTypeByName("runtime.typecodeID"), 0)
-	typeInInterfacePtr := llvm.PointerType(p.mod.GetTypeByName("runtime.typeInInterface"), 0)
-	var typesInInterfaces []llvm.Value
-	for global := p.mod.FirstGlobal(); !global.IsNil(); global = llvm.NextGlobal(global) {
-		switch global.Type() {
-		case typecodeIDPtr:
-			// Retrieve Go type information based on an opaque global variable.
-			// Only the name of the global is relevant, the object itself is
-			// discarded afterwards.
-			name := global.Name()
-			t := &typeInfo{
-				name:     name,
-				typecode: global,
-			}
-			p.types[name] = t
-		case typeInInterfacePtr:
-			// Count per type how often it is put in an interface. Also, collect
-			// all methods this type has (if it is named).
-			typesInInterfaces = append(typesInInterfaces, global)
-			initializer := global.Initializer()
-			typecode := llvm.ConstExtractValue(initializer, []uint32{0})
-			methodSet := llvm.ConstExtractValue(initializer, []uint32{1})
-			t := p.types[typecode.Name()]
-			p.addTypeMethods(t, methodSet)
-
-			// Count the number of MakeInterface instructions, for sorting the
-			// typecodes later.
-			t.countMakeInterfaces += len(getUses(global))
+	// Count per type how often it is put in an interface. Also, collect all
+	// methods this type has (if it is named).
+	makeInterface := p.mod.NamedFunction("runtime.makeInterface")
+	makeInterfaceUses := getUses(makeInterface)
+	for _, use := range makeInterfaceUses {
+		typecode := use.Operand(0)
+		name := typecode.Name()
+		if t, ok := p.types[name]; !ok {
+			// This is the first time this type has been seen, add it to the
+			// list of types.
+			t = p.addType(typecode)
+			p.addTypeMethods(t, use.Operand(1))
+		} else {
+			p.addTypeMethods(t, use.Operand(1))
 		}
+
+		// Count the number of MakeInterface instructions, for sorting the
+		// typecodes later.
+		p.types[name].countMakeInterfaces++
 	}
 
 	// Count per type how often it is type asserted on (e.g. in a switch
@@ -201,6 +203,9 @@ func (p *lowerInterfacesPass) run() {
 	for _, use := range typeAssertUses {
 		typecode := use.Operand(1)
 		name := typecode.Name()
+		if _, ok := p.types[name]; !ok {
+			p.addType(typecode)
+		}
 		p.types[name].countTypeAsserts++
 	}
 
@@ -290,6 +295,16 @@ func (p *lowerInterfacesPass) run() {
 		typecode := use.Operand(0)
 		signature := p.signatures[use.Operand(2).Name()]
 
+		// If the interface was created in the same function, we can insert a
+		// direct call. This may not happen often but it is an easy
+		// optimization so let's do it anyway.
+		if !typecode.IsACallInst().IsNil() && typecode.CalledValue() == makeInterface {
+			name := typecode.Operand(0).Name()
+			typ := p.types[name]
+			p.replaceInvokeWithCall(use, typ, signature)
+			continue
+		}
+
 		methodSet := use.Operand(1).Operand(0) // global variable
 		itf := p.interfaces[methodSet.Name()]
 		if len(itf.types) == 0 {
@@ -298,7 +313,7 @@ func (p *lowerInterfacesPass) run() {
 			// interface value should already have returned false.
 			// Replace the function pointer with undef (which will then be
 			// called), indicating to the optimizer this code is unreachable.
-			use.ReplaceAllUsesWith(llvm.Undef(p.uintptrType))
+			use.ReplaceAllUsesWith(llvm.Undef(p.i8ptrType))
 			use.EraseFromParentAsInstruction()
 		} else if len(itf.types) == 1 {
 			// There is only one implementation of the given type.
@@ -308,12 +323,12 @@ func (p *lowerInterfacesPass) run() {
 			// There are multiple types implementing this interface, thus there
 			// are multiple possible functions to call. Delegate calling the
 			// right function to a special wrapper function.
-			inttoptrs := getUses(use)
-			if len(inttoptrs) != 1 || inttoptrs[0].IsAIntToPtrInst().IsNil() {
-				panic("expected exactly one inttoptr use of runtime.interfaceMethod")
+			bitcasts := getUses(use)
+			if len(bitcasts) != 1 || bitcasts[0].IsABitCastInst().IsNil() {
+				panic("expected exactly one bitcast use of runtime.interfaceMethod")
 			}
-			inttoptr := inttoptrs[0]
-			calls := getUses(inttoptr)
+			bitcast := bitcasts[0]
+			calls := getUses(bitcast)
 			if len(calls) != 1 || calls[0].IsACallInst().IsNil() {
 				panic("expected exactly one call use of runtime.interfaceMethod")
 			}
@@ -334,14 +349,14 @@ func (p *lowerInterfacesPass) run() {
 			// call, after selecting the right concrete type.
 			redirector := p.getInterfaceMethodFunc(itf, signature, call.Type(), paramTypes)
 
-			// Replace the old lookup/inttoptr/call with the new call.
+			// Replace the old lookup/bitcast/call with the new call.
 			p.builder.SetInsertPointBefore(call)
 			retval := p.builder.CreateCall(redirector, params, "")
 			if retval.Type().TypeKind() != llvm.VoidTypeKind {
 				call.ReplaceAllUsesWith(retval)
 			}
 			call.EraseFromParentAsInstruction()
-			inttoptr.EraseFromParentAsInstruction()
+			bitcast.EraseFromParentAsInstruction()
 			use.EraseFromParentAsInstruction()
 		}
 	}
@@ -350,6 +365,20 @@ func (p *lowerInterfacesPass) run() {
 	// types, if possible.
 	for _, use := range interfaceImplementsUses {
 		actualType := use.Operand(0)
+		if !actualType.IsACallInst().IsNil() && actualType.CalledValue() == makeInterface {
+			// Type assert is in the same function that creates the interface
+			// value. This means the underlying type is already known so match
+			// on that.
+			// This may not happen often but it is an easy optimization.
+			name := actualType.Operand(0).Name()
+			typ := p.types[name]
+			p.builder.SetInsertPointBefore(use)
+			assertedType := p.builder.CreatePtrToInt(typ.typecode, p.uintptrType, "typeassert.typecode")
+			commaOk := p.builder.CreateICmp(llvm.IntEQ, assertedType, actualType, "typeassert.ok")
+			use.ReplaceAllUsesWith(commaOk)
+			use.EraseFromParentAsInstruction()
+			continue
+		}
 
 		methodSet := use.Operand(1).Operand(0) // global variable
 		itf := p.interfaces[methodSet.Name()]
@@ -386,7 +415,7 @@ func (p *lowerInterfacesPass) run() {
 	for _, t := range p.types {
 		typeSlice = append(typeSlice, t)
 	}
-	sort.Sort(sort.Reverse(typeSlice))
+	sort.Sort(typeSlice)
 
 	// A type code must fit in 16 bits.
 	if len(typeSlice) >= 1<<16 {
@@ -394,16 +423,16 @@ func (p *lowerInterfacesPass) run() {
 	}
 
 	// Assign a type code for each type.
-	p.assignTypeCodes(typeSlice)
+	for i, t := range typeSlice {
+		t.num = uint64(i + 1)
+	}
 
-	// Replace each use of a runtime.typeInInterface with the constant type
-	// code.
-	for _, global := range typesInInterfaces {
-		for _, use := range getUses(global) {
-			t := p.types[llvm.ConstExtractValue(global.Initializer(), []uint32{0}).Name()]
-			typecode := llvm.ConstInt(p.uintptrType, t.num, false)
-			use.ReplaceAllUsesWith(typecode)
-		}
+	// Replace each call to runtime.makeInterface with the constant type code.
+	for _, use := range makeInterfaceUses {
+		global := use.Operand(0)
+		t := p.types[global.Name()]
+		use.ReplaceAllUsesWith(llvm.ConstPtrToInt(t.typecode, p.uintptrType))
+		use.EraseFromParentAsInstruction()
 	}
 
 	// Replace each type assert with an actual type comparison or (if the type
@@ -415,7 +444,7 @@ func (p *lowerInterfacesPass) run() {
 		var commaOk llvm.Value
 		if t.countMakeInterfaces == 0 {
 			// impossible type assert: optimize accordingly
-			commaOk = llvm.ConstInt(p.ctx.Int1Type(), 0, false)
+			commaOk = llvm.ConstInt(llvm.Int1Type(), 0, false)
 		} else {
 			// regular type assert
 			p.builder.SetInsertPointBefore(use)
@@ -440,18 +469,12 @@ func (p *lowerInterfacesPass) run() {
 	// numbers.
 	for _, typ := range p.types {
 		for _, use := range getUses(typ.typecode) {
-			if !use.IsAConstantExpr().IsNil() && use.Opcode() == llvm.PtrToInt {
+			if use.IsConstant() && use.Opcode() == llvm.PtrToInt {
 				use.ReplaceAllUsesWith(llvm.ConstInt(p.uintptrType, typ.num, false))
 			}
 		}
 	}
 
-	// Remove stray runtime.typeInInterface globals. Required for the following
-	// cleanup.
-	for _, global := range typesInInterfaces {
-		global.EraseFromParentAsGlobal()
-	}
-
 	// Remove method sets of types. Unnecessary, but cleans up the IR for
 	// inspection.
 	for _, typ := range p.types {
@@ -462,6 +485,19 @@ func (p *lowerInterfacesPass) run() {
 	}
 }
 
+// addType retrieves Go type information based on a i16 global variable.
+// Only the name of the i16 is relevant, the object itself is const-propagated
+// and discared afterwards.
+func (p *lowerInterfacesPass) addType(typecode llvm.Value) *typeInfo {
+	name := typecode.Name()
+	t := &typeInfo{
+		name:     name,
+		typecode: typecode,
+	}
+	p.types[name] = t
+	return t
+}
+
 // addTypeMethods reads the method set of the given type info struct. It
 // retrieves the signatures and the references to the method functions
 // themselves for later type<->interface matching.
@@ -517,51 +553,22 @@ func (p *lowerInterfacesPass) getSignature(name string) *signatureInfo {
 	return p.signatures[name]
 }
 
-// replaceInvokeWithCall replaces a runtime.interfaceMethod + inttoptr with a
+// replaceInvokeWithCall replaces a runtime.interfaceMethod + bitcast with a
 // concrete method. This can be done when only one type implements the
 // interface.
 func (p *lowerInterfacesPass) replaceInvokeWithCall(use llvm.Value, typ *typeInfo, signature *signatureInfo) {
-	inttoptrs := getUses(use)
-	if len(inttoptrs) != 1 || inttoptrs[0].IsAIntToPtrInst().IsNil() {
-		panic("expected exactly one inttoptr use of runtime.interfaceMethod")
+	bitcasts := getUses(use)
+	if len(bitcasts) != 1 || bitcasts[0].IsABitCastInst().IsNil() {
+		panic("expected exactly one bitcast use of runtime.interfaceMethod")
 	}
-	inttoptr := inttoptrs[0]
+	bitcast := bitcasts[0]
 	function := typ.getMethod(signature).function
-	if inttoptr.Type() == function.Type() {
-		// Easy case: the types are the same. Simply replace the inttoptr
-		// result (which is directly called) with the actual function.
-		inttoptr.ReplaceAllUsesWith(function)
-	} else {
-		// Harder case: the type is not actually the same. Go through each call
-		// (of which there should be only one), extract the receiver params for
-		// this call and replace the call with a direct call to the target
-		// function.
-		for _, call := range getUses(inttoptr) {
-			if call.IsACallInst().IsNil() || call.CalledValue() != inttoptr {
-				panic("expected the inttoptr to be called as a method, this is not a method call")
-			}
-			operands := make([]llvm.Value, call.OperandsCount()-1)
-			for i := range operands {
-				operands[i] = call.Operand(i)
-			}
-			paramTypes := function.Type().ElementType().ParamTypes()
-			receiverParamTypes := paramTypes[:len(paramTypes)-(len(operands)-1)]
-			methodParamTypes := paramTypes[len(paramTypes)-(len(operands)-1):]
-			for i, methodParamType := range methodParamTypes {
-				if methodParamType != operands[i+1].Type() {
-					panic("expected method call param type and function param type to be the same")
-				}
-			}
-			p.builder.SetInsertPointBefore(call)
-			receiverParams := p.emitPointerUnpack(operands[0], receiverParamTypes)
-			result := p.builder.CreateCall(function, append(receiverParams, operands[1:]...), "")
-			if result.Type().TypeKind() != llvm.VoidTypeKind {
-				call.ReplaceAllUsesWith(result)
-			}
-			call.EraseFromParentAsInstruction()
-		}
+	if bitcast.Type() != function.Type() {
+		p.builder.SetInsertPointBefore(use)
+		function = p.builder.CreateBitCast(function, bitcast.Type(), "")
 	}
-	inttoptr.EraseFromParentAsInstruction()
+	bitcast.ReplaceAllUsesWith(function)
+	bitcast.EraseFromParentAsInstruction()
 	use.EraseFromParentAsInstruction()
 }
 
@@ -624,9 +631,9 @@ func (p *lowerInterfacesPass) createInterfaceImplementsFunc(itf *interfaceInfo)
 	p.builder.CreateRet(llvm.ConstInt(p.ctx.Int1Type(), 0, false))
 }
 
-// getInterfaceMethodFunc returns a thunk for calling a method on an interface.
-// It only declares the function, createInterfaceMethodFunc actually defines the
-// function.
+// getInterfaceMethodFunc return a function that returns a function pointer for
+// calling a method on an interface. It only declares the function,
+// createInterfaceMethodFunc actually defines the function.
 func (p *lowerInterfacesPass) getInterfaceMethodFunc(itf *interfaceInfo, signature *signatureInfo, returnType llvm.Type, params []llvm.Type) llvm.Value {
 	if fn, ok := itf.methodFuncs[signature]; ok {
 		// This function has already been created.
@@ -684,7 +691,7 @@ func (p *lowerInterfacesPass) createInterfaceMethodFunc(itf *interfaceInfo, sign
 
 	// Define all possible functions that can be called.
 	for _, typ := range itf.types {
-		bb := llvm.AddBasicBlock(fn, typ.name)
+		bb := llvm.AddBasicBlock(fn, typ.id())
 		sw.AddCase(llvm.ConstInt(p.uintptrType, typ.num, false), bb)
 
 		// The function we will redirect to when the interface has this type.

compiler/interface.go

@@ -8,12 +8,10 @@ package compiler
 import (
 	"go/token"
 	"go/types"
-	"strconv"
-	"strings"
 
-	"github.com/tinygo-org/tinygo/ir"
+	"github.com/aykevl/go-llvm"
+	"github.com/aykevl/tinygo/ir"
 	"golang.org/x/tools/go/ssa"
-	"tinygo.org/x/go-llvm"
 )
 
 // parseMakeInterface emits the LLVM IR for the *ssa.MakeInterface instruction.
@@ -22,148 +20,87 @@ import (
 // value field.
 //
 // An interface value is a {typecode, value} tuple, or {i16, i8*} to be exact.
-func (c *Compiler) parseMakeInterface(val llvm.Value, typ types.Type, pos token.Pos) llvm.Value {
-	itfValue := c.emitPointerPack([]llvm.Value{val})
-	itfTypeCodeGlobal := c.getTypeCode(typ)
-	itfMethodSetGlobal := c.getTypeMethodSet(typ)
-	itfConcreteTypeGlobal := c.mod.NamedGlobal("typeInInterface:" + itfTypeCodeGlobal.Name())
-	if itfConcreteTypeGlobal.IsNil() {
-		typeInInterface := c.mod.GetTypeByName("runtime.typeInInterface")
-		itfConcreteTypeGlobal = llvm.AddGlobal(c.mod, typeInInterface, "typeInInterface:"+itfTypeCodeGlobal.Name())
-		itfConcreteTypeGlobal.SetInitializer(llvm.ConstNamedStruct(typeInInterface, []llvm.Value{itfTypeCodeGlobal, itfMethodSetGlobal}))
-		itfConcreteTypeGlobal.SetGlobalConstant(true)
-		itfConcreteTypeGlobal.SetLinkage(llvm.PrivateLinkage)
+func (c *Compiler) parseMakeInterface(val llvm.Value, typ types.Type, global string, pos token.Pos) (llvm.Value, error) {
+	var itfValue llvm.Value
+	size := c.targetData.TypeAllocSize(val.Type())
+	if size > c.targetData.TypeAllocSize(c.i8ptrType) {
+		if global != "" {
+			// Allocate in a global variable.
+			global := llvm.AddGlobal(c.mod, val.Type(), global+"$itfvalue")
+			global.SetInitializer(val)
+			global.SetLinkage(llvm.InternalLinkage)
+			global.SetGlobalConstant(true)
+			zero := llvm.ConstInt(c.ctx.Int32Type(), 0, false)
+			itfValueRaw := llvm.ConstInBoundsGEP(global, []llvm.Value{zero, zero})
+			itfValue = llvm.ConstBitCast(itfValueRaw, c.i8ptrType)
+		} else {
+			// Allocate on the heap and put a pointer in the interface.
+			// TODO: escape analysis.
+			sizeValue := llvm.ConstInt(c.uintptrType, size, false)
+			alloc := c.createRuntimeCall("alloc", []llvm.Value{sizeValue}, "makeinterface.alloc")
+			itfValueCast := c.builder.CreateBitCast(alloc, llvm.PointerType(val.Type(), 0), "makeinterface.cast.value")
+			c.builder.CreateStore(val, itfValueCast)
+			itfValue = c.builder.CreateBitCast(itfValueCast, c.i8ptrType, "makeinterface.cast.i8ptr")
+		}
+	} else if size == 0 {
+		itfValue = llvm.ConstPointerNull(c.i8ptrType)
+	} else {
+		// Directly place the value in the interface.
+		switch val.Type().TypeKind() {
+		case llvm.IntegerTypeKind:
+			itfValue = c.builder.CreateIntToPtr(val, c.i8ptrType, "makeinterface.cast.int")
+		case llvm.PointerTypeKind:
+			itfValue = c.builder.CreateBitCast(val, c.i8ptrType, "makeinterface.cast.ptr")
+		case llvm.StructTypeKind:
+			// A bitcast would be useful here, but bitcast doesn't allow
+			// aggregate types. So we'll bitcast it using an alloca.
+			// Hopefully this will get optimized away.
+			mem := c.builder.CreateAlloca(c.i8ptrType, "makeinterface.cast.struct")
+			memStructPtr := c.builder.CreateBitCast(mem, llvm.PointerType(val.Type(), 0), "makeinterface.cast.struct.cast")
+			c.builder.CreateStore(val, memStructPtr)
+			itfValue = c.builder.CreateLoad(mem, "makeinterface.cast.load")
+		default:
+			return llvm.Value{}, c.makeError(pos, "todo: makeinterface: cast small type to i8*")
+		}
 	}
-	itfTypeCode := c.builder.CreatePtrToInt(itfConcreteTypeGlobal, c.uintptrType, "")
+	itfTypeCodeGlobal := c.getTypeCode(typ)
+	itfMethodSetGlobal, err := c.getTypeMethodSet(typ)
+	if err != nil {
+		return llvm.Value{}, nil
+	}
+	itfTypeCode := c.createRuntimeCall("makeInterface", []llvm.Value{itfTypeCodeGlobal, itfMethodSetGlobal}, "makeinterface.typecode")
 	itf := llvm.Undef(c.mod.GetTypeByName("runtime._interface"))
 	itf = c.builder.CreateInsertValue(itf, itfTypeCode, 0, "")
 	itf = c.builder.CreateInsertValue(itf, itfValue, 1, "")
-	return itf
+	return itf, nil
 }
 
 // getTypeCode returns a reference to a type code.
 // It returns a pointer to an external global which should be replaced with the
 // real type in the interface lowering pass.
 func (c *Compiler) getTypeCode(typ types.Type) llvm.Value {
-	globalName := "type:" + getTypeCodeName(typ)
-	global := c.mod.NamedGlobal(globalName)
+	global := c.mod.NamedGlobal(typ.String() + "$type")
 	if global.IsNil() {
-		global = llvm.AddGlobal(c.mod, c.mod.GetTypeByName("runtime.typecodeID"), globalName)
+		global = llvm.AddGlobal(c.mod, c.ctx.Int8Type(), typ.String()+"$type")
 		global.SetGlobalConstant(true)
 	}
 	return global
 }
 
-// getTypeCodeName returns a name for this type that can be used in the
-// interface lowering pass to assign type codes as expected by the reflect
-// package. See getTypeCodeNum.
-func getTypeCodeName(t types.Type) string {
-	name := ""
-	if named, ok := t.(*types.Named); ok {
-		name = "~" + named.String() + ":"
-		t = t.Underlying()
-	}
-	switch t := t.(type) {
-	case *types.Array:
-		return "array:" + name + strconv.FormatInt(t.Len(), 10) + ":" + getTypeCodeName(t.Elem())
-	case *types.Basic:
-		var kind string
-		switch t.Kind() {
-		case types.Bool:
-			kind = "bool"
-		case types.Int:
-			kind = "int"
-		case types.Int8:
-			kind = "int8"
-		case types.Int16:
-			kind = "int16"
-		case types.Int32:
-			kind = "int32"
-		case types.Int64:
-			kind = "int64"
-		case types.Uint:
-			kind = "uint"
-		case types.Uint8:
-			kind = "uint8"
-		case types.Uint16:
-			kind = "uint16"
-		case types.Uint32:
-			kind = "uint32"
-		case types.Uint64:
-			kind = "uint64"
-		case types.Uintptr:
-			kind = "uintptr"
-		case types.Float32:
-			kind = "float32"
-		case types.Float64:
-			kind = "float64"
-		case types.Complex64:
-			kind = "complex64"
-		case types.Complex128:
-			kind = "complex128"
-		case types.String:
-			kind = "string"
-		case types.UnsafePointer:
-			kind = "unsafeptr"
-		default:
-			panic("unknown basic type: " + t.Name())
-		}
-		return "basic:" + name + kind
-	case *types.Chan:
-		return "chan:" + name + getTypeCodeName(t.Elem())
-	case *types.Interface:
-		methods := make([]string, t.NumMethods())
-		for i := 0; i < t.NumMethods(); i++ {
-			methods[i] = getTypeCodeName(t.Method(i).Type())
-		}
-		return "interface:" + name + "{" + strings.Join(methods, ",") + "}"
-	case *types.Map:
-		keyType := getTypeCodeName(t.Key())
-		elemType := getTypeCodeName(t.Elem())
-		return "map:" + name + "{" + keyType + "," + elemType + "}"
-	case *types.Pointer:
-		return "pointer:" + name + getTypeCodeName(t.Elem())
-	case *types.Signature:
-		params := make([]string, t.Params().Len())
-		for i := 0; i < t.Params().Len(); i++ {
-			params[i] = getTypeCodeName(t.Params().At(i).Type())
-		}
-		results := make([]string, t.Results().Len())
-		for i := 0; i < t.Results().Len(); i++ {
-			results[i] = getTypeCodeName(t.Results().At(i).Type())
-		}
-		return "func:" + name + "{" + strings.Join(params, ",") + "}{" + strings.Join(results, ",") + "}"
-	case *types.Slice:
-		return "slice:" + name + getTypeCodeName(t.Elem())
-	case *types.Struct:
-		elems := make([]string, t.NumFields())
-		if t.NumFields() > 2 && t.Field(0).Name() == "C union" {
-			// TODO: report this as a normal error instead of panicking.
-			panic("cgo unions are not allowed in interfaces")
-		}
-		for i := 0; i < t.NumFields(); i++ {
-			elems[i] = getTypeCodeName(t.Field(i).Type())
-		}
-		return "struct:" + name + "{" + strings.Join(elems, ",") + "}"
-	default:
-		panic("unknown type: " + t.String())
-	}
-}
-
 // getTypeMethodSet returns a reference (GEP) to a global method set. This
 // method set should be unreferenced after the interface lowering pass.
-func (c *Compiler) getTypeMethodSet(typ types.Type) llvm.Value {
+func (c *Compiler) getTypeMethodSet(typ types.Type) (llvm.Value, error) {
 	global := c.mod.NamedGlobal(typ.String() + "$methodset")
 	zero := llvm.ConstInt(c.ctx.Int32Type(), 0, false)
 	if !global.IsNil() {
 		// the method set already exists
-		return llvm.ConstGEP(global, []llvm.Value{zero, zero})
+		return llvm.ConstGEP(global, []llvm.Value{zero, zero}), nil
 	}
 
 	ms := c.ir.Program.MethodSets.MethodSet(typ)
 	if ms.Len() == 0 {
 		// no methods, so can leave that one out
-		return llvm.ConstPointerNull(llvm.PointerType(c.mod.GetTypeByName("runtime.interfaceMethodInfo"), 0))
+		return llvm.ConstPointerNull(llvm.PointerType(c.mod.GetTypeByName("runtime.interfaceMethodInfo"), 0)), nil
 	}
 
 	methods := make([]llvm.Value, ms.Len())
@@ -176,10 +113,13 @@ func (c *Compiler) getTypeMethodSet(typ types.Type) llvm.Value {
 			// compiler error, so panic
 			panic("cannot find function: " + f.LinkName())
 		}
-		fn := c.getInterfaceInvokeWrapper(f)
+		fn, err := c.getInterfaceInvokeWrapper(f)
+		if err != nil {
+			return llvm.Value{}, err
+		}
 		methodInfo := llvm.ConstNamedStruct(interfaceMethodInfoType, []llvm.Value{
 			signatureGlobal,
-			llvm.ConstPtrToInt(fn, c.uintptrType),
+			llvm.ConstBitCast(fn, c.i8ptrType),
 		})
 		methods[i] = methodInfo
 	}
@@ -189,7 +129,7 @@ func (c *Compiler) getTypeMethodSet(typ types.Type) llvm.Value {
 	global.SetInitializer(value)
 	global.SetGlobalConstant(true)
 	global.SetLinkage(llvm.PrivateLinkage)
-	return llvm.ConstGEP(global, []llvm.Value{zero, zero})
+	return llvm.ConstGEP(global, []llvm.Value{zero, zero}), nil
 }
 
 // getInterfaceMethodSet returns a global variable with the method set of the
@@ -238,9 +178,19 @@ func (c *Compiler) getMethodSignature(method *types.Func) llvm.Value {
 //
 // Type asserts on concrete types are trivial: just compare type numbers. Type
 // asserts on interfaces are more difficult, see the comments in the function.
-func (c *Compiler) parseTypeAssert(frame *Frame, expr *ssa.TypeAssert) llvm.Value {
-	itf := c.getValue(frame, expr.X)
-	assertedType := c.getLLVMType(expr.AssertedType)
+func (c *Compiler) parseTypeAssert(frame *Frame, expr *ssa.TypeAssert) (llvm.Value, error) {
+	itf, err := c.parseExpr(frame, expr.X)
+	if err != nil {
+		return llvm.Value{}, err
+	}
+	assertedType, err := c.getLLVMType(expr.AssertedType)
+	if err != nil {
+		return llvm.Value{}, err
+	}
+	valueNil, err := c.getZeroValue(assertedType)
+	if err != nil {
+		return llvm.Value{}, err
+	}
 
 	actualTypeNum := c.builder.CreateExtractValue(itf, 0, "interface.type")
 	commaOk := llvm.Value{}
@@ -293,35 +243,71 @@ func (c *Compiler) parseTypeAssert(frame *Frame, expr *ssa.TypeAssert) llvm.Valu
 		// Type assert on concrete type. Extract the underlying type from
 		// the interface (but only after checking it matches).
 		valuePtr := c.builder.CreateExtractValue(itf, 1, "typeassert.value.ptr")
-		valueOk = c.emitPointerUnpack(valuePtr, []llvm.Type{assertedType})[0]
+		size := c.targetData.TypeAllocSize(assertedType)
+		if size > c.targetData.TypeAllocSize(c.i8ptrType) {
+			// Value was stored in an allocated buffer, load it from there.
+			valuePtrCast := c.builder.CreateBitCast(valuePtr, llvm.PointerType(assertedType, 0), "")
+			valueOk = c.builder.CreateLoad(valuePtrCast, "typeassert.value.ok")
+		} else if size == 0 {
+			valueOk, err = c.getZeroValue(assertedType)
+			if err != nil {
+				return llvm.Value{}, err
+			}
+		} else {
+			// Value was stored directly in the interface.
+			switch assertedType.TypeKind() {
+			case llvm.IntegerTypeKind:
+				valueOk = c.builder.CreatePtrToInt(valuePtr, assertedType, "typeassert.value.ok")
+			case llvm.PointerTypeKind:
+				valueOk = c.builder.CreateBitCast(valuePtr, assertedType, "typeassert.value.ok")
+			default: // struct, float, etc.
+				// A bitcast would be useful here, but bitcast doesn't allow
+				// aggregate types. So we'll bitcast it using an alloca.
+				// Hopefully this will get optimized away.
+				mem := c.builder.CreateAlloca(c.i8ptrType, "")
+				c.builder.CreateStore(valuePtr, mem)
+				memCast := c.builder.CreateBitCast(mem, llvm.PointerType(assertedType, 0), "")
+				valueOk = c.builder.CreateLoad(memCast, "typeassert.value.ok")
+			}
+		}
 	}
 	c.builder.CreateBr(nextBlock)
 
 	// Continue after the if statement.
 	c.builder.SetInsertPointAtEnd(nextBlock)
 	phi := c.builder.CreatePHI(assertedType, "typeassert.value")
-	phi.AddIncoming([]llvm.Value{c.getZeroValue(assertedType), valueOk}, []llvm.BasicBlock{prevBlock, okBlock})
+	phi.AddIncoming([]llvm.Value{valueNil, valueOk}, []llvm.BasicBlock{prevBlock, okBlock})
 
 	if expr.CommaOk {
 		tuple := c.ctx.ConstStruct([]llvm.Value{llvm.Undef(assertedType), llvm.Undef(c.ctx.Int1Type())}, false) // create empty tuple
 		tuple = c.builder.CreateInsertValue(tuple, phi, 0, "")                                                  // insert value
 		tuple = c.builder.CreateInsertValue(tuple, commaOk, 1, "")                                              // insert 'comma ok' boolean
-		return tuple
+		return tuple, nil
 	} else {
 		// This is kind of dirty as the branch above becomes mostly useless,
 		// but hopefully this gets optimized away.
 		c.createRuntimeCall("interfaceTypeAssert", []llvm.Value{commaOk}, "")
-		return phi
+		return phi, nil
 	}
 }
 
 // getInvokeCall creates and returns the function pointer and parameters of an
 // interface call. It can be used in a call or defer instruction.
-func (c *Compiler) getInvokeCall(frame *Frame, instr *ssa.CallCommon) (llvm.Value, []llvm.Value) {
+func (c *Compiler) getInvokeCall(frame *Frame, instr *ssa.CallCommon) (llvm.Value, []llvm.Value, error) {
 	// Call an interface method with dynamic dispatch.
-	itf := c.getValue(frame, instr.Value) // interface
+	itf, err := c.parseExpr(frame, instr.Value) // interface
+	if err != nil {
+		return llvm.Value{}, nil, err
+	}
 
-	llvmFnType := c.getRawFuncType(instr.Method.Type().(*types.Signature))
+	llvmFnType, err := c.getLLVMType(instr.Method.Type())
+	if err != nil {
+		return llvm.Value{}, nil, err
+	}
+	// getLLVMType() has created a closure type for us, but we don't actually
+	// want a closure type as an interface call can never be a closure call. So
+	// extract the function pointer type from the closure.
+	llvmFnType = llvmFnType.Subtypes()[1]
 
 	typecode := c.builder.CreateExtractValue(itf, 0, "invoke.typecode")
 	values := []llvm.Value{
@@ -330,20 +316,22 @@ func (c *Compiler) getInvokeCall(frame *Frame, instr *ssa.CallCommon) (llvm.Valu
 		c.getMethodSignature(instr.Method),
 	}
 	fn := c.createRuntimeCall("interfaceMethod", values, "invoke.func")
-	fnCast := c.builder.CreateIntToPtr(fn, llvmFnType, "invoke.func.cast")
+	fnCast := c.builder.CreateBitCast(fn, llvmFnType, "invoke.func.cast")
 	receiverValue := c.builder.CreateExtractValue(itf, 1, "invoke.func.receiver")
 
 	args := []llvm.Value{receiverValue}
 	for _, arg := range instr.Args {
-		args = append(args, c.getValue(frame, arg))
+		val, err := c.parseExpr(frame, arg)
+		if err != nil {
+			return llvm.Value{}, nil, err
+		}
+		args = append(args, val)
 	}
 	// Add the context parameter. An interface call never takes a context but we
 	// have to supply the parameter anyway.
 	args = append(args, llvm.Undef(c.i8ptrType))
-	// Add the parent goroutine handle.
-	args = append(args, llvm.Undef(c.i8ptrType))
 
-	return fnCast, args
+	return fnCast, args, nil
 }
 
 // interfaceInvokeWrapper keeps some state between getInterfaceInvokeWrapper and
@@ -359,16 +347,19 @@ type interfaceInvokeWrapper struct {
 // the underlying value, dereferences it, and calls the real method. This
 // wrapper is only needed when the interface value actually doesn't fit in a
 // pointer and a pointer to the value must be created.
-func (c *Compiler) getInterfaceInvokeWrapper(f *ir.Function) llvm.Value {
+func (c *Compiler) getInterfaceInvokeWrapper(f *ir.Function) (llvm.Value, error) {
 	wrapperName := f.LinkName() + "$invoke"
 	wrapper := c.mod.NamedFunction(wrapperName)
 	if !wrapper.IsNil() {
 		// Wrapper already created. Return it directly.
-		return wrapper
+		return wrapper, nil
 	}
 
 	// Get the expanded receiver type.
-	receiverType := c.getLLVMType(f.Params[0].Type())
+	receiverType, err := c.getLLVMType(f.Params[0].Type())
+	if err != nil {
+		return llvm.Value{}, err
+	}
 	expandedReceiverType := c.expandFormalParamType(receiverType)
 
 	// Does this method even need any wrapping?
@@ -377,7 +368,7 @@ func (c *Compiler) getInterfaceInvokeWrapper(f *ir.Function) llvm.Value {
 		// Casting a function signature to a different signature and calling it
 		// with a receiver pointer bitcasted to *i8 (as done in calls on an
 		// interface) is hopefully a safe (defined) operation.
-		return f.LLVMFn
+		return f.LLVMFn, nil
 	}
 
 	// create wrapper function
@@ -390,12 +381,12 @@ func (c *Compiler) getInterfaceInvokeWrapper(f *ir.Function) llvm.Value {
 		wrapper:      wrapper,
 		receiverType: receiverType,
 	})
-	return wrapper
+	return wrapper, nil
 }
 
 // createInterfaceInvokeWrapper finishes the work of getInterfaceInvokeWrapper,
 // see that function for details.
-func (c *Compiler) createInterfaceInvokeWrapper(state interfaceInvokeWrapper) {
+func (c *Compiler) createInterfaceInvokeWrapper(state interfaceInvokeWrapper) error {
 	wrapper := state.wrapper
 	fn := state.fn
 	receiverType := state.receiverType
@@ -405,7 +396,10 @@ func (c *Compiler) createInterfaceInvokeWrapper(state interfaceInvokeWrapper) {
 	// add debug info if needed
 	if c.Debug {
 		pos := c.ir.Program.Fset.Position(fn.Pos())
-		difunc := c.attachDebugInfoRaw(fn, wrapper, "$invoke", pos.Filename, pos.Line)
+		difunc, err := c.attachDebugInfoRaw(fn, wrapper, "$invoke", pos.Filename, pos.Line)
+		if err != nil {
+			return err
+		}
 		c.builder.SetCurrentDebugLocation(uint(pos.Line), uint(pos.Column), difunc, llvm.Metadata{})
 	}
 
@@ -413,7 +407,28 @@ func (c *Compiler) createInterfaceInvokeWrapper(state interfaceInvokeWrapper) {
 	block := c.ctx.AddBasicBlock(wrapper, "entry")
 	c.builder.SetInsertPointAtEnd(block)
 
-	receiverValue := c.emitPointerUnpack(wrapper.Param(0), []llvm.Type{receiverType})[0]
+	var receiverPtr llvm.Value
+	if c.targetData.TypeAllocSize(receiverType) > c.targetData.TypeAllocSize(c.i8ptrType) {
+		// The receiver is passed in using a pointer. We have to load it here
+		// and pass it by value to the real function.
+
+		// Load the underlying value.
+		receiverPtrType := llvm.PointerType(receiverType, 0)
+		receiverPtr = c.builder.CreateBitCast(wrapper.Param(0), receiverPtrType, "receiver.ptr")
+	} else {
+		// The value is stored in the interface, but it is of type struct which
+		// is expanded to multiple parameters (e.g. {i8, i8}). So we have to
+		// receive the struct as parameter, expand it, and pass it on to the
+		// real function.
+
+		// Cast the passed-in i8* to the struct value (using an alloca) and
+		// extract its values.
+		alloca := c.builder.CreateAlloca(c.i8ptrType, "receiver.alloca")
+		c.builder.CreateStore(wrapper.Param(0), alloca)
+		receiverPtr = c.builder.CreateBitCast(alloca, llvm.PointerType(receiverType, 0), "receiver.ptr")
+	}
+
+	receiverValue := c.builder.CreateLoad(receiverPtr, "receiver")
 	params := append(c.expandFormalParam(receiverValue), wrapper.Params()[1:]...)
 	if fn.LLVMFn.Type().ElementType().ReturnType().TypeKind() == llvm.VoidTypeKind {
 		c.builder.CreateCall(fn.LLVMFn, params, "")
@@ -422,4 +437,6 @@ func (c *Compiler) createInterfaceInvokeWrapper(state interfaceInvokeWrapper) {
 		ret := c.builder.CreateCall(fn.LLVMFn, params, "ret")
 		c.builder.CreateRet(ret)
 	}
+
+	return nil
 }

compiler/llvm.go

@@ -1,154 +0,0 @@
-package compiler
-
-import (
-	"tinygo.org/x/go-llvm"
-)
-
-// This file contains helper functions for LLVM that are not exposed in the Go
-// bindings.
-
-// Return a list of values (actually, instructions) where this value is used as
-// an operand.
-func getUses(value llvm.Value) []llvm.Value {
-	if value.IsNil() {
-		return nil
-	}
-	var uses []llvm.Value
-	use := value.FirstUse()
-	for !use.IsNil() {
-		uses = append(uses, use.User())
-		use = use.NextUse()
-	}
-	return uses
-}
-
-// createEntryBlockAlloca creates a new alloca in the entry block, even though
-// the IR builder is located elsewhere. It assumes that the insert point is
-// at the end of the current block.
-func (c *Compiler) createEntryBlockAlloca(t llvm.Type, name string) llvm.Value {
-	currentBlock := c.builder.GetInsertBlock()
-	entryBlock := currentBlock.Parent().EntryBasicBlock()
-	if entryBlock.FirstInstruction().IsNil() {
-		c.builder.SetInsertPointAtEnd(entryBlock)
-	} else {
-		c.builder.SetInsertPointBefore(entryBlock.FirstInstruction())
-	}
-	alloca := c.builder.CreateAlloca(t, name)
-	c.builder.SetInsertPointAtEnd(currentBlock)
-	return alloca
-}
-
-// createTemporaryAlloca creates a new alloca in the entry block and adds
-// lifetime start infromation in the IR signalling that the alloca won't be used
-// before this point.
-//
-// This is useful for creating temporary allocas for intrinsics. Don't forget to
-// end the lifetime using emitLifetimeEnd after you're done with it.
-func (c *Compiler) createTemporaryAlloca(t llvm.Type, name string) (alloca, bitcast, size llvm.Value) {
-	alloca = c.createEntryBlockAlloca(t, name)
-	bitcast = c.builder.CreateBitCast(alloca, c.i8ptrType, name+".bitcast")
-	size = llvm.ConstInt(c.ctx.Int64Type(), c.targetData.TypeAllocSize(t), false)
-	c.builder.CreateCall(c.getLifetimeStartFunc(), []llvm.Value{size, bitcast}, "")
-	return
-}
-
-// emitLifetimeEnd signals the end of an (alloca) lifetime by calling the
-// llvm.lifetime.end intrinsic. It is commonly used together with
-// createTemporaryAlloca.
-func (c *Compiler) emitLifetimeEnd(ptr, size llvm.Value) {
-	c.builder.CreateCall(c.getLifetimeEndFunc(), []llvm.Value{size, ptr}, "")
-}
-
-// getLifetimeStartFunc returns the llvm.lifetime.start intrinsic and creates it
-// first if it doesn't exist yet.
-func (c *Compiler) getLifetimeStartFunc() llvm.Value {
-	fn := c.mod.NamedFunction("llvm.lifetime.start.p0i8")
-	if fn.IsNil() {
-		fnType := llvm.FunctionType(c.ctx.VoidType(), []llvm.Type{c.ctx.Int64Type(), c.i8ptrType}, false)
-		fn = llvm.AddFunction(c.mod, "llvm.lifetime.start.p0i8", fnType)
-	}
-	return fn
-}
-
-// getLifetimeEndFunc returns the llvm.lifetime.end intrinsic and creates it
-// first if it doesn't exist yet.
-func (c *Compiler) getLifetimeEndFunc() llvm.Value {
-	fn := c.mod.NamedFunction("llvm.lifetime.end.p0i8")
-	if fn.IsNil() {
-		fnType := llvm.FunctionType(c.ctx.VoidType(), []llvm.Type{c.ctx.Int64Type(), c.i8ptrType}, false)
-		fn = llvm.AddFunction(c.mod, "llvm.lifetime.end.p0i8", fnType)
-	}
-	return fn
-}
-
-// splitBasicBlock splits a LLVM basic block into two parts. All instructions
-// after afterInst are moved into a new basic block (created right after the
-// current one) with the given name.
-func (c *Compiler) splitBasicBlock(afterInst llvm.Value, insertAfter llvm.BasicBlock, name string) llvm.BasicBlock {
-	oldBlock := afterInst.InstructionParent()
-	newBlock := c.ctx.InsertBasicBlock(insertAfter, name)
-	var nextInstructions []llvm.Value // values to move
-
-	// Collect to-be-moved instructions.
-	inst := afterInst
-	for {
-		inst = llvm.NextInstruction(inst)
-		if inst.IsNil() {
-			break
-		}
-		nextInstructions = append(nextInstructions, inst)
-	}
-
-	// Move instructions.
-	c.builder.SetInsertPointAtEnd(newBlock)
-	for _, inst := range nextInstructions {
-		inst.RemoveFromParentAsInstruction()
-		c.builder.Insert(inst)
-	}
-
-	// Find PHI nodes to update.
-	var phiNodes []llvm.Value // PHI nodes to update
-	for bb := insertAfter.Parent().FirstBasicBlock(); !bb.IsNil(); bb = llvm.NextBasicBlock(bb) {
-		for inst := bb.FirstInstruction(); !inst.IsNil(); inst = llvm.NextInstruction(inst) {
-			if inst.IsAPHINode().IsNil() {
-				continue
-			}
-			needsUpdate := false
-			incomingCount := inst.IncomingCount()
-			for i := 0; i < incomingCount; i++ {
-				if inst.IncomingBlock(i) == oldBlock {
-					needsUpdate = true
-					break
-				}
-			}
-			if !needsUpdate {
-				// PHI node has no incoming edge from the old block.
-				continue
-			}
-			phiNodes = append(phiNodes, inst)
-		}
-	}
-
-	// Update PHI nodes.
-	for _, phi := range phiNodes {
-		c.builder.SetInsertPointBefore(phi)
-		newPhi := c.builder.CreatePHI(phi.Type(), "")
-		incomingCount := phi.IncomingCount()
-		incomingVals := make([]llvm.Value, incomingCount)
-		incomingBlocks := make([]llvm.BasicBlock, incomingCount)
-		for i := 0; i < incomingCount; i++ {
-			value := phi.IncomingValue(i)
-			block := phi.IncomingBlock(i)
-			if block == oldBlock {
-				block = newBlock
-			}
-			incomingVals[i] = value
-			incomingBlocks[i] = block
-		}
-		newPhi.AddIncoming(incomingVals, incomingBlocks)
-		phi.ReplaceAllUsesWith(newPhi)
-		phi.EraseFromParentAsInstruction()
-	}
-
-	return newBlock
-}

compiler/map.go

@@ -6,18 +6,16 @@ import (
 	"go/token"
 	"go/types"
 
-	"tinygo.org/x/go-llvm"
+	"github.com/aykevl/go-llvm"
 )
 
 func (c *Compiler) emitMapLookup(keyType, valueType types.Type, m, key llvm.Value, commaOk bool, pos token.Pos) (llvm.Value, error) {
-	llvmValueType := c.getLLVMType(valueType)
-
-	// Allocate the memory for the resulting type. Do not zero this memory: it
-	// will be zeroed by the hashmap get implementation if the key is not
-	// present in the map.
-	mapValueAlloca, mapValuePtr, mapValueSize := c.createTemporaryAlloca(llvmValueType, "hashmap.value")
-
-	// Do the lookup. How it is done depends on the key type.
+	llvmValueType, err := c.getLLVMType(valueType)
+	if err != nil {
+		return llvm.Value{}, err
+	}
+	mapValueAlloca := c.builder.CreateAlloca(llvmValueType, "hashmap.value")
+	mapValuePtr := c.builder.CreateBitCast(mapValueAlloca, c.i8ptrType, "hashmap.valueptr")
 	var commaOkValue llvm.Value
 	if t, ok := keyType.(*types.Basic); ok && t.Info()&types.IsString != 0 {
 		// key is a string
@@ -25,24 +23,15 @@ func (c *Compiler) emitMapLookup(keyType, valueType types.Type, m, key llvm.Valu
 		commaOkValue = c.createRuntimeCall("hashmapStringGet", params, "")
 	} else if hashmapIsBinaryKey(keyType) {
 		// key can be compared with runtime.memequal
-		// Store the key in an alloca, in the entry block to avoid dynamic stack
-		// growth.
-		mapKeyAlloca, mapKeyPtr, mapKeySize := c.createTemporaryAlloca(key.Type(), "hashmap.key")
-		c.builder.CreateStore(key, mapKeyAlloca)
-		// Fetch the value from the hashmap.
-		params := []llvm.Value{m, mapKeyPtr, mapValuePtr}
+		keyAlloca := c.builder.CreateAlloca(key.Type(), "hashmap.key")
+		c.builder.CreateStore(key, keyAlloca)
+		keyPtr := c.builder.CreateBitCast(keyAlloca, c.i8ptrType, "hashmap.keyptr")
+		params := []llvm.Value{m, keyPtr, mapValuePtr}
 		commaOkValue = c.createRuntimeCall("hashmapBinaryGet", params, "")
-		c.emitLifetimeEnd(mapKeyPtr, mapKeySize)
 	} else {
-		// Not trivially comparable using memcmp.
-		return llvm.Value{}, c.makeError(pos, "only strings, bools, ints or structs of bools/ints are supported as map keys, but got: "+keyType.String())
+		return llvm.Value{}, c.makeError(pos, "todo: map lookup key type: "+keyType.String())
 	}
-
-	// Load the resulting value from the hashmap. The value is set to the zero
-	// value if the key doesn't exist in the hashmap.
 	mapValue := c.builder.CreateLoad(mapValueAlloca, "")
-	c.emitLifetimeEnd(mapValuePtr, mapValueSize)
-
 	if commaOk {
 		tuple := llvm.Undef(c.ctx.StructType([]llvm.Type{llvmValueType, c.ctx.Int1Type()}, false))
 		tuple = c.builder.CreateInsertValue(tuple, mapValue, 0, "")
@@ -53,25 +42,27 @@ func (c *Compiler) emitMapLookup(keyType, valueType types.Type, m, key llvm.Valu
 	}
 }
 
-func (c *Compiler) emitMapUpdate(keyType types.Type, m, key, value llvm.Value, pos token.Pos) {
-	valueAlloca, valuePtr, valueSize := c.createTemporaryAlloca(value.Type(), "hashmap.value")
+func (c *Compiler) emitMapUpdate(keyType types.Type, m, key, value llvm.Value, pos token.Pos) error {
+	valueAlloca := c.builder.CreateAlloca(value.Type(), "hashmap.value")
 	c.builder.CreateStore(value, valueAlloca)
+	valuePtr := c.builder.CreateBitCast(valueAlloca, c.i8ptrType, "hashmap.valueptr")
 	keyType = keyType.Underlying()
 	if t, ok := keyType.(*types.Basic); ok && t.Info()&types.IsString != 0 {
 		// key is a string
 		params := []llvm.Value{m, key, valuePtr}
 		c.createRuntimeCall("hashmapStringSet", params, "")
+		return nil
 	} else if hashmapIsBinaryKey(keyType) {
 		// key can be compared with runtime.memequal
-		keyAlloca, keyPtr, keySize := c.createTemporaryAlloca(key.Type(), "hashmap.key")
+		keyAlloca := c.builder.CreateAlloca(key.Type(), "hashmap.key")
 		c.builder.CreateStore(key, keyAlloca)
+		keyPtr := c.builder.CreateBitCast(keyAlloca, c.i8ptrType, "hashmap.keyptr")
 		params := []llvm.Value{m, keyPtr, valuePtr}
 		c.createRuntimeCall("hashmapBinarySet", params, "")
-		c.emitLifetimeEnd(keyPtr, keySize)
+		return nil
 	} else {
-		c.addError(pos, "only strings, bools, ints or structs of bools/ints are supported as map keys, but got: "+keyType.String())
+		return c.makeError(pos, "todo: map update key type: "+keyType.String())
 	}
-	c.emitLifetimeEnd(valuePtr, valueSize)
 }
 
 func (c *Compiler) emitMapDelete(keyType types.Type, m, key llvm.Value, pos token.Pos) error {
@@ -82,14 +73,14 @@ func (c *Compiler) emitMapDelete(keyType types.Type, m, key llvm.Value, pos toke
 		c.createRuntimeCall("hashmapStringDelete", params, "")
 		return nil
 	} else if hashmapIsBinaryKey(keyType) {
-		keyAlloca, keyPtr, keySize := c.createTemporaryAlloca(key.Type(), "hashmap.key")
+		keyAlloca := c.builder.CreateAlloca(key.Type(), "hashmap.key")
 		c.builder.CreateStore(key, keyAlloca)
+		keyPtr := c.builder.CreateBitCast(keyAlloca, c.i8ptrType, "hashmap.keyptr")
 		params := []llvm.Value{m, keyPtr}
 		c.createRuntimeCall("hashmapBinaryDelete", params, "")
-		c.emitLifetimeEnd(keyPtr, keySize)
 		return nil
 	} else {
-		return c.makeError(pos, "only strings, bools, ints or structs of bools/ints are supported as map keys, but got: "+keyType.String())
+		return c.makeError(pos, "todo: map delete key type: "+keyType.String())
 	}
 }
 
@@ -129,10 +120,6 @@ func hashmapIsBinaryKey(keyType types.Type) bool {
 			}
 		}
 		return true
-	case *types.Array:
-		return hashmapIsBinaryKey(keyType.Elem())
-	case *types.Named:
-		return hashmapIsBinaryKey(keyType.Underlying())
 	default:
 		return false
 	}

compiler/optimizer.go

@@ -3,7 +3,7 @@ package compiler
 import (
 	"errors"
 
-	"tinygo.org/x/go-llvm"
+	"github.com/aykevl/go-llvm"
 )
 
 // Run the LLVM optimizer over the module.
@@ -18,10 +18,6 @@ func (c *Compiler) Optimize(optLevel, sizeLevel int, inlinerThreshold uint) erro
 	}
 	builder.AddCoroutinePassesToExtensionPoints()
 
-	if c.PanicStrategy == "trap" {
-		c.replacePanicsWithTrap() // -panic=trap
-	}
-
 	// Run function passes for each function.
 	funcPasses := llvm.NewFunctionPassManagerForModule(c.mod)
 	defer funcPasses.Dispose()
@@ -47,7 +43,6 @@ func (c *Compiler) Optimize(optLevel, sizeLevel int, inlinerThreshold uint) erro
 		c.OptimizeStringToBytes()
 		c.OptimizeAllocs()
 		c.LowerInterfaces()
-		c.LowerFuncValues()
 
 		// After interfaces are lowered, there are many more opportunities for
 		// interprocedural optimizations. To get them to work, function
@@ -58,34 +53,12 @@ func (c *Compiler) Optimize(optLevel, sizeLevel int, inlinerThreshold uint) erro
 		c.OptimizeAllocs()
 		c.OptimizeStringToBytes()
 
-		// Lower runtime.isnil calls to regular nil comparisons.
-		isnil := c.mod.NamedFunction("runtime.isnil")
-		if !isnil.IsNil() {
-			for _, use := range getUses(isnil) {
-				c.builder.SetInsertPointBefore(use)
-				ptr := use.Operand(0)
-				if !ptr.IsABitCastInst().IsNil() {
-					ptr = ptr.Operand(0)
-				}
-				nilptr := llvm.ConstPointerNull(ptr.Type())
-				icmp := c.builder.CreateICmp(llvm.IntEQ, ptr, nilptr, "")
-				use.ReplaceAllUsesWith(icmp)
-				use.EraseFromParentAsInstruction()
-			}
-		}
-
-		err := c.LowerGoroutines()
-		if err != nil {
-			return err
+		if c.selectGC() == "shadowstack" {
+			c.AddGCRoots()
 		}
 	} else {
 		// Must be run at any optimization level.
 		c.LowerInterfaces()
-		c.LowerFuncValues()
-		err := c.LowerGoroutines()
-		if err != nil {
-			return err
-		}
 	}
 	if err := c.Verify(); err != nil {
 		return errors.New("optimizations caused a verification failure")
@@ -101,13 +74,6 @@ func (c *Compiler) Optimize(optLevel, sizeLevel int, inlinerThreshold uint) erro
 		}
 	}
 
-	// Run function passes again, because without it, llvm.coro.size.i32()
-	// doesn't get lowered.
-	for fn := c.mod.FirstFunction(); !fn.IsNil(); fn = llvm.NextFunction(fn) {
-		funcPasses.RunFunc(fn)
-	}
-	funcPasses.FinalizeFunc()
-
 	// Run module passes.
 	modPasses := llvm.NewPassManager()
 	defer modPasses.Dispose()
@@ -117,25 +83,6 @@ func (c *Compiler) Optimize(optLevel, sizeLevel int, inlinerThreshold uint) erro
 	return nil
 }
 
-// Replace panic calls with calls to llvm.trap, to reduce code size. This is the
-// -panic=trap intrinsic.
-func (c *Compiler) replacePanicsWithTrap() {
-	trap := c.mod.NamedFunction("llvm.trap")
-	for _, name := range []string{"runtime._panic", "runtime.runtimePanic"} {
-		fn := c.mod.NamedFunction(name)
-		if fn.IsNil() {
-			continue
-		}
-		for _, use := range getUses(fn) {
-			if use.IsACallInst().IsNil() || use.CalledValue() != fn {
-				panic("expected use of a panic function to be a call")
-			}
-			c.builder.SetInsertPointBefore(use)
-			c.builder.CreateCall(trap, nil, "")
-		}
-	}
-}
-
 // Eliminate created but not used maps.
 //
 // In the future, this should statically allocate created but never modified
@@ -272,7 +219,7 @@ func (c *Compiler) OptimizeAllocs() {
 			sizeInWords := (size + uint64(alignment) - 1) / uint64(alignment)
 			allocaType := llvm.ArrayType(c.ctx.IntType(alignment*8), int(sizeInWords))
 			alloca := c.builder.CreateAlloca(allocaType, "stackalloc.alloca")
-			zero := c.getZeroValue(alloca.Type().ElementType())
+			zero, _ := c.getZeroValue(alloca.Type().ElementType())
 			c.builder.CreateStore(zero, alloca)
 			stackalloc := c.builder.CreateBitCast(alloca, bitcast.Type(), "stackalloc")
 			bitcast.ReplaceAllUsesWith(stackalloc)
@@ -307,12 +254,21 @@ func (c *Compiler) doesEscape(value llvm.Value) bool {
 				return true
 			}
 		} else if use.IsACallInst() != nilValue {
+			// Call only escapes when the (pointer) parameter is not marked
+			// "nocapture". This flag means that the parameter does not escape
+			// the give function.
+			if use.CalledValue().IsAFunction() != nilValue {
+				if use.CalledValue().IsDeclaration() {
+					// Kind of dirty: assume external functions don't let
+					// pointers escape.
+					// TODO: introduce //go:noescape that sets the 'nocapture'
+					// flag on each input parameter.
+					continue
+				}
+			}
 			if !c.hasFlag(use, value, "nocapture") {
 				return true
 			}
-		} else if use.IsAICmpInst() != nilValue {
-			// Comparing pointers don't let the pointer escape.
-			// This is often a compiler-inserted nil check.
 		} else {
 			// Unknown instruction, might escape.
 			return true
@@ -372,3 +328,18 @@ func (c *Compiler) hasFlag(call, param llvm.Value, kind string) bool {
 	}
 	return true
 }
+
+// Return a list of values (actually, instructions) where this value is used as
+// an operand.
+func getUses(value llvm.Value) []llvm.Value {
+	if value.IsNil() {
+		return nil
+	}
+	var uses []llvm.Value
+	use := value.FirstUse()
+	for !use.IsNil() {
+		uses = append(uses, use.User())
+		use = use.NextUse()
+	}
+	return uses
+}

compiler/reflect.go

@@ -1,156 +0,0 @@
-package compiler
-
-import (
-	"math/big"
-	"strings"
-)
-
-var basicTypes = map[string]int64{
-	"bool":       1,
-	"int":        2,
-	"int8":       3,
-	"int16":      4,
-	"int32":      5,
-	"int64":      6,
-	"uint":       7,
-	"uint8":      8,
-	"uint16":     9,
-	"uint32":     10,
-	"uint64":     11,
-	"uintptr":    12,
-	"float32":    13,
-	"float64":    14,
-	"complex64":  15,
-	"complex128": 16,
-	"string":     17,
-	"unsafeptr":  18,
-}
-
-func (c *Compiler) assignTypeCodes(typeSlice typeInfoSlice) {
-	fn := c.mod.NamedFunction("reflect.ValueOf")
-	if fn.IsNil() {
-		// reflect.ValueOf is never used, so we can use the most efficient
-		// encoding possible.
-		for i, t := range typeSlice {
-			t.num = uint64(i + 1)
-		}
-		return
-	}
-
-	// Assign typecodes the way the reflect package expects.
-	fallbackIndex := 1
-	namedTypes := make(map[string]int)
-	for _, t := range typeSlice {
-		if t.name[:5] != "type:" {
-			panic("expected type name to start with 'type:'")
-		}
-		num := c.getTypeCodeNum(t.name[5:], &fallbackIndex, namedTypes)
-		if num.BitLen() > c.uintptrType.IntTypeWidth() || !num.IsUint64() {
-			// TODO: support this in some way, using a side table for example.
-			// That's less efficient but better than not working at all.
-			// Particularly important on systems with 16-bit pointers (e.g.
-			// AVR).
-			panic("compiler: could not store type code number inside interface type code")
-		}
-		t.num = num.Uint64()
-	}
-}
-
-// getTypeCodeNum returns the typecode for a given type as expected by the
-// reflect package. Also see getTypeCodeName, which serializes types to a string
-// based on a types.Type value for this function.
-func (c *Compiler) getTypeCodeNum(id string, fallbackIndex *int, namedTypes map[string]int) *big.Int {
-	// Note: see src/reflect/type.go for bit allocations.
-	// A type can be named or unnamed. Example of both:
-	//     basic:~foo:uint64
-	//     basic:uint64
-	// Extract the class (basic, slice, pointer, etc.), the name, and the
-	// contents of this type ID string. Allocate bits based on that, as
-	// src/runtime/types.go expects.
-	class := id[:strings.IndexByte(id, ':')]
-	value := id[len(class)+1:]
-	name := ""
-	if value[0] == '~' {
-		name = value[1:strings.IndexByte(value, ':')]
-		value = value[len(name)+2:]
-	}
-	if class == "basic" {
-		// Basic types follow the following bit pattern:
-		//    ...xxxxx0
-		// where xxxxx is allocated for the 18 possible basic types and all the
-		// upper bits are used to indicate the named type.
-		num, ok := basicTypes[value]
-		if !ok {
-			panic("invalid basic type: " + id)
-		}
-		if name != "" {
-			// This type is named, set the upper bits to the name ID.
-			num |= int64(getNamedTypeNum(namedTypes, name)) << 5
-		}
-		return big.NewInt(num << 1)
-	} else {
-		// Complex types use the following bit pattern:
-		//    ...nxxx1
-		// where xxx indicates the complex type (any non-basic type). The upper
-		// bits contain whatever the type contains. Types that wrap a single
-		// other type (channel, interface, pointer, slice) just contain the bits
-		// of the wrapped type. Other types (like struct) have a different
-		// method of encoding the contents of the type.
-		var num *big.Int
-		var classNumber int64
-		switch class {
-		case "chan":
-			num = c.getTypeCodeNum(value, fallbackIndex, namedTypes)
-			classNumber = 0
-		case "interface":
-			num = big.NewInt(int64(*fallbackIndex))
-			*fallbackIndex++
-			classNumber = 1
-		case "pointer":
-			num = c.getTypeCodeNum(value, fallbackIndex, namedTypes)
-			classNumber = 2
-		case "slice":
-			num = c.getTypeCodeNum(value, fallbackIndex, namedTypes)
-			classNumber = 3
-		case "array":
-			num = big.NewInt(int64(*fallbackIndex))
-			*fallbackIndex++
-			classNumber = 4
-		case "func":
-			num = big.NewInt(int64(*fallbackIndex))
-			*fallbackIndex++
-			classNumber = 5
-		case "map":
-			num = big.NewInt(int64(*fallbackIndex))
-			*fallbackIndex++
-			classNumber = 6
-		case "struct":
-			num = big.NewInt(int64(*fallbackIndex))
-			*fallbackIndex++
-			classNumber = 7
-		default:
-			panic("unknown type kind: " + id)
-		}
-		if name == "" {
-			num.Lsh(num, 5).Or(num, big.NewInt((classNumber<<1)+1))
-		} else {
-			// TODO: store num in a sidetable
-			num = big.NewInt(int64(getNamedTypeNum(namedTypes, name))<<1 | 1)
-			num.Lsh(num, 4).Or(num, big.NewInt((classNumber<<1)+1))
-		}
-		return num
-	}
-}
-
-// getNamedTypeNum returns an appropriate (unique) number for the given named
-// type. If the name already has a number that number is returned, else a new
-// number is returned. The number is always non-zero.
-func getNamedTypeNum(namedTypes map[string]int, name string) int {
-	if num, ok := namedTypes[name]; ok {
-		return num
-	} else {
-		num = len(namedTypes) + 1
-		namedTypes[name] = num
-		return num
-	}
-}

compiler/sizes.go

@@ -63,12 +63,6 @@ func (s *StdSizes) Alignof(T types.Type) int64 {
 
 func (s *StdSizes) Offsetsof(fields []*types.Var) []int64 {
 	offsets := make([]int64, len(fields))
-	if len(fields) > 1 && fields[0].Name() == "C union" {
-		// This struct contains the magic "C union" field which indicates that
-		// this is actually a union from CGo.
-		// All fields in the union start at 0 so return that.
-		return offsets // all fields are still set to 0
-	}
 	var o int64
 	for i, f := range fields {
 		a := s.Alignof(f.Type())
@@ -113,9 +107,6 @@ func (s *StdSizes) Sizeof(T types.Type) int64 {
 		if k == types.Uintptr {
 			return s.PtrSize
 		}
-		if k == types.UnsafePointer {
-			return s.PtrSize
-		}
 		panic("unknown basic type: " + t.String())
 	case *types.Array:
 		n := t.Len()
@@ -134,38 +125,11 @@ func (s *StdSizes) Sizeof(T types.Type) int64 {
 			return 0
 		}
 		fields := make([]*types.Var, t.NumFields())
-		maxAlign := int64(1)
 		for i := range fields {
-			field := t.Field(i)
-			fields[i] = field
-			al := s.Alignof(field.Type())
-			if al > maxAlign {
-				maxAlign = al
-			}
-		}
-		if fields[0].Name() == "C union" {
-			// Magic field that indicates this is a CGo union and not a struct.
-			// The size is the biggest element, aligned to the element with the
-			// biggest alignment. This is not necessarily the same, for example
-			// in the following union:
-			//     union { int32_t l; int16_t s[3] }
-			maxSize := int64(0)
-			for _, field := range fields[1:] {
-				si := s.Sizeof(field.Type())
-				if si > maxSize {
-					maxSize = si
-				}
-			}
-			return align(maxSize, maxAlign)
-		} else {
-			// This is a regular struct.
-			// Pick the size that fits this struct and add some alignment. Some
-			// structs have some extra padding at the end which should also be
-			// taken care of:
-			//     struct { int32 n; byte b }
-			offsets := s.Offsetsof(fields)
-			return align(offsets[n-1]+s.Sizeof(fields[n-1].Type()), maxAlign)
+			fields[i] = t.Field(i)
 		}
+		offsets := s.Offsetsof(fields)
+		return offsets[n-1] + s.Sizeof(fields[n-1].Type())
 	case *types.Interface:
 		return s.PtrSize * 2
 	case *types.Pointer:

compiler/syscall.go

@@ -1,167 +0,0 @@
-package compiler
-
-// This file implements the syscall.Syscall and syscall.Syscall6 instructions as
-// compiler builtins.
-
-import (
-	"go/constant"
-	"strconv"
-
-	"golang.org/x/tools/go/ssa"
-	"tinygo.org/x/go-llvm"
-)
-
-// emitSyscall emits an inline system call instruction, depending on the target
-// OS/arch.
-func (c *Compiler) emitSyscall(frame *Frame, call *ssa.CallCommon) (llvm.Value, error) {
-	num, _ := constant.Uint64Val(call.Args[0].(*ssa.Const).Value)
-	var syscallResult llvm.Value
-	switch {
-	case c.GOARCH == "amd64":
-		if c.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 += 0x2000000
-		}
-		// Sources:
-		//   https://stackoverflow.com/a/2538212
-		//   https://en.wikibooks.org/wiki/X86_Assembly/Interfacing_with_Linux#syscall
-		args := []llvm.Value{llvm.ConstInt(c.uintptrType, num, false)}
-		argTypes := []llvm.Type{c.uintptrType}
-		// Constraints will look something like:
-		//   "={rax},0,{rdi},{rsi},{rdx},{r10},{r8},{r9},~{rcx},~{r11}"
-		constraints := "={rax},0"
-		for i, arg := range call.Args[1:] {
-			constraints += "," + [...]string{
-				"{rdi}",
-				"{rsi}",
-				"{rdx}",
-				"{r10}",
-				"{r8}",
-				"{r9}",
-				"{r11}",
-				"{r12}",
-				"{r13}",
-			}[i]
-			llvmValue := c.getValue(frame, arg)
-			args = append(args, llvmValue)
-			argTypes = append(argTypes, llvmValue.Type())
-		}
-		constraints += ",~{rcx},~{r11}"
-		fnType := llvm.FunctionType(c.uintptrType, argTypes, false)
-		target := llvm.InlineAsm(fnType, "syscall", constraints, true, false, llvm.InlineAsmDialectIntel)
-		syscallResult = c.builder.CreateCall(target, args, "")
-	case c.GOARCH == "arm" && c.GOOS == "linux":
-		// Implement the EABI system call convention for Linux.
-		// Source: syscall(2) man page.
-		args := []llvm.Value{}
-		argTypes := []llvm.Type{}
-		// Constraints will look something like:
-		//   ={r0},0,{r1},{r2},{r7},~{r3}
-		constraints := "={r0}"
-		for i, arg := range call.Args[1:] {
-			constraints += "," + [...]string{
-				"0", // tie to output
-				"{r1}",
-				"{r2}",
-				"{r3}",
-				"{r4}",
-				"{r5}",
-				"{r6}",
-			}[i]
-			llvmValue := c.getValue(frame, arg)
-			args = append(args, llvmValue)
-			argTypes = append(argTypes, llvmValue.Type())
-		}
-		args = append(args, llvm.ConstInt(c.uintptrType, num, false))
-		argTypes = append(argTypes, c.uintptrType)
-		constraints += ",{r7}" // syscall number
-		for i := len(call.Args) - 1; i < 4; i++ {
-			// r0-r3 get clobbered after the syscall returns
-			constraints += ",~{r" + strconv.Itoa(i) + "}"
-		}
-		fnType := llvm.FunctionType(c.uintptrType, argTypes, false)
-		target := llvm.InlineAsm(fnType, "svc #0", constraints, true, false, 0)
-		syscallResult = c.builder.CreateCall(target, args, "")
-	case c.GOARCH == "arm64" && c.GOOS == "linux":
-		// Source: syscall(2) man page.
-		args := []llvm.Value{}
-		argTypes := []llvm.Type{}
-		// Constraints will look something like:
-		//   ={x0},0,{x1},{x2},{x8},~{x3},~{x4},~{x5},~{x6},~{x7},~{x16},~{x17}
-		constraints := "={x0}"
-		for i, arg := range call.Args[1:] {
-			constraints += "," + [...]string{
-				"0", // tie to output
-				"{x1}",
-				"{x2}",
-				"{x3}",
-				"{x4}",
-				"{x5}",
-			}[i]
-			llvmValue := c.getValue(frame, arg)
-			args = append(args, llvmValue)
-			argTypes = append(argTypes, llvmValue.Type())
-		}
-		args = append(args, llvm.ConstInt(c.uintptrType, num, false))
-		argTypes = append(argTypes, c.uintptrType)
-		constraints += ",{x8}" // syscall number
-		for i := len(call.Args) - 1; i < 8; i++ {
-			// x0-x7 may get clobbered during the syscall following the aarch64
-			// calling convention.
-			constraints += ",~{x" + strconv.Itoa(i) + "}"
-		}
-		constraints += ",~{x16},~{x17}" // scratch registers
-		fnType := llvm.FunctionType(c.uintptrType, argTypes, false)
-		target := llvm.InlineAsm(fnType, "svc #0", constraints, true, false, 0)
-		syscallResult = c.builder.CreateCall(target, args, "")
-	default:
-		return llvm.Value{}, c.makeError(call.Pos(), "unknown GOOS/GOARCH for syscall: "+c.GOOS+"/"+c.GOARCH)
-	}
-	switch c.GOOS {
-	case "linux":
-		// Return values: r0, r1 uintptr, err Errno
-		// Pseudocode:
-		//     var err uintptr
-		//     if syscallResult < 0 && syscallResult > -4096 {
-		//         err = -syscallResult
-		//     }
-		//     return syscallResult, 0, err
-		zero := llvm.ConstInt(c.uintptrType, 0, false)
-		inrange1 := c.builder.CreateICmp(llvm.IntSLT, syscallResult, llvm.ConstInt(c.uintptrType, 0, false), "")
-		inrange2 := c.builder.CreateICmp(llvm.IntSGT, syscallResult, llvm.ConstInt(c.uintptrType, 0xfffffffffffff000, true), "") // -4096
-		hasError := c.builder.CreateAnd(inrange1, inrange2, "")
-		errResult := c.builder.CreateSelect(hasError, c.builder.CreateSub(zero, syscallResult, ""), zero, "syscallError")
-		retval := llvm.Undef(llvm.StructType([]llvm.Type{c.uintptrType, c.uintptrType, c.uintptrType}, false))
-		retval = c.builder.CreateInsertValue(retval, syscallResult, 0, "")
-		retval = c.builder.CreateInsertValue(retval, zero, 1, "")
-		retval = c.builder.CreateInsertValue(retval, errResult, 2, "")
-		return retval, nil
-	case "darwin":
-		// Return values: r0, r1 uintptr, err Errno
-		// Pseudocode:
-		//     var err uintptr
-		//     if syscallResult != 0 {
-		//         err = syscallResult
-		//     }
-		//     return syscallResult, 0, err
-		zero := llvm.ConstInt(c.uintptrType, 0, false)
-		hasError := c.builder.CreateICmp(llvm.IntNE, syscallResult, llvm.ConstInt(c.uintptrType, 0, false), "")
-		errResult := c.builder.CreateSelect(hasError, syscallResult, zero, "syscallError")
-		retval := llvm.Undef(llvm.StructType([]llvm.Type{c.uintptrType, c.uintptrType, c.uintptrType}, false))
-		retval = c.builder.CreateInsertValue(retval, syscallResult, 0, "")
-		retval = c.builder.CreateInsertValue(retval, zero, 1, "")
-		retval = c.builder.CreateInsertValue(retval, errResult, 2, "")
-		return retval, nil
-	default:
-		return llvm.Value{}, c.makeError(call.Pos(), "unknown GOOS/GOARCH for syscall: "+c.GOOS+"/"+c.GOARCH)
-	}
-}

compiler/volatile.go

@@ -1,26 +0,0 @@
-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"
-)
-
-func (c *Compiler) emitVolatileLoad(frame *Frame, instr *ssa.CallCommon) (llvm.Value, error) {
-	addr := c.getValue(frame, instr.Args[0])
-	c.emitNilCheck(frame, addr, "deref")
-	val := c.builder.CreateLoad(addr, "")
-	val.SetVolatile(true)
-	return val, nil
-}
-
-func (c *Compiler) emitVolatileStore(frame *Frame, instr *ssa.CallCommon) (llvm.Value, error) {
-	addr := c.getValue(frame, instr.Args[0])
-	val := c.getValue(frame, instr.Args[1])
-	c.emitNilCheck(frame, addr, "deref")
-	store := c.builder.CreateStore(val, addr)
-	store.SetVolatile(true)
-	return llvm.Value{}, nil
-}

compiler/wordpack.go

@@ -1,117 +0,0 @@
-package compiler
-
-// This file contains utility functions to pack and unpack sets of values. It
-// can take in a list of values and tries to store it efficiently in the pointer
-// itself if possible and legal.
-
-import (
-	"tinygo.org/x/go-llvm"
-)
-
-// emitPointerPack packs the list of values into a single pointer value using
-// bitcasts, or else allocates a value on the heap if it cannot be packed in the
-// pointer value directly. It returns the pointer with the packed data.
-func (c *Compiler) emitPointerPack(values []llvm.Value) llvm.Value {
-	valueTypes := make([]llvm.Type, len(values))
-	for i, value := range values {
-		valueTypes[i] = value.Type()
-	}
-	packedType := c.ctx.StructType(valueTypes, false)
-
-	// Allocate memory for the packed data.
-	var packedAlloc, packedHeapAlloc llvm.Value
-	size := c.targetData.TypeAllocSize(packedType)
-	if size == 0 {
-		return llvm.ConstPointerNull(c.i8ptrType)
-	} else if len(values) == 1 && values[0].Type().TypeKind() == llvm.PointerTypeKind {
-		return c.builder.CreateBitCast(values[0], c.i8ptrType, "pack.ptr")
-	} else if size <= c.targetData.TypeAllocSize(c.i8ptrType) {
-		// Packed data fits in a pointer, so store it directly inside the
-		// pointer.
-		if len(values) == 1 && values[0].Type().TypeKind() == llvm.IntegerTypeKind {
-			// Try to keep this cast in SSA form.
-			return c.builder.CreateIntToPtr(values[0], c.i8ptrType, "pack.int")
-		}
-		// Because packedType is a struct and we have to cast it to a *i8, store
-		// it in an alloca first for bitcasting (store+bitcast+load).
-		packedAlloc, _, _ = c.createTemporaryAlloca(packedType, "")
-	} else {
-		// Packed data is bigger than a pointer, so allocate it on the heap.
-		sizeValue := llvm.ConstInt(c.uintptrType, size, false)
-		packedHeapAlloc = c.createRuntimeCall("alloc", []llvm.Value{sizeValue}, "")
-		packedAlloc = c.builder.CreateBitCast(packedHeapAlloc, llvm.PointerType(packedType, 0), "")
-	}
-	// Store all values in the alloca or heap pointer.
-	for i, value := range values {
-		indices := []llvm.Value{
-			llvm.ConstInt(c.ctx.Int32Type(), 0, false),
-			llvm.ConstInt(c.ctx.Int32Type(), uint64(i), false),
-		}
-		gep := c.builder.CreateInBoundsGEP(packedAlloc, indices, "")
-		c.builder.CreateStore(value, gep)
-	}
-
-	if packedHeapAlloc.IsNil() {
-		// Load value (as *i8) from the alloca.
-		packedAlloc = c.builder.CreateBitCast(packedAlloc, llvm.PointerType(c.i8ptrType, 0), "")
-		result := c.builder.CreateLoad(packedAlloc, "")
-		packedPtr := c.builder.CreateBitCast(packedAlloc, c.i8ptrType, "")
-		packedSize := llvm.ConstInt(c.ctx.Int64Type(), c.targetData.TypeAllocSize(packedAlloc.Type()), false)
-		c.emitLifetimeEnd(packedPtr, packedSize)
-		return result
-	} else {
-		// Get the original heap allocation pointer, which already is an *i8.
-		return packedHeapAlloc
-	}
-}
-
-// emitPointerUnpack extracts a list of values packed using emitPointerPack.
-func (c *Compiler) emitPointerUnpack(ptr llvm.Value, valueTypes []llvm.Type) []llvm.Value {
-	packedType := c.ctx.StructType(valueTypes, false)
-
-	// Get a correctly-typed pointer to the packed data.
-	var packedAlloc, packedRawAlloc llvm.Value
-	size := c.targetData.TypeAllocSize(packedType)
-	if size == 0 {
-		// No data to unpack.
-	} else if len(valueTypes) == 1 && valueTypes[0].TypeKind() == llvm.PointerTypeKind {
-		// A single pointer is always stored directly.
-		return []llvm.Value{c.builder.CreateBitCast(ptr, valueTypes[0], "unpack.ptr")}
-	} else if size <= c.targetData.TypeAllocSize(c.i8ptrType) {
-		// Packed data stored directly in pointer.
-		if len(valueTypes) == 1 && valueTypes[0].TypeKind() == llvm.IntegerTypeKind {
-			// Keep this cast in SSA form.
-			return []llvm.Value{c.builder.CreatePtrToInt(ptr, valueTypes[0], "unpack.int")}
-		}
-		// Fallback: load it using an alloca.
-		packedRawAlloc, _, _ = c.createTemporaryAlloca(llvm.PointerType(c.i8ptrType, 0), "unpack.raw.alloc")
-		packedRawValue := c.builder.CreateBitCast(ptr, llvm.PointerType(c.i8ptrType, 0), "unpack.raw.value")
-		c.builder.CreateStore(packedRawValue, packedRawAlloc)
-		packedAlloc = c.builder.CreateBitCast(packedRawAlloc, llvm.PointerType(packedType, 0), "unpack.alloc")
-	} else {
-		// Packed data stored on the heap. Bitcast the passed-in pointer to the
-		// correct pointer type.
-		packedAlloc = c.builder.CreateBitCast(ptr, llvm.PointerType(packedType, 0), "unpack.raw.ptr")
-	}
-	// Load each value from the packed data.
-	values := make([]llvm.Value, len(valueTypes))
-	for i, valueType := range valueTypes {
-		if c.targetData.TypeAllocSize(valueType) == 0 {
-			// This value has length zero, so there's nothing to load.
-			values[i] = c.getZeroValue(valueType)
-			continue
-		}
-		indices := []llvm.Value{
-			llvm.ConstInt(c.ctx.Int32Type(), 0, false),
-			llvm.ConstInt(c.ctx.Int32Type(), uint64(i), false),
-		}
-		gep := c.builder.CreateInBoundsGEP(packedAlloc, indices, "")
-		values[i] = c.builder.CreateLoad(gep, "")
-	}
-	if !packedRawAlloc.IsNil() {
-		allocPtr := c.builder.CreateBitCast(packedRawAlloc, c.i8ptrType, "")
-		allocSize := llvm.ConstInt(c.ctx.Int64Type(), c.targetData.TypeAllocSize(c.uintptrType), false)
-		c.emitLifetimeEnd(allocPtr, allocSize)
-	}
-	return values
-}

go.mod

@@ -1,10 +0,0 @@
-module github.com/tinygo-org/tinygo
-
-go 1.11
-
-require (
-	github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
-	github.com/marcinbor85/gohex v0.0.0-20180128172054-7a43cd876e46
-	golang.org/x/tools v0.0.0-20190227180812-8dcc6e70cdef
-	tinygo.org/x/go-llvm v0.0.0-20190224120431-7707ae5d1261
-)

go.sum

@@ -1,14 +0,0 @@
-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/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/marcinbor85/gohex v0.0.0-20180128172054-7a43cd876e46 h1:wXG2bA8fO7Vv7lLk2PihFMTqmbT173Tje39oKzQ50Mo=
-github.com/marcinbor85/gohex v0.0.0-20180128172054-7a43cd876e46/go.mod h1:Pb6XcsXyropB9LNHhnqaknG/vEwYztLkQzVCHv8sQ3M=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190227180812-8dcc6e70cdef h1:ymc9FeDom3RIEA3coKokSllBB1hRcMT0tZ1W3Jf9Ids=
-golang.org/x/tools v0.0.0-20190227180812-8dcc6e70cdef/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-tinygo.org/x/go-llvm v0.0.0-20190224120431-7707ae5d1261 h1:rJS2Hga39YAnm7DE4qrPm6Dr/67EOojL0XPzvbEeBiw=
-tinygo.org/x/go-llvm v0.0.0-20190224120431-7707ae5d1261/go.mod h1:fv1F0BSNpxMfCL0zF3M4OPFbgYHnhtB6ST0HvUtu/LE=

interp/errors.go

@@ -3,7 +3,7 @@ package interp
 // This file provides useful types for errors encountered during IR evaluation.
 
 import (
-	"tinygo.org/x/go-llvm"
+	"github.com/aykevl/go-llvm"
 )
 
 type Unsupported struct {

interp/frame.go

@@ -7,7 +7,7 @@ import (
 	"errors"
 	"strings"
 
-	"tinygo.org/x/go-llvm"
+	"github.com/aykevl/go-llvm"
 )
 
 type frame struct {
@@ -84,18 +84,15 @@ func (fr *frame) evalBasicBlock(bb, incoming llvm.BasicBlock, indent string) (re
 
 		// Memory operators
 		case !inst.IsAAllocaInst().IsNil():
-			allocType := inst.Type().ElementType()
-			alloca := llvm.AddGlobal(fr.Mod, allocType, fr.pkgName+"$alloca")
-			alloca.SetInitializer(getZeroValue(allocType))
-			alloca.SetLinkage(llvm.InternalLinkage)
-			fr.locals[inst] = &LocalValue{
-				Underlying: alloca,
+			fr.locals[inst] = &AllocaValue{
+				Underlying: getZeroValue(inst.Type().ElementType()),
+				Dirty:      false,
 				Eval:       fr.Eval,
 			}
 		case !inst.IsALoadInst().IsNil():
-			operand := fr.getLocal(inst.Operand(0)).(*LocalValue)
+			operand := fr.getLocal(inst.Operand(0))
 			var value llvm.Value
-			if !operand.IsConstant() || inst.IsVolatile() || (!operand.Underlying.IsAConstantExpr().IsNil() && operand.Underlying.Opcode() == llvm.BitCast) {
+			if !operand.IsConstant() || inst.IsVolatile() {
 				value = fr.builder.CreateLoad(operand.Value(), inst.Name())
 			} else {
 				value = operand.Load()
@@ -176,33 +173,17 @@ func (fr *frame) evalBasicBlock(bb, incoming llvm.BasicBlock, indent string) (re
 					continue // special case: bitcast of alloc
 				}
 			}
-			value := fr.getLocal(operand).(*LocalValue)
-			fr.locals[inst] = &LocalValue{fr.Eval, fr.builder.CreateBitCast(value.Value(), inst.Type(), "")}
+			value := fr.getLocal(operand)
+			if bc, ok := value.(*PointerCastValue); ok {
+				value = bc.Underlying // avoid double bitcasts
+			}
+			fr.locals[inst] = &PointerCastValue{Eval: fr.Eval, Underlying: value, CastType: inst.Type()}
 
 		// Other operators
 		case !inst.IsAICmpInst().IsNil():
 			lhs := fr.getLocal(inst.Operand(0)).(*LocalValue).Underlying
 			rhs := fr.getLocal(inst.Operand(1)).(*LocalValue).Underlying
 			predicate := inst.IntPredicate()
-			if predicate == llvm.IntEQ && lhs.Type().TypeKind() == llvm.PointerTypeKind {
-				// Unfortunately, the const propagation in the IR builder
-				// doesn't handle pointer compares of inttoptr values. So we
-				// implement it manually here.
-				lhsNil, ok1 := isPointerNil(lhs)
-				rhsNil, ok2 := isPointerNil(rhs)
-				if ok1 && ok2 {
-					if lhsNil && rhsNil {
-						// Both are nil, so this icmp is always evaluated to true.
-						fr.locals[inst] = &LocalValue{fr.Eval, llvm.ConstInt(fr.Mod.Context().Int1Type(), 1, false)}
-						continue
-					}
-					if lhsNil != rhsNil {
-						// Only one of them is nil, so this comparison must return false.
-						fr.locals[inst] = &LocalValue{fr.Eval, llvm.ConstInt(fr.Mod.Context().Int1Type(), 0, false)}
-						continue
-					}
-				}
-			}
 			fr.locals[inst] = &LocalValue{fr.Eval, fr.builder.CreateICmp(predicate, lhs, rhs, "")}
 		case !inst.IsAFCmpInst().IsNil():
 			lhs := fr.getLocal(inst.Operand(0)).(*LocalValue).Underlying
@@ -241,7 +222,7 @@ func (fr *frame) evalBasicBlock(bb, incoming llvm.BasicBlock, indent string) (re
 				alloc := llvm.AddGlobal(fr.Mod, allocType, fr.pkgName+"$alloc")
 				alloc.SetInitializer(getZeroValue(allocType))
 				alloc.SetLinkage(llvm.InternalLinkage)
-				result := &LocalValue{
+				result := &GlobalValue{
 					Underlying: alloc,
 					Eval:       fr.Eval,
 				}
@@ -263,18 +244,13 @@ func (fr *frame) evalBasicBlock(bb, incoming llvm.BasicBlock, indent string) (re
 			case callee.Name() == "runtime.hashmapStringSet":
 				// set a string key in the map
 				m := fr.getLocal(inst.Operand(0)).(*MapValue)
-				// "key" is a Go string value, which in the TinyGo calling convention is split up
-				// into separate pointer and length parameters.
-				keyBuf := fr.getLocal(inst.Operand(1)).(*LocalValue)
-				keyLen := fr.getLocal(inst.Operand(2)).(*LocalValue)
-				valPtr := fr.getLocal(inst.Operand(3)).(*LocalValue)
+				keyBuf := fr.getLocal(inst.Operand(1))
+				keyLen := fr.getLocal(inst.Operand(2))
+				valPtr := fr.getLocal(inst.Operand(3))
 				m.PutString(keyBuf, keyLen, valPtr)
 			case callee.Name() == "runtime.hashmapBinarySet":
 				// set a binary (int etc.) key in the map
-				m := fr.getLocal(inst.Operand(0)).(*MapValue)
-				keyBuf := fr.getLocal(inst.Operand(1)).(*LocalValue)
-				valPtr := fr.getLocal(inst.Operand(2)).(*LocalValue)
-				m.PutBinary(keyBuf, valPtr)
+				// TODO: unimplemented
 			case callee.Name() == "runtime.stringConcat":
 				// adding two strings together
 				buf1Ptr := fr.getLocal(inst.Operand(0))
@@ -326,48 +302,8 @@ func (fr *frame) evalBasicBlock(bb, incoming llvm.BasicBlock, indent string) (re
 				ret = llvm.ConstInsertValue(ret, retLen, []uint32{1}) // len
 				ret = llvm.ConstInsertValue(ret, retLen, []uint32{2}) // cap
 				fr.locals[inst] = &LocalValue{fr.Eval, ret}
-			case callee.Name() == "runtime.interfaceImplements":
-				typecode := fr.getLocal(inst.Operand(0)).(*LocalValue).Underlying
-				interfaceMethodSet := fr.getLocal(inst.Operand(1)).(*LocalValue).Underlying
-				if typecode.IsAConstantExpr().IsNil() || typecode.Opcode() != llvm.PtrToInt {
-					panic("interp: expected typecode to be a ptrtoint")
-				}
-				typecode = typecode.Operand(0)
-				if interfaceMethodSet.IsAConstantExpr().IsNil() || interfaceMethodSet.Opcode() != llvm.GetElementPtr {
-					panic("interp: expected method set in runtime.interfaceImplements to be a constant gep")
-				}
-				interfaceMethodSet = interfaceMethodSet.Operand(0).Initializer()
-				methodSet := llvm.ConstExtractValue(typecode.Initializer(), []uint32{1})
-				if methodSet.IsAConstantExpr().IsNil() || methodSet.Opcode() != llvm.GetElementPtr {
-					panic("interp: expected method set to be a constant gep")
-				}
-				methodSet = methodSet.Operand(0).Initializer()
-
-				// Make a set of all the methods on the concrete type, for
-				// easier checking in the next step.
-				definedMethods := map[string]struct{}{}
-				for i := 0; i < methodSet.Type().ArrayLength(); i++ {
-					methodInfo := llvm.ConstExtractValue(methodSet, []uint32{uint32(i)})
-					name := llvm.ConstExtractValue(methodInfo, []uint32{0}).Name()
-					definedMethods[name] = struct{}{}
-				}
-				// Check whether all interface methods are also in the list
-				// of defined methods calculated above.
-				implements := uint64(1) // i1 true
-				for i := 0; i < interfaceMethodSet.Type().ArrayLength(); i++ {
-					name := llvm.ConstExtractValue(interfaceMethodSet, []uint32{uint32(i)}).Name()
-					if _, ok := definedMethods[name]; !ok {
-						// There is a method on the interface that is not
-						// implemented by the type.
-						implements = 0 // i1 false
-						break
-					}
-				}
-				fr.locals[inst] = &LocalValue{fr.Eval, llvm.ConstInt(fr.Mod.Context().Int1Type(), implements, false)}
-			case callee.Name() == "runtime.nanotime":
-				fr.locals[inst] = &LocalValue{fr.Eval, llvm.ConstInt(fr.Mod.Context().Int64Type(), 0, false)}
-			case callee.Name() == "llvm.dbg.value":
-				// do nothing
+			case callee.Name() == "runtime.makeInterface":
+				fr.locals[inst] = &LocalValue{fr.Eval, llvm.ConstPtrToInt(inst.Operand(0), fr.TargetData.IntPtrType())}
 			case strings.HasPrefix(callee.Name(), "runtime.print") || callee.Name() == "runtime._panic":
 				// This are all print instructions, which necessarily have side
 				// effects but no results.
@@ -480,21 +416,17 @@ func (fr *frame) evalBasicBlock(bb, incoming llvm.BasicBlock, indent string) (re
 			}
 			thenBB := inst.Operand(1)
 			elseBB := inst.Operand(2)
-			if !cond.IsAInstruction().IsNil() {
+			if !cond.IsConstant() {
 				return nil, nil, errors.New("interp: branch on a non-constant")
-			}
-			if !cond.IsAConstantExpr().IsNil() {
-				// This may happen when the instruction builder could not
-				// const-fold some instructions.
-				return nil, nil, errors.New("interp: branch on a non-const-propagated constant expression")
-			}
-			switch cond {
-			case llvm.ConstInt(fr.Mod.Context().Int1Type(), 0, false): // false
-				return nil, []llvm.Value{thenBB}, nil // then
-			case llvm.ConstInt(fr.Mod.Context().Int1Type(), 1, false): // true
-				return nil, []llvm.Value{elseBB}, nil // else
-			default:
-				panic("branch was not true or false")
+			} else {
+				switch cond.ZExtValue() {
+				case 0: // false
+					return nil, []llvm.Value{thenBB}, nil // then
+				case 1: // true
+					return nil, []llvm.Value{elseBB}, nil // else
+				default:
+					panic("branch was not true or false")
+				}
 			}
 		case !inst.IsABranchInst().IsNil() && inst.OperandsCount() == 1:
 			// unconditional branch (goto)

interp/interp.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"strings"
 
-	"tinygo.org/x/go-llvm"
+	"github.com/aykevl/go-llvm"
 )
 
 type Eval struct {
@@ -18,6 +18,7 @@ type Eval struct {
 	TargetData      llvm.TargetData
 	Debug           bool
 	builder         llvm.Builder
+	dibuilder       *llvm.DIBuilder
 	dirtyGlobals    map[llvm.Value]struct{}
 	sideEffectFuncs map[llvm.Value]*sideEffectResult // cache of side effect scan results
 }
@@ -37,21 +38,14 @@ func Run(mod llvm.Module, targetData llvm.TargetData, debug bool) error {
 		dirtyGlobals: map[llvm.Value]struct{}{},
 	}
 	e.builder = mod.Context().NewBuilder()
+	e.dibuilder = llvm.NewDIBuilder(mod)
 
 	initAll := mod.NamedFunction(name)
 	bb := initAll.EntryBasicBlock()
-	// Create a dummy alloca in the entry block that we can set the insert point
-	// to. This is necessary because otherwise we might be removing the
-	// instruction (init call) that we are removing after successful
-	// interpretation.
-	e.builder.SetInsertPointBefore(bb.FirstInstruction())
-	dummy := e.builder.CreateAlloca(e.Mod.Context().Int8Type(), "dummy")
-	e.builder.SetInsertPointBefore(dummy)
+	e.builder.SetInsertPointBefore(bb.LastInstruction())
+	e.builder.SetInstDebugLocation(bb.FirstInstruction())
 	var initCalls []llvm.Value
 	for inst := bb.FirstInstruction(); !inst.IsNil(); inst = llvm.NextInstruction(inst) {
-		if inst == dummy {
-			continue
-		}
 		if !inst.IsAReturnInst().IsNil() {
 			break // ret void
 		}
@@ -69,15 +63,14 @@ func Run(mod llvm.Module, targetData llvm.TargetData, debug bool) error {
 			return errors.New("expected all instructions in " + name + " to be *.init() calls")
 		}
 		pkgName := initName[:len(initName)-5]
-		fn := call.CalledValue()
-		call.EraseFromParentAsInstruction()
-		_, err := e.Function(fn, []Value{&LocalValue{e, undefPtr}, &LocalValue{e, undefPtr}}, pkgName)
+		_, err := e.Function(call.CalledValue(), []Value{&LocalValue{e, undefPtr}}, pkgName)
 		if err == ErrUnreachable {
 			break
 		}
 		if err != nil {
 			return err
 		}
+		call.EraseFromParentAsInstruction()
 	}
 
 	return nil
@@ -121,7 +114,11 @@ func (e *Eval) function(fn llvm.Value, params []Value, pkgName, indent string) (
 // getValue determines what kind of LLVM value it gets and returns the
 // appropriate Value type.
 func (e *Eval) getValue(v llvm.Value) Value {
-	return &LocalValue{e, v}
+	if !v.IsAGlobalVariable().IsNil() {
+		return &GlobalValue{e, v}
+	} else {
+		return &LocalValue{e, v}
+	}
 }
 
 // markDirty marks the passed-in LLVM value dirty, recursively. For example,

interp/scan.go

@@ -1,7 +1,7 @@
 package interp
 
 import (
-	"tinygo.org/x/go-llvm"
+	"github.com/aykevl/go-llvm"
 )
 
 type sideEffectSeverity int
@@ -24,20 +24,6 @@ type sideEffectResult struct {
 // returns whether this function has side effects and if it does, which globals
 // it mentions anywhere in this function or any called functions.
 func (e *Eval) hasSideEffects(fn llvm.Value) *sideEffectResult {
-	switch fn.Name() {
-	case "runtime.alloc":
-		// Cannot be scanned but can be interpreted.
-		return &sideEffectResult{severity: sideEffectNone}
-	case "runtime.nanotime":
-		// Fixed value at compile time.
-		return &sideEffectResult{severity: sideEffectNone}
-	case "runtime._panic":
-		return &sideEffectResult{severity: sideEffectLimited}
-	case "runtime.interfaceImplements":
-		return &sideEffectResult{severity: sideEffectNone}
-	case "llvm.dbg.value":
-		return &sideEffectResult{severity: sideEffectNone}
-	}
 	if e.sideEffectFuncs == nil {
 		e.sideEffectFuncs = make(map[llvm.Value]*sideEffectResult)
 	}
@@ -87,38 +73,27 @@ func (e *Eval) hasSideEffects(fn llvm.Value) *sideEffectResult {
 					result.updateSeverity(sideEffectAll)
 					continue
 				}
+				name := child.Name()
 				if child.IsDeclaration() {
+					if name == "runtime.makeInterface" {
+						// Can be interpreted so does not have side effects.
+						continue
+					}
 					// External function call. Assume only limited side effects
 					// (no affected globals, etc.).
-					if e.hasLocalSideEffects(dirtyLocals, inst) {
+					if result.hasLocalSideEffects(dirtyLocals, inst) {
 						result.updateSeverity(sideEffectLimited)
 					}
 					continue
 				}
-				childSideEffects := e.hasSideEffects(child)
+				childSideEffects := e.hasSideEffects(fn)
 				switch childSideEffects.severity {
 				case sideEffectInProgress, sideEffectNone:
 					// no side effects or recursive function - continue scanning
-				case sideEffectLimited:
-					// The return value may be problematic.
-					if e.hasLocalSideEffects(dirtyLocals, inst) {
-						result.updateSeverity(sideEffectLimited)
-					}
-				case sideEffectAll:
-					result.updateSeverity(sideEffectAll)
 				default:
-					panic("unreachable")
+					result.update(childSideEffects)
 				}
-			case llvm.Load:
-				if inst.IsVolatile() {
-					result.updateSeverity(sideEffectLimited)
-				}
-				if _, ok := e.dirtyGlobals[inst.Operand(0)]; ok {
-					if e.hasLocalSideEffects(dirtyLocals, inst) {
-						result.updateSeverity(sideEffectLimited)
-					}
-				}
-			case llvm.Store:
+			case llvm.Load, llvm.Store:
 				if inst.IsVolatile() {
 					result.updateSeverity(sideEffectLimited)
 				}
@@ -143,7 +118,7 @@ func (e *Eval) hasSideEffects(fn llvm.Value) *sideEffectResult {
 // hasLocalSideEffects checks whether the given instruction flows into a branch
 // or return instruction, in which case the whole function must be marked as
 // having side effects and be called at runtime.
-func (e *Eval) hasLocalSideEffects(dirtyLocals map[llvm.Value]struct{}, inst llvm.Value) bool {
+func (r *sideEffectResult) hasLocalSideEffects(dirtyLocals map[llvm.Value]struct{}, inst llvm.Value) bool {
 	if _, ok := dirtyLocals[inst]; ok {
 		// It is already known that this local is dirty.
 		return true
@@ -181,7 +156,7 @@ func (e *Eval) hasLocalSideEffects(dirtyLocals map[llvm.Value]struct{}, inst llv
 			// For a list:
 			// https://godoc.org/github.com/llvm-mirror/llvm/bindings/go/llvm#Opcode
 			dirtyLocals[user] = struct{}{}
-			if e.hasLocalSideEffects(dirtyLocals, user) {
+			if r.hasLocalSideEffects(dirtyLocals, user) {
 				return true
 			}
 		}

interp/utils.go

@@ -1,7 +1,7 @@
 package interp
 
 import (
-	"tinygo.org/x/go-llvm"
+	"github.com/aykevl/go-llvm"
 )
 
 // Return a list of values (actually, instructions) where this value is used as
@@ -63,9 +63,6 @@ func getZeroValue(typ llvm.Type) llvm.Value {
 // getStringBytes loads the byte slice of a Go string represented as a
 // {ptr, len} pair.
 func getStringBytes(strPtr Value, strLen llvm.Value) []byte {
-	if !strLen.IsConstant() {
-		panic("getStringBytes with a non-constant length")
-	}
 	buf := make([]byte, strLen.ZExtValue())
 	for i := range buf {
 		c := strPtr.GetElementPtr([]uint32{uint32(i)}).Load()
@@ -94,29 +91,3 @@ func isScalar(t llvm.Type) bool {
 		return false
 	}
 }
-
-// isPointerNil returns whether this is a nil pointer or not. The ok value
-// indicates whether the result is certain: if it is false the result boolean is
-// not valid.
-func isPointerNil(v llvm.Value) (result bool, ok bool) {
-	if !v.IsAConstantExpr().IsNil() {
-		switch v.Opcode() {
-		case llvm.IntToPtr:
-			// Whether a constant inttoptr is nil is easy to
-			// determine.
-			operand := v.Operand(0)
-			if operand.IsConstant() {
-				return operand.ZExtValue() == 0, true
-			}
-		case llvm.BitCast, llvm.GetElementPtr:
-			// These const instructions are just a kind of wrappers for the
-			// underlying pointer.
-			return isPointerNil(v.Operand(0))
-		}
-	}
-	if !v.IsAConstantPointerNull().IsNil() {
-		// A constant pointer null is always null, of course.
-		return true, true
-	}
-	return false, false // not valid
-}

interp/values.go

@@ -5,7 +5,7 @@ package interp
 import (
 	"strconv"
 
-	"tinygo.org/x/go-llvm"
+	"github.com/aykevl/go-llvm"
 )
 
 // A Value is a LLVM value with some extra methods attached for easier
@@ -36,17 +36,11 @@ func (v *LocalValue) Type() llvm.Type {
 }
 
 func (v *LocalValue) IsConstant() bool {
-	if _, ok := v.Eval.dirtyGlobals[v.Underlying]; ok {
-		return false
-	}
 	return v.Underlying.IsConstant()
 }
 
-// Load loads a constant value if this is a constant pointer.
+// Load loads a constant value if this is a constant GEP, otherwise it panics.
 func (v *LocalValue) Load() llvm.Value {
-	if !v.Underlying.IsAGlobalVariable().IsNil() {
-		return v.Underlying.Initializer()
-	}
 	switch v.Underlying.Opcode() {
 	case llvm.GetElementPtr:
 		indices := v.getConstGEPIndices()
@@ -56,32 +50,21 @@ func (v *LocalValue) Load() llvm.Value {
 		global := v.Eval.getValue(v.Underlying.Operand(0))
 		agg := global.Load()
 		return llvm.ConstExtractValue(agg, indices[1:])
-	case llvm.BitCast:
-		panic("interp: load from a bitcast")
 	default:
 		panic("interp: load from a constant")
 	}
 }
 
-// Store stores to the underlying value if the value type is a pointer type,
+// Store stores to the underlying value if the value type is a constant GEP,
 // otherwise it panics.
 func (v *LocalValue) Store(value llvm.Value) {
-	if !v.Underlying.IsAGlobalVariable().IsNil() {
-		if !value.IsConstant() {
-			v.MarkDirty()
-			v.Eval.builder.CreateStore(value, v.Underlying)
-		} else {
-			v.Underlying.SetInitializer(value)
-		}
-		return
-	}
 	switch v.Underlying.Opcode() {
 	case llvm.GetElementPtr:
 		indices := v.getConstGEPIndices()
 		if indices[0] != 0 {
 			panic("invalid GEP")
 		}
-		global := &LocalValue{v.Eval, v.Underlying.Operand(0)}
+		global := &GlobalValue{v.Eval, v.Underlying.Operand(0)}
 		agg := global.Load()
 		agg = llvm.ConstInsertValue(agg, value, indices[1:])
 		global.Store(agg)
@@ -91,13 +74,10 @@ func (v *LocalValue) Store(value llvm.Value) {
 	}
 }
 
-// GetElementPtr returns a GEP when the underlying value is of pointer type.
+// GetElementPtr returns a constant GEP when the underlying value is also a
+// constant GEP. It panics when the underlying value is not a constant GEP:
+// getting the pointer to a constant is not possible.
 func (v *LocalValue) GetElementPtr(indices []uint32) Value {
-	if !v.Underlying.IsAGlobalVariable().IsNil() {
-		int32Type := v.Underlying.Type().Context().Int32Type()
-		gep := llvm.ConstGEP(v.Underlying, getLLVMIndices(int32Type, indices))
-		return &LocalValue{v.Eval, gep}
-	}
 	switch v.Underlying.Opcode() {
 	case llvm.GetElementPtr, llvm.IntToPtr:
 		int32Type := v.Underlying.Type().Context().Int32Type()
@@ -127,18 +107,283 @@ func (v *LocalValue) getConstGEPIndices() []uint32 {
 	return indices
 }
 
+// GlobalValue wraps a LLVM global variable.
+type GlobalValue struct {
+	Eval       *Eval
+	Underlying llvm.Value
+}
+
+// Value returns the initializer for this global variable.
+func (v *GlobalValue) Value() llvm.Value {
+	return v.Underlying
+}
+
+// Type returns the type of this global variable, which is a pointer type. Use
+// Type().ElementType() to get the actual global variable type.
+func (v *GlobalValue) Type() llvm.Type {
+	return v.Underlying.Type()
+}
+
+// IsConstant returns true if this global is not dirty, false otherwise.
+func (v *GlobalValue) IsConstant() bool {
+	if _, ok := v.Eval.dirtyGlobals[v.Underlying]; ok {
+		return false
+	}
+	return true
+}
+
+// Load returns the initializer of the global variable.
+func (v *GlobalValue) Load() llvm.Value {
+	return v.Underlying.Initializer()
+}
+
+// Store sets the initializer of the global variable.
+func (v *GlobalValue) Store(value llvm.Value) {
+	if !value.IsConstant() {
+		v.MarkDirty()
+		v.Eval.builder.CreateStore(value, v.Underlying)
+	} else {
+		v.Underlying.SetInitializer(value)
+	}
+}
+
+// GetElementPtr returns a constant GEP on this global, which can be used in
+// load and store instructions.
+func (v *GlobalValue) GetElementPtr(indices []uint32) Value {
+	int32Type := v.Underlying.Type().Context().Int32Type()
+	gep := llvm.ConstGEP(v.Underlying, getLLVMIndices(int32Type, indices))
+	return &LocalValue{v.Eval, gep}
+}
+
+func (v *GlobalValue) String() string {
+	return "&GlobalValue{" + v.Underlying.Name() + "}"
+}
+
 // MarkDirty marks this global as dirty, meaning that every load from and store
 // to this global (from now on) must be performed at runtime.
-func (v *LocalValue) MarkDirty() {
-	if v.Underlying.IsAGlobalVariable().IsNil() {
-		panic("trying to mark a non-global as dirty")
-	}
+func (v *GlobalValue) MarkDirty() {
 	if !v.IsConstant() {
 		return // already dirty
 	}
 	v.Eval.dirtyGlobals[v.Underlying] = struct{}{}
 }
 
+// An alloca represents a local alloca, which is a stack allocated variable.
+// It is emulated by storing the constant of the alloca.
+type AllocaValue struct {
+	Eval       *Eval
+	Underlying llvm.Value // the constant value itself if not dirty, otherwise the alloca instruction
+	Dirty      bool       // this value must be evaluated at runtime
+}
+
+// Value turns this alloca into a runtime alloca instead of a compile-time
+// constant (if not already converted), and returns the alloca itself.
+func (v *AllocaValue) Value() llvm.Value {
+	if !v.Dirty {
+		// Mark this alloca a dirty, meaning it is run at runtime instead of
+		// compile time.
+		alloca := v.Eval.builder.CreateAlloca(v.Underlying.Type(), "")
+		v.Eval.builder.CreateStore(v.Underlying, alloca)
+		v.Dirty = true
+		v.Underlying = alloca
+	}
+	return v.Underlying
+}
+
+// Type returns the type of this alloca, which is always a pointer.
+func (v *AllocaValue) Type() llvm.Type {
+	if v.Dirty {
+		return v.Underlying.Type()
+	} else {
+		return llvm.PointerType(v.Underlying.Type(), 0)
+	}
+}
+
+func (v *AllocaValue) IsConstant() bool {
+	return !v.Dirty
+}
+
+// Load returns the value this alloca contains, which may be evaluated at
+// runtime.
+func (v *AllocaValue) Load() llvm.Value {
+	if v.Dirty {
+		ret := v.Eval.builder.CreateLoad(v.Underlying, "")
+		if ret.IsNil() {
+			panic("alloca is nil")
+		}
+		return ret
+	} else {
+		if v.Underlying.IsNil() {
+			panic("alloca is nil")
+		}
+		return v.Underlying
+	}
+}
+
+// Store updates the value of this alloca.
+func (v *AllocaValue) Store(value llvm.Value) {
+	if v.Underlying.Type() != value.Type() {
+		panic("interp: trying to store to an alloca with a different type")
+	}
+	if v.Dirty || !value.IsConstant() {
+		v.Eval.builder.CreateStore(value, v.Value())
+	} else {
+		v.Underlying = value
+	}
+}
+
+// GetElementPtr returns a value (a *GetElementPtrValue) that keeps a reference
+// to this alloca, so that Load() and Store() continue to work.
+func (v *AllocaValue) GetElementPtr(indices []uint32) Value {
+	return &GetElementPtrValue{v, indices}
+}
+
+func (v *AllocaValue) String() string {
+	return "&AllocaValue{Type: " + v.Type().String() + "}"
+}
+
+// GetElementPtrValue wraps an alloca, keeping track of what the GEP points to
+// so it can be used as a pointer value (with Load() and Store()).
+type GetElementPtrValue struct {
+	Alloca  *AllocaValue
+	Indices []uint32
+}
+
+// Type returns the type of this GEP, which is always of type pointer.
+func (v *GetElementPtrValue) Type() llvm.Type {
+	if v.Alloca.Dirty {
+		return v.Value().Type()
+	} else {
+		return llvm.PointerType(v.Load().Type(), 0)
+	}
+}
+
+func (v *GetElementPtrValue) IsConstant() bool {
+	return v.Alloca.IsConstant()
+}
+
+// Value creates the LLVM GEP instruction of this GetElementPtrValue wrapper and
+// returns it.
+func (v *GetElementPtrValue) Value() llvm.Value {
+	if v.Alloca.Dirty {
+		alloca := v.Alloca.Value()
+		int32Type := v.Alloca.Type().Context().Int32Type()
+		llvmIndices := getLLVMIndices(int32Type, v.Indices)
+		return v.Alloca.Eval.builder.CreateGEP(alloca, llvmIndices, "")
+	} else {
+		panic("interp: todo: pointer to alloca gep")
+	}
+}
+
+// Load deferences the pointer this GEP points to. For a constant GEP, it
+// extracts the value from the underlying alloca.
+func (v *GetElementPtrValue) Load() llvm.Value {
+	if v.Alloca.Dirty {
+		gep := v.Value()
+		return v.Alloca.Eval.builder.CreateLoad(gep, "")
+	} else {
+		underlying := v.Alloca.Load()
+		indices := v.Indices
+		if indices[0] != 0 {
+			panic("invalid GEP")
+		}
+		return llvm.ConstExtractValue(underlying, indices[1:])
+	}
+}
+
+// Store stores to the pointer this GEP points to. For a constant GEP, it
+// updates the underlying allloca.
+func (v *GetElementPtrValue) Store(value llvm.Value) {
+	if v.Alloca.Dirty || !value.IsConstant() {
+		alloca := v.Alloca.Value()
+		int32Type := v.Alloca.Type().Context().Int32Type()
+		llvmIndices := getLLVMIndices(int32Type, v.Indices)
+		gep := v.Alloca.Eval.builder.CreateGEP(alloca, llvmIndices, "")
+		v.Alloca.Eval.builder.CreateStore(value, gep)
+	} else {
+		underlying := v.Alloca.Load()
+		indices := v.Indices
+		if indices[0] != 0 {
+			panic("invalid GEP")
+		}
+		underlying = llvm.ConstInsertValue(underlying, value, indices[1:])
+		v.Alloca.Store(underlying)
+	}
+}
+
+func (v *GetElementPtrValue) GetElementPtr(indices []uint32) Value {
+	if v.Alloca.Dirty {
+		panic("interp: todo: gep on a dirty gep")
+	} else {
+		combined := append([]uint32{}, v.Indices...)
+		combined[len(combined)-1] += indices[0]
+		combined = append(combined, indices[1:]...)
+		return &GetElementPtrValue{v.Alloca, combined}
+	}
+}
+
+func (v *GetElementPtrValue) String() string {
+	indices := ""
+	for _, n := range v.Indices {
+		if indices != "" {
+			indices += ", "
+		}
+		indices += strconv.Itoa(int(n))
+	}
+	return "&GetElementPtrValue{Alloca: " + v.Alloca.String() + ", Indices: [" + indices + "]}"
+}
+
+// PointerCastValue represents a bitcast operation on a pointer.
+type PointerCastValue struct {
+	Eval       *Eval
+	Underlying Value
+	CastType   llvm.Type
+}
+
+// Value returns a constant bitcast value.
+func (v *PointerCastValue) Value() llvm.Value {
+	from := v.Underlying.Value()
+	return llvm.ConstBitCast(from, v.CastType)
+}
+
+// Type returns the type this pointer has been cast to.
+func (v *PointerCastValue) Type() llvm.Type {
+	return v.CastType
+}
+
+func (v *PointerCastValue) IsConstant() bool {
+	return v.Underlying.IsConstant()
+}
+
+// Load tries to load and bitcast the given value. If this value cannot be
+// bitcasted, Load panics.
+func (v *PointerCastValue) Load() llvm.Value {
+	if v.Underlying.IsConstant() {
+		typeFrom := v.Underlying.Type().ElementType()
+		typeTo := v.CastType.ElementType()
+		if isScalar(typeFrom) && isScalar(typeTo) && v.Eval.TargetData.TypeAllocSize(typeFrom) == v.Eval.TargetData.TypeAllocSize(typeTo) {
+			return llvm.ConstBitCast(v.Underlying.Load(), v.CastType.ElementType())
+		}
+	}
+
+	panic("interp: load from a pointer bitcast: " + v.String())
+}
+
+// Store panics: it is not (yet) possible to store directly to a bitcast.
+func (v *PointerCastValue) Store(value llvm.Value) {
+	panic("interp: store on a pointer bitcast")
+}
+
+// GetElementPtr panics: it is not (yet) possible to do a GEP operation on a
+// bitcast.
+func (v *PointerCastValue) GetElementPtr(indices []uint32) Value {
+	panic("interp: GEP on a pointer bitcast")
+}
+
+func (v *PointerCastValue) String() string {
+	return "&PointerCastValue{Value: " + v.Underlying.String() + ", CastType: " + v.CastType.String() + "}"
+}
+
 // MapValue implements a Go map which is created at compile time and stored as a
 // global variable.
 type MapValue struct {
@@ -206,13 +451,6 @@ func (v *MapValue) Value() llvm.Value {
 				keyBuf[i] = byte(n)
 				n >>= 8
 			}
-		} else if key.Type().TypeKind() == llvm.ArrayTypeKind &&
-			key.Type().ElementType().TypeKind() == llvm.IntegerTypeKind &&
-			key.Type().ElementType().IntTypeWidth() == 8 {
-			keyBuf = make([]byte, v.Eval.TargetData.TypeAllocSize(key.Type()))
-			for i := range keyBuf {
-				keyBuf[i] = byte(llvm.ConstExtractValue(llvmKey, []uint32{uint32(i)}).ZExtValue())
-			}
 		} else {
 			panic("interp: map key type not implemented: " + key.Type().String())
 		}
@@ -289,24 +527,27 @@ func (v *MapValue) GetElementPtr(indices []uint32) Value {
 
 // PutString does a map assign operation, assuming that the map is of type
 // map[string]T.
-func (v *MapValue) PutString(keyBuf, keyLen, valPtr *LocalValue) {
+func (v *MapValue) PutString(keyBuf, keyLen, valPtr Value) {
 	if !v.Underlying.IsNil() {
 		panic("map already created")
 	}
 
-	if valPtr.Underlying.Opcode() == llvm.BitCast {
-		valPtr = &LocalValue{v.Eval, valPtr.Underlying.Operand(0)}
-	}
-	value := valPtr.Load()
-	if v.ValueType.IsNil() {
-		v.ValueType = value.Type()
-		if int(v.Eval.TargetData.TypeAllocSize(v.ValueType)) != v.ValueSize {
-			panic("interp: map store value type has the wrong size")
-		}
-	} else {
-		if value.Type() != v.ValueType {
-			panic("interp: map store value type is inconsistent")
+	var value llvm.Value
+	switch valPtr := valPtr.(type) {
+	case *PointerCastValue:
+		value = valPtr.Underlying.Load()
+		if v.ValueType.IsNil() {
+			v.ValueType = value.Type()
+			if int(v.Eval.TargetData.TypeAllocSize(v.ValueType)) != v.ValueSize {
+				panic("interp: map store value type has the wrong size")
+			}
+		} else {
+			if value.Type() != v.ValueType {
+				panic("interp: map store value type is inconsistent")
+			}
 		}
+	default:
+		panic("interp: todo: handle map value pointer")
 	}
 
 	keyType := v.Eval.Mod.GetTypeByName("runtime._string")
@@ -320,49 +561,6 @@ func (v *MapValue) PutString(keyBuf, keyLen, valPtr *LocalValue) {
 	v.Values = append(v.Values, &LocalValue{v.Eval, value})
 }
 
-// PutBinary does a map assign operation.
-func (v *MapValue) PutBinary(keyPtr, valPtr *LocalValue) {
-	if !v.Underlying.IsNil() {
-		panic("map already created")
-	}
-
-	if valPtr.Underlying.Opcode() == llvm.BitCast {
-		valPtr = &LocalValue{v.Eval, valPtr.Underlying.Operand(0)}
-	}
-	value := valPtr.Load()
-	if v.ValueType.IsNil() {
-		v.ValueType = value.Type()
-		if int(v.Eval.TargetData.TypeAllocSize(v.ValueType)) != v.ValueSize {
-			panic("interp: map store value type has the wrong size")
-		}
-	} else {
-		if value.Type() != v.ValueType {
-			panic("interp: map store value type is inconsistent")
-		}
-	}
-
-	if keyPtr.Underlying.Opcode() == llvm.BitCast {
-		keyPtr = &LocalValue{v.Eval, keyPtr.Underlying.Operand(0)}
-	} else if keyPtr.Underlying.Opcode() == llvm.GetElementPtr {
-		keyPtr = &LocalValue{v.Eval, keyPtr.Underlying.Operand(0)}
-	}
-	key := keyPtr.Load()
-	if v.KeyType.IsNil() {
-		v.KeyType = key.Type()
-		if int(v.Eval.TargetData.TypeAllocSize(v.KeyType)) != v.KeySize {
-			panic("interp: map store key type has the wrong size")
-		}
-	} else {
-		if key.Type() != v.KeyType {
-			panic("interp: map store key type is inconsistent")
-		}
-	}
-
-	// TODO: avoid duplicate keys
-	v.Keys = append(v.Keys, &LocalValue{v.Eval, key})
-	v.Values = append(v.Values, &LocalValue{v.Eval, value})
-}
-
 // Get FNV-1a hash of this string.
 //
 // https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function#FNV-1a_hash

ir/interpreter.go

@@ -0,0 +1,522 @@
+package ir
+
+// This file provides functionality to interpret very basic Go SSA, for
+// compile-time initialization of globals.
+
+import (
+	"errors"
+	"fmt"
+	"go/constant"
+	"go/token"
+	"go/types"
+	"strings"
+
+	"golang.org/x/tools/go/ssa"
+)
+
+var ErrCGoWrapper = errors.New("tinygo internal: cgo wrapper") // a signal, not an error
+
+// Ignore these calls (replace with a zero return value) when encountered during
+// interpretation.
+var ignoreInitCalls = map[string]struct{}{
+	"syscall.runtime_envs":   struct{}{},
+	"syscall/js.predefValue": struct{}{},
+	"(syscall/js.Value).Get": struct{}{},
+	"(syscall/js.Value).New": struct{}{},
+	"(syscall/js.Value).Int": struct{}{},
+	"os.init$1":              struct{}{},
+}
+
+// Interpret instructions as far as possible, and drop those instructions from
+// the basic block.
+func (p *Program) Interpret(block *ssa.BasicBlock, dumpSSA bool) error {
+	if dumpSSA {
+		fmt.Printf("\ninterpret: %s\n", block.Parent().Pkg.Pkg.Path())
+	}
+	for {
+		i, err := p.interpret(block.Instrs, nil, nil, nil, dumpSSA)
+		if err == ErrCGoWrapper {
+			// skip this instruction
+			block.Instrs = block.Instrs[i+1:]
+			continue
+		}
+		block.Instrs = block.Instrs[i:]
+		return err
+	}
+}
+
+// Interpret instructions as far as possible, and return the index of the first
+// unknown instruction.
+func (p *Program) interpret(instrs []ssa.Instruction, paramKeys []*ssa.Parameter, paramValues []Value, results []Value, dumpSSA bool) (int, error) {
+	locals := map[ssa.Value]Value{}
+	for i, key := range paramKeys {
+		locals[key] = paramValues[i]
+	}
+	for i, instr := range instrs {
+		if _, ok := instr.(*ssa.DebugRef); ok {
+			continue
+		}
+		if dumpSSA {
+			if val, ok := instr.(ssa.Value); ok && val.Name() != "" {
+				fmt.Printf("\t%s: %s = %s\n", instr.Parent().RelString(nil), val.Name(), val.String())
+			} else {
+				fmt.Printf("\t%s: %s\n", instr.Parent().RelString(nil), instr.String())
+			}
+		}
+		switch instr := instr.(type) {
+		case *ssa.Alloc:
+			alloc, err := p.getZeroValue(instr.Type().Underlying().(*types.Pointer).Elem())
+			if err != nil {
+				return i, err
+			}
+			locals[instr] = &PointerValue{nil, &alloc}
+		case *ssa.BinOp:
+			if typ, ok := instr.Type().(*types.Basic); ok && typ.Kind() == types.String {
+				// Concatenate two strings.
+				// This happens in the time package, for example.
+				x, err := p.getValue(instr.X, locals)
+				if err != nil {
+					return i, err
+				}
+				y, err := p.getValue(instr.Y, locals)
+				if err != nil {
+					return i, err
+				}
+				xstr := constant.StringVal(x.(*ConstValue).Expr.Value)
+				ystr := constant.StringVal(y.(*ConstValue).Expr.Value)
+				locals[instr] = &ConstValue{ssa.NewConst(constant.MakeString(xstr+ystr), types.Typ[types.String])}
+			} else {
+				return i, errors.New("init: unknown binop: " + instr.String())
+			}
+		case *ssa.Call:
+			common := instr.Common()
+			callee := common.StaticCallee()
+			if callee == nil {
+				return i, nil // don't understand dynamic dispatch
+			}
+			if _, ok := ignoreInitCalls[callee.String()]; ok {
+				// These calls are not needed and can be ignored, for the time
+				// being.
+				results := make([]Value, callee.Signature.Results().Len())
+				for i := range results {
+					var err error
+					results[i], err = p.getZeroValue(callee.Signature.Results().At(i).Type())
+					if err != nil {
+						return i, err
+					}
+				}
+				if len(results) == 1 {
+					locals[instr] = results[0]
+				} else if len(results) > 1 {
+					locals[instr] = &StructValue{Fields: results}
+				}
+				continue
+			}
+			if callee.String() == "os.NewFile" {
+				// Emulate the creation of os.Stdin, os.Stdout and os.Stderr.
+				resultPtrType := callee.Signature.Results().At(0).Type().(*types.Pointer)
+				resultStructOuterType := resultPtrType.Elem().Underlying().(*types.Struct)
+				if resultStructOuterType.NumFields() != 1 {
+					panic("expected 1 field in os.File struct")
+				}
+				fileInnerPtrType := resultStructOuterType.Field(0).Type().(*types.Pointer)
+				fileInnerType := fileInnerPtrType.Elem().(*types.Named)
+				fileInnerStructType := fileInnerType.Underlying().(*types.Struct)
+				fileInner, err := p.getZeroValue(fileInnerType) // os.file
+				if err != nil {
+					return i, err
+				}
+				for fieldIndex := 0; fieldIndex < fileInnerStructType.NumFields(); fieldIndex++ {
+					field := fileInnerStructType.Field(fieldIndex)
+					if field.Name() == "name" {
+						// Set the 'name' field.
+						name, err := p.getValue(common.Args[1], locals)
+						if err != nil {
+							return i, err
+						}
+						fileInner.(*StructValue).Fields[fieldIndex] = name
+					} else if field.Type().String() == "internal/poll.FD" {
+						// Set the file descriptor field.
+						field := field.Type().Underlying().(*types.Struct)
+						for subfieldIndex := 0; subfieldIndex < field.NumFields(); subfieldIndex++ {
+							subfield := field.Field(subfieldIndex)
+							if subfield.Name() == "Sysfd" {
+								sysfd, err := p.getValue(common.Args[0], locals)
+								if err != nil {
+									return i, err
+								}
+								sysfd = &ConstValue{Expr: ssa.NewConst(sysfd.(*ConstValue).Expr.Value, subfield.Type())}
+								fileInner.(*StructValue).Fields[fieldIndex].(*StructValue).Fields[subfieldIndex] = sysfd
+							}
+						}
+					}
+				}
+				fileInnerPtr := &PointerValue{fileInnerPtrType, &fileInner}                                   // *os.file
+				var fileOuter Value = &StructValue{Type: resultPtrType.Elem(), Fields: []Value{fileInnerPtr}} // os.File
+				result := &PointerValue{resultPtrType.Elem(), &fileOuter}                                     // *os.File
+				locals[instr] = result
+				continue
+			}
+			if canInterpret(callee) {
+				params := make([]Value, len(common.Args))
+				for i, arg := range common.Args {
+					val, err := p.getValue(arg, locals)
+					if err != nil {
+						return i, err
+					}
+					params[i] = val
+				}
+				results := make([]Value, callee.Signature.Results().Len())
+				subi, err := p.interpret(callee.Blocks[0].Instrs, callee.Params, params, results, dumpSSA)
+				if err != nil {
+					return i, err
+				}
+				if subi != len(callee.Blocks[0].Instrs) {
+					return i, errors.New("init: could not interpret all instructions of subroutine")
+				}
+				if len(results) == 1 {
+					locals[instr] = results[0]
+				} else {
+					panic("unimplemented: not exactly 1 result")
+				}
+				continue
+			}
+			if callee.Object() == nil || callee.Object().Name() == "init" {
+				return i, nil // arrived at the init#num functions
+			}
+			return i, errors.New("todo: init call: " + callee.String())
+		case *ssa.ChangeType:
+			x, err := p.getValue(instr.X, locals)
+			if err != nil {
+				return i, err
+			}
+			// The only case when we need to bitcast is when casting between named
+			// struct types, as those are actually different in LLVM. Let's just
+			// bitcast all struct types for ease of use.
+			if _, ok := instr.Type().Underlying().(*types.Struct); ok {
+				return i, errors.New("todo: init: " + instr.String())
+			}
+			locals[instr] = x
+		case *ssa.Convert:
+			x, err := p.getValue(instr.X, locals)
+			if err != nil {
+				return i, err
+			}
+			typeFrom := instr.X.Type().Underlying()
+			switch typeTo := instr.Type().Underlying().(type) {
+			case *types.Basic:
+				if typeTo.Kind() == types.String {
+					return i, nil
+				}
+
+				if _, ok := typeFrom.(*types.Pointer); ok && typeTo.Kind() == types.UnsafePointer {
+					locals[instr] = &PointerBitCastValue{typeTo, x}
+				} else if typeFrom, ok := typeFrom.(*types.Basic); ok {
+					if typeFrom.Kind() == types.UnsafePointer && typeTo.Kind() == types.Uintptr {
+						locals[instr] = &PointerToUintptrValue{x}
+					} else if typeFrom.Info()&types.IsInteger != 0 && typeTo.Info()&types.IsInteger != 0 {
+						locals[instr] = &ConstValue{Expr: ssa.NewConst(x.(*ConstValue).Expr.Value, typeTo)}
+					} else {
+						return i, nil
+					}
+				} else {
+					return i, nil
+				}
+			case *types.Pointer:
+				if typeFrom, ok := typeFrom.(*types.Basic); ok && typeFrom.Kind() == types.UnsafePointer {
+					locals[instr] = &PointerBitCastValue{typeTo, x}
+				} else {
+					panic("expected unsafe pointer conversion")
+				}
+			default:
+				return i, nil
+			}
+		case *ssa.DebugRef:
+			// ignore
+		case *ssa.Extract:
+			tuple, err := p.getValue(instr.Tuple, locals)
+			if err != nil {
+				return i, err
+			}
+			locals[instr] = tuple.(*StructValue).Fields[instr.Index]
+		case *ssa.FieldAddr:
+			x, err := p.getValue(instr.X, locals)
+			if err != nil {
+				return i, err
+			}
+			var structVal *StructValue
+			switch x := x.(type) {
+			case *GlobalValue:
+				structVal = x.Global.initializer.(*StructValue)
+			case *PointerValue:
+				structVal = (*x.Elem).(*StructValue)
+			default:
+				panic("expected a pointer")
+			}
+			locals[instr] = &PointerValue{nil, &structVal.Fields[instr.Field]}
+		case *ssa.IndexAddr:
+			x, err := p.getValue(instr.X, locals)
+			if err != nil {
+				return i, err
+			}
+			if cnst, ok := instr.Index.(*ssa.Const); ok {
+				index, _ := constant.Int64Val(cnst.Value)
+				switch xPtr := x.(type) {
+				case *GlobalValue:
+					x = xPtr.Global.initializer
+				case *PointerValue:
+					x = *xPtr.Elem
+				default:
+					panic("expected a pointer")
+				}
+				switch x := x.(type) {
+				case *ArrayValue:
+					locals[instr] = &PointerValue{nil, &x.Elems[index]}
+				default:
+					return i, errors.New("todo: init IndexAddr not on an array or struct")
+				}
+			} else {
+				return i, errors.New("todo: init IndexAddr index: " + instr.Index.String())
+			}
+		case *ssa.MakeMap:
+			locals[instr] = &MapValue{instr.Type().Underlying().(*types.Map), nil, nil}
+		case *ssa.MapUpdate:
+			// Assume no duplicate keys exist. This is most likely true for
+			// autogenerated code, but may not be true when trying to interpret
+			// user code.
+			key, err := p.getValue(instr.Key, locals)
+			if err != nil {
+				return i, err
+			}
+			value, err := p.getValue(instr.Value, locals)
+			if err != nil {
+				return i, err
+			}
+			x := locals[instr.Map].(*MapValue)
+			x.Keys = append(x.Keys, key)
+			x.Values = append(x.Values, value)
+		case *ssa.Return:
+			for i, r := range instr.Results {
+				val, err := p.getValue(r, locals)
+				if err != nil {
+					return i, err
+				}
+				results[i] = val
+			}
+		case *ssa.Slice:
+			// Turn a just-allocated array into a slice.
+			if instr.Low != nil || instr.High != nil || instr.Max != nil {
+				return i, errors.New("init: slice expression with bounds")
+			}
+			source, err := p.getValue(instr.X, locals)
+			if err != nil {
+				return i, err
+			}
+			switch source := source.(type) {
+			case *PointerValue: // pointer to array
+				array := (*source.Elem).(*ArrayValue)
+				locals[instr] = &SliceValue{instr.Type().Underlying().(*types.Slice), array}
+			default:
+				return i, errors.New("init: unknown slice type")
+			}
+		case *ssa.Store:
+			if addr, ok := instr.Addr.(*ssa.Global); ok {
+				if strings.HasPrefix(instr.Addr.Name(), "__cgofn__cgo_") || strings.HasPrefix(instr.Addr.Name(), "_cgo_") {
+					// Ignore CGo global variables which we don't use.
+					continue
+				}
+				value, err := p.getValue(instr.Val, locals)
+				if err != nil {
+					return i, err
+				}
+				p.GetGlobal(addr).initializer = value
+			} else if addr, ok := locals[instr.Addr]; ok {
+				value, err := p.getValue(instr.Val, locals)
+				if err != nil {
+					return i, err
+				}
+				if addr, ok := addr.(*PointerValue); ok {
+					*(addr.Elem) = value
+				} else {
+					panic("store to non-pointer")
+				}
+			} else {
+				return i, errors.New("todo: init Store: " + instr.String())
+			}
+		case *ssa.UnOp:
+			if instr.Op != token.MUL || instr.CommaOk {
+				return i, errors.New("init: unknown unop: " + instr.String())
+			}
+			valPtr, err := p.getValue(instr.X, locals)
+			if err != nil {
+				return i, err
+			}
+			switch valPtr := valPtr.(type) {
+			case *GlobalValue:
+				locals[instr] = valPtr.Global.initializer
+			case *PointerValue:
+				locals[instr] = *valPtr.Elem
+			default:
+				panic("expected a pointer")
+			}
+		default:
+			return i, nil
+		}
+	}
+	return len(instrs), nil
+}
+
+// Check whether this function can be interpreted at compile time. For that, it
+// needs to only contain relatively simple instructions (for example, no control
+// flow).
+func canInterpret(callee *ssa.Function) bool {
+	if len(callee.Blocks) != 1 || callee.Signature.Results().Len() != 1 {
+		// No control flow supported so only one basic block.
+		// Only exactly one return value supported right now so check that as
+		// well.
+		return false
+	}
+	for _, instr := range callee.Blocks[0].Instrs {
+		switch instr.(type) {
+		// Ignore all functions fully supported by Program.interpret()
+		// above.
+		case *ssa.Alloc:
+		case *ssa.ChangeType:
+		case *ssa.DebugRef:
+		case *ssa.Extract:
+		case *ssa.FieldAddr:
+		case *ssa.IndexAddr:
+		case *ssa.MakeMap:
+		case *ssa.MapUpdate:
+		case *ssa.Return:
+		case *ssa.Slice:
+		case *ssa.Store:
+		case *ssa.UnOp:
+		default:
+			return false
+		}
+	}
+	return true
+}
+
+func (p *Program) getValue(value ssa.Value, locals map[ssa.Value]Value) (Value, error) {
+	switch value := value.(type) {
+	case *ssa.Const:
+		return &ConstValue{value}, nil
+	case *ssa.Function:
+		return &FunctionValue{value.Type(), value}, nil
+	case *ssa.Global:
+		if strings.HasPrefix(value.Name(), "__cgofn__cgo_") || strings.HasPrefix(value.Name(), "_cgo_") {
+			// Ignore CGo global variables which we don't use.
+			return nil, ErrCGoWrapper
+		}
+		g := p.GetGlobal(value)
+		if g.initializer == nil {
+			value, err := p.getZeroValue(value.Type().Underlying().(*types.Pointer).Elem())
+			if err != nil {
+				return nil, err
+			}
+			g.initializer = value
+		}
+		return &GlobalValue{g}, nil
+	default:
+		if local, ok := locals[value]; ok {
+			return local, nil
+		} else {
+			return nil, errors.New("todo: init: unknown value: " + value.String())
+		}
+	}
+}
+
+func (p *Program) getZeroValue(t types.Type) (Value, error) {
+	switch typ := t.Underlying().(type) {
+	case *types.Array:
+		elems := make([]Value, typ.Len())
+		for i := range elems {
+			elem, err := p.getZeroValue(typ.Elem())
+			if err != nil {
+				return nil, err
+			}
+			elems[i] = elem
+		}
+		return &ArrayValue{typ.Elem(), elems}, nil
+	case *types.Basic:
+		return &ZeroBasicValue{typ}, nil
+	case *types.Signature:
+		return &FunctionValue{typ, nil}, nil
+	case *types.Map:
+		return &MapValue{typ, nil, nil}, nil
+	case *types.Pointer:
+		return &PointerValue{typ, nil}, nil
+	case *types.Struct:
+		elems := make([]Value, typ.NumFields())
+		for i := range elems {
+			elem, err := p.getZeroValue(typ.Field(i).Type())
+			if err != nil {
+				return nil, err
+			}
+			elems[i] = elem
+		}
+		return &StructValue{t, elems}, nil
+	case *types.Slice:
+		return &SliceValue{typ, nil}, nil
+	default:
+		return nil, errors.New("todo: init: unknown global type: " + typ.String())
+	}
+}
+
+// Boxed value for interpreter.
+type Value interface {
+}
+
+type ConstValue struct {
+	Expr *ssa.Const
+}
+
+type ZeroBasicValue struct {
+	Type *types.Basic
+}
+
+type PointerValue struct {
+	Type types.Type
+	Elem *Value
+}
+
+type FunctionValue struct {
+	Type types.Type
+	Elem *ssa.Function
+}
+
+type PointerBitCastValue struct {
+	Type types.Type
+	Elem Value
+}
+
+type PointerToUintptrValue struct {
+	Elem Value
+}
+
+type GlobalValue struct {
+	Global *Global
+}
+
+type ArrayValue struct {
+	ElemType types.Type
+	Elems    []Value
+}
+
+type StructValue struct {
+	Type   types.Type // types.Struct or types.Named
+	Fields []Value
+}
+
+type SliceValue struct {
+	Type  *types.Slice
+	Array *ArrayValue
+}
+
+type MapValue struct {
+	Type   *types.Map
+	Keys   []Value
+	Values []Value
+}

ir/ir.go

@@ -7,9 +7,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/tinygo-org/tinygo/loader"
+	"github.com/aykevl/go-llvm"
+	"github.com/aykevl/tinygo/loader"
 	"golang.org/x/tools/go/ssa"
-	"tinygo.org/x/go-llvm"
 )
 
 // This file provides a wrapper around go/ssa values and adds extra
@@ -18,36 +18,41 @@ import (
 // View on all functions, types, and globals in a program, with analysis
 // results.
 type Program struct {
-	Program       *ssa.Program
-	LoaderProgram *loader.Program
-	mainPkg       *ssa.Package
-	Functions     []*Function
-	functionMap   map[*ssa.Function]*Function
-	Globals       []*Global
-	globalMap     map[*ssa.Global]*Global
-	comments      map[string]*ast.CommentGroup
-	NamedTypes    []*NamedType
+	Program        *ssa.Program
+	LoaderProgram  *loader.Program
+	mainPkg        *ssa.Package
+	Functions      []*Function
+	functionMap    map[*ssa.Function]*Function
+	Globals        []*Global
+	globalMap      map[*ssa.Global]*Global
+	comments       map[string]*ast.CommentGroup
+	NamedTypes     []*NamedType
+	needsScheduler bool
+	goCalls        []*ssa.Go
 }
 
 // Function or method.
 type Function struct {
 	*ssa.Function
 	LLVMFn    llvm.Value
-	linkName  string     // go:linkname, go:export, go:interrupt
-	exported  bool       // go:export
-	nobounds  bool       // go:nobounds
-	flag      bool       // used by dead code elimination
-	interrupt bool       // go:interrupt
-	inline    InlineType // go:inline
+	linkName  string      // go:linkname, go:export, go:interrupt
+	exported  bool        // go:export
+	nobounds  bool        // go:nobounds
+	blocking  bool        // calculated by AnalyseBlockingRecursive
+	flag      bool        // used by dead code elimination
+	interrupt bool        // go:interrupt
+	parents   []*Function // calculated by AnalyseCallgraph
+	children  []*Function // calculated by AnalyseCallgraph
 }
 
 // Global variable, possibly constant.
 type Global struct {
 	*ssa.Global
-	program    *Program
-	LLVMGlobal llvm.Value
-	linkName   string // go:extern
-	extern     bool   // go:extern
+	program     *Program
+	LLVMGlobal  llvm.Value
+	linkName    string // go:extern
+	extern      bool   // go:extern
+	initializer Value
 }
 
 // Type with a name and possibly methods.
@@ -70,22 +75,7 @@ type Interface struct {
 	Type *types.Interface
 }
 
-type InlineType int
-
-// How much to inline.
-const (
-	// Default behavior. The compiler decides for itself whether any given
-	// function will be inlined. Whether any function is inlined depends on the
-	// optimization level.
-	InlineDefault InlineType = iota
-
-	// Inline hint, just like the C inline keyword (signalled using
-	// //go:inline). The compiler will be more likely to inline this function,
-	// but it is not a guarantee.
-	InlineHint
-)
-
-// Create and initialize a new *Program from a *ssa.Program.
+// Create and intialize a new *Program from a *ssa.Program.
 func NewProgram(lprogram *loader.Program, mainPath string) *Program {
 	comments := map[string]*ast.CommentGroup{}
 	for _, pkgInfo := range lprogram.Sorted() {
@@ -203,6 +193,9 @@ func NewProgram(lprogram *loader.Program, mainPath string) *Program {
 func (p *Program) AddPackage(pkg *ssa.Package) {
 	memberNames := make([]string, 0)
 	for name := range pkg.Members {
+		if isCGoInternal(name) {
+			continue
+		}
 		memberNames = append(memberNames, name)
 	}
 	sort.Strings(memberNames)
@@ -211,6 +204,9 @@ func (p *Program) AddPackage(pkg *ssa.Package) {
 		member := pkg.Members[name]
 		switch member := member.(type) {
 		case *ssa.Function:
+			if isCGoInternal(member.Name()) {
+				continue
+			}
 			p.addFunction(member)
 		case *ssa.Type:
 			t := &NamedType{Type: member}
@@ -278,16 +274,10 @@ func (f *Function) parsePragmas() {
 	}
 	if decl, ok := f.Syntax().(*ast.FuncDecl); ok && decl.Doc != nil {
 		for _, comment := range decl.Doc.List {
-			text := comment.Text
-			if strings.HasPrefix(text, "//export ") {
-				// Rewrite '//export' to '//go:export' for compatibility with
-				// gc.
-				text = "//go:" + text[2:]
-			}
-			if !strings.HasPrefix(text, "//go:") {
+			if !strings.HasPrefix(comment.Text, "//go:") {
 				continue
 			}
-			parts := strings.Fields(text)
+			parts := strings.Fields(comment.Text)
 			switch parts[0] {
 			case "//go:export":
 				if len(parts) != 2 {
@@ -295,8 +285,6 @@ func (f *Function) parsePragmas() {
 				}
 				f.linkName = parts[1]
 				f.exported = true
-			case "//go:inline":
-				f.inline = InlineHint
 			case "//go:interrupt":
 				if len(parts) != 2 {
 					continue
@@ -339,7 +327,7 @@ func (f *Function) IsNoBounds() bool {
 
 // Return true iff this function is externally visible.
 func (f *Function) IsExported() bool {
-	return f.exported || f.CName() != ""
+	return f.exported
 }
 
 // Return true for functions annotated with //go:interrupt. The function name is
@@ -347,12 +335,7 @@ func (f *Function) IsExported() bool {
 //
 // On some platforms (like AVR), interrupts need a special compiler flag.
 func (f *Function) IsInterrupt() bool {
-	return f.interrupt
-}
-
-// Return the inline directive of this function.
-func (f *Function) Inline() InlineType {
-	return f.inline
+	return f.exported
 }
 
 // Return the link name for this function.
@@ -411,25 +394,15 @@ func (g *Global) LinkName() string {
 	if g.linkName != "" {
 		return g.linkName
 	}
-	if name := g.CName(); name != "" {
-		return name
-	}
 	return g.RelString(nil)
 }
 
 func (g *Global) IsExtern() bool {
-	return g.extern || g.CName() != ""
+	return g.extern
 }
 
-// Return the name of the C global if this is a CGo wrapper. Otherwise, return a
-// zero-length string.
-func (g *Global) CName() string {
-	name := g.Name()
-	if strings.HasPrefix(name, "C.") {
-		// created by ../loader/cgo.go
-		return name[2:]
-	}
-	return ""
+func (g *Global) Initializer() Value {
+	return g.initializer
 }
 
 // Return true if this named type is annotated with the //go:volatile pragma,
@@ -455,6 +428,18 @@ func (p *Program) IsVolatile(t types.Type) bool {
 	}
 }
 
+// Return true if this is a CGo-internal function that can be ignored.
+func isCGoInternal(name string) bool {
+	if strings.HasPrefix(name, "_Cgo_") || strings.HasPrefix(name, "_cgo") {
+		// _Cgo_ptr, _Cgo_use, _cgoCheckResult, _cgo_runtime_cgocall
+		return true // CGo-internal functions
+	}
+	if strings.HasPrefix(name, "__cgofn__cgo_") {
+		return true // CGo function pointer in global scope
+	}
+	return false
+}
+
 // Get all methods of a type.
 func getAllMethods(prog *ssa.Program, typ types.Type) []*types.Selection {
 	ms := prog.MethodSets.MethodSet(typ)

ir/passes.go

@@ -56,6 +56,110 @@ func signature(sig *types.Signature) string {
 	return s
 }
 
+// Fill in parents of all functions.
+//
+// All packages need to be added before this pass can run, or it will produce
+// incorrect results.
+func (p *Program) AnalyseCallgraph() {
+	for _, f := range p.Functions {
+		// Clear, if AnalyseCallgraph has been called before.
+		f.children = nil
+		f.parents = nil
+
+		for _, block := range f.Blocks {
+			for _, instr := range block.Instrs {
+				switch instr := instr.(type) {
+				case *ssa.Call:
+					if instr.Common().IsInvoke() {
+						continue
+					}
+					switch call := instr.Call.Value.(type) {
+					case *ssa.Builtin:
+						// ignore
+					case *ssa.Function:
+						if isCGoInternal(call.Name()) {
+							continue
+						}
+						child := p.GetFunction(call)
+						if child.CName() != "" {
+							continue // assume non-blocking
+						}
+						if child.RelString(nil) == "time.Sleep" {
+							f.blocking = true
+						}
+						f.children = append(f.children, child)
+					}
+				}
+			}
+		}
+	}
+	for _, f := range p.Functions {
+		for _, child := range f.children {
+			child.parents = append(child.parents, f)
+		}
+	}
+}
+
+// Analyse which functions are recursively blocking.
+//
+// Depends on AnalyseCallgraph.
+func (p *Program) AnalyseBlockingRecursive() {
+	worklist := make([]*Function, 0)
+
+	// Fill worklist with directly blocking functions.
+	for _, f := range p.Functions {
+		if f.blocking {
+			worklist = append(worklist, f)
+		}
+	}
+
+	// Keep reducing this worklist by marking a function as recursively blocking
+	// from the worklist and pushing all its parents that are non-blocking.
+	// This is somewhat similar to a worklist in a mark-sweep garbage collector.
+	// The work items are then grey objects.
+	for len(worklist) != 0 {
+		// Pick the topmost.
+		f := worklist[len(worklist)-1]
+		worklist = worklist[:len(worklist)-1]
+		for _, parent := range f.parents {
+			if !parent.blocking {
+				parent.blocking = true
+				worklist = append(worklist, parent)
+			}
+		}
+	}
+}
+
+// Check whether we need a scheduler. A scheduler is only necessary when there
+// are go calls that start blocking functions (if they're not blocking, the go
+// function can be turned into a regular function call).
+//
+// Depends on AnalyseBlockingRecursive.
+func (p *Program) AnalyseGoCalls() {
+	p.goCalls = nil
+	for _, f := range p.Functions {
+		for _, block := range f.Blocks {
+			for _, instr := range block.Instrs {
+				switch instr := instr.(type) {
+				case *ssa.Go:
+					p.goCalls = append(p.goCalls, instr)
+				}
+			}
+		}
+	}
+	for _, instr := range p.goCalls {
+		switch instr := instr.Call.Value.(type) {
+		case *ssa.Builtin:
+		case *ssa.Function:
+			if p.functionMap[instr].blocking {
+				p.needsScheduler = true
+			}
+		default:
+			panic("unknown go call function type")
+		}
+	}
+}
+
 // Simple pass that removes dead code. This pass makes later analysis passes
 // more useful.
 func (p *Program) SimpleDCE() {
@@ -68,12 +172,11 @@ func (p *Program) SimpleDCE() {
 	// functions.
 	main := p.mainPkg.Members["main"].(*ssa.Function)
 	runtimePkg := p.Program.ImportedPackage("runtime")
-	mathPkg := p.Program.ImportedPackage("math")
 	p.GetFunction(main).flag = true
 	worklist := []*ssa.Function{main}
 	for _, f := range p.Functions {
-		if f.exported || f.Synthetic == "package initializer" || f.Pkg == runtimePkg || (f.Pkg == mathPkg && f.Pkg != nil) {
-			if f.flag {
+		if f.exported || f.Synthetic == "package initializer" || f.Pkg == runtimePkg {
+			if f.flag || isCGoInternal(f.Name()) {
 				continue
 			}
 			f.flag = true
@@ -103,7 +206,7 @@ func (p *Program) SimpleDCE() {
 					}
 				}
 				for _, operand := range instr.Operands(nil) {
-					if operand == nil || *operand == nil {
+					if operand == nil || *operand == nil || isCGoInternal((*operand).Name()) {
 						continue
 					}
 					switch operand := (*operand).(type) {
@@ -136,3 +239,21 @@ func (p *Program) SimpleDCE() {
 	}
 	p.Functions = livefunctions
 }
+
+// Whether this function needs a scheduler.
+//
+// Depends on AnalyseGoCalls.
+func (p *Program) NeedsScheduler() bool {
+	return p.needsScheduler
+}
+
+// Whether this function blocks. Builtins are also accepted for convenience.
+// They will always be non-blocking.
+//
+// Depends on AnalyseBlockingRecursive.
+func (p *Program) IsBlocking(f *Function) bool {
+	if !p.needsScheduler {
+		return false
+	}
+	return f.blocking
+}

linker-builtin.go

@@ -1,68 +0,0 @@
-// +build byollvm
-
-package main
-
-// This file provides a Link() function that uses the bundled lld if possible.
-
-import (
-	"errors"
-	"os"
-	"os/exec"
-	"unsafe"
-)
-
-/*
-#include <stdbool.h>
-#include <stdlib.h>
-bool tinygo_link_elf(int argc, char **argv);
-bool tinygo_link_wasm(int argc, char **argv);
-*/
-import "C"
-
-// Link invokes a linker with the given name and flags.
-//
-// This version uses the built-in linker when trying to use lld.
-func Link(linker string, flags ...string) error {
-	switch linker {
-	case "ld.lld":
-		flags = append([]string{"tinygo:" + linker}, flags...)
-		var cflag *C.char
-		buf := C.calloc(C.size_t(len(flags)), C.size_t(unsafe.Sizeof(cflag)))
-		cflags := (*[1 << 10]*C.char)(unsafe.Pointer(buf))[:len(flags):len(flags)]
-		for i, flag := range flags {
-			cflag := C.CString(flag)
-			cflags[i] = cflag
-			defer C.free(unsafe.Pointer(cflag))
-		}
-		ok := C.tinygo_link_elf(C.int(len(flags)), (**C.char)(buf))
-		if !ok {
-			return errors.New("failed to link using built-in ld.lld")
-		}
-		return nil
-	case "wasm-ld":
-		flags = append([]string{"tinygo:" + linker}, flags...)
-		var cflag *C.char
-		buf := C.calloc(C.size_t(len(flags)), C.size_t(unsafe.Sizeof(cflag)))
-		defer C.free(buf)
-		cflags := (*[1 << 10]*C.char)(unsafe.Pointer(buf))[:len(flags):len(flags)]
-		for i, flag := range flags {
-			cflag := C.CString(flag)
-			cflags[i] = cflag
-			defer C.free(unsafe.Pointer(cflag))
-		}
-		ok := C.tinygo_link_wasm(C.int(len(flags)), (**C.char)(buf))
-		if !ok {
-			return errors.New("failed to link using built-in wasm-ld")
-		}
-		return nil
-	default:
-		// Fall back to external command.
-		if cmdNames, ok := commands[linker]; ok {
-			return execCommand(cmdNames, flags...)
-		}
-		cmd := exec.Command(linker, flags...)
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		return cmd.Run()
-	}
-}

linker-external.go

@@ -1,24 +0,0 @@
-// +build !byollvm
-
-package main
-
-// This file provides a Link() function that always runs an external command. It
-// is provided for when tinygo is built without linking to liblld.
-
-import (
-	"os"
-	"os/exec"
-)
-
-// Link invokes a linker with the given name and arguments.
-//
-// This version always runs the linker as an external command.
-func Link(linker string, flags ...string) error {
-	if cmdNames, ok := commands[linker]; ok {
-		return execCommand(cmdNames, flags...)
-	}
-	cmd := exec.Command(linker, flags...)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return cmd.Run()
-}

lld.cpp

@@ -1,19 +0,0 @@
-// +build byollvm
-
-// This file provides C wrappers for liblld.
-
-#include <lld/Common/Driver.h>
-
-extern "C" {
-
-bool tinygo_link_elf(int argc, char **argv) {
-	std::vector<const char*> args(argv, argv + argc);
-	return lld::elf::link(args, false);
-}
-
-bool tinygo_link_wasm(int argc, char **argv) {
-	std::vector<const char*> args(argv, argv + argc);
-	return lld::wasm::link(args, false);
-}
-
-} // external "C"

loader/cgo.go

@@ -0,0 +1,362 @@
+package loader
+
+// This file extracts the `import "C"` statement from the source and modifies
+// the AST for Cgo. It does not use libclang directly (see libclang.go).
+
+import (
+	"go/ast"
+	"go/token"
+	"sort"
+	"strconv"
+	"strings"
+)
+
+// fileInfo holds all Cgo-related information of a given *ast.File.
+type fileInfo struct {
+	*ast.File
+	filename   string
+	functions  []*functionInfo
+	typedefs   []*typedefInfo
+	importCPos token.Pos
+}
+
+// functionInfo stores some information about a Cgo function found by libclang
+// and declared in the AST.
+type functionInfo struct {
+	name   string
+	args   []paramInfo
+	result string
+}
+
+// paramInfo is a parameter of a Cgo function (see functionInfo).
+type paramInfo struct {
+	name     string
+	typeName string
+}
+
+// typedefInfo contains information about a single typedef in C.
+type typedefInfo struct {
+	newName string // newly defined type name
+	oldName string // old type name, may be something like "unsigned long long"
+	size    int    // size in bytes
+}
+
+// cgoAliases list type aliases between Go and C, for types that are equivalent
+// in both languages. See addTypeAliases.
+var cgoAliases = map[string]string{
+	"C.int8_t":    "int8",
+	"C.int16_t":   "int16",
+	"C.int32_t":   "int32",
+	"C.int64_t":   "int64",
+	"C.uint8_t":   "uint8",
+	"C.uint16_t":  "uint16",
+	"C.uint32_t":  "uint32",
+	"C.uint64_t":  "uint64",
+	"C.uintptr_t": "uintptr",
+}
+
+// cgoTypes lists some C types with ambiguous sizes that must be retrieved
+// somehow from C. This is done by adding some typedefs to get the size of each
+// type.
+const cgoTypes = `
+typedef signed char         _Cgo_schar;
+typedef unsigned char       _Cgo_uchar;
+typedef short               _Cgo_short;
+typedef unsigned short      _Cgo_ushort;
+typedef int                 _Cgo_int;
+typedef unsigned int        _Cgo_uint;
+typedef long                _Cgo_long;
+typedef unsigned long       _Cgo_ulong;
+typedef long long           _Cgo_longlong;
+typedef unsigned long long  _Cgo_ulonglong;
+`
+
+// processCgo extracts the `import "C"` statement from the AST, parses the
+// comment with libclang, and modifies the AST to use this information.
+func (p *Package) processCgo(filename string, f *ast.File, cflags []string) error {
+	info := &fileInfo{
+		File:     f,
+		filename: filename,
+	}
+
+	// Find `import "C"` statements in the file.
+	for i := 0; i < len(f.Decls); i++ {
+		decl := f.Decls[i]
+		genDecl, ok := decl.(*ast.GenDecl)
+		if !ok {
+			continue
+		}
+		if len(genDecl.Specs) != 1 {
+			continue
+		}
+		spec, ok := genDecl.Specs[0].(*ast.ImportSpec)
+		if !ok {
+			continue
+		}
+		path, err := strconv.Unquote(spec.Path.Value)
+		if err != nil {
+			panic("could not parse import path: " + err.Error())
+		}
+		if path != "C" {
+			continue
+		}
+		cgoComment := genDecl.Doc.Text()
+
+		// Stored for later use by generated functions, to use a somewhat sane
+		// source location.
+		info.importCPos = spec.Path.ValuePos
+
+		err = info.parseFragment(cgoComment+cgoTypes, cflags)
+		if err != nil {
+			return err
+		}
+
+		// Remove this import declaration.
+		f.Decls = append(f.Decls[:i], f.Decls[i+1:]...)
+		i--
+	}
+
+	// Print the AST, for debugging.
+	//ast.Print(p.fset, f)
+
+	// Declare functions found by libclang.
+	info.addFuncDecls()
+
+	// Forward C types to Go types (like C.uint32_t -> uint32).
+	info.addTypeAliases()
+
+	// Add type declarations for C types, declared using typeef in C.
+	info.addTypedefs()
+
+	// Patch the AST to use the declared types and functions.
+	ast.Inspect(f, info.walker)
+
+	return nil
+}
+
+// addFuncDecls adds the C function declarations found by libclang in the
+// comment above the `import "C"` statement.
+func (info *fileInfo) addFuncDecls() {
+	// TODO: replace all uses of importCPos with the real locations from
+	// libclang.
+	for _, fn := range info.functions {
+		obj := &ast.Object{
+			Kind: ast.Fun,
+			Name: mapCgoType(fn.name),
+		}
+		args := make([]*ast.Field, len(fn.args))
+		decl := &ast.FuncDecl{
+			Name: &ast.Ident{
+				NamePos: info.importCPos,
+				Name:    mapCgoType(fn.name),
+				Obj:     obj,
+			},
+			Type: &ast.FuncType{
+				Func: info.importCPos,
+				Params: &ast.FieldList{
+					Opening: info.importCPos,
+					List:    args,
+					Closing: info.importCPos,
+				},
+				Results: &ast.FieldList{
+					List: []*ast.Field{
+						&ast.Field{
+							Type: &ast.Ident{
+								NamePos: info.importCPos,
+								Name:    mapCgoType(fn.result),
+							},
+						},
+					},
+				},
+			},
+		}
+		obj.Decl = decl
+		for i, arg := range fn.args {
+			args[i] = &ast.Field{
+				Names: []*ast.Ident{
+					&ast.Ident{
+						NamePos: info.importCPos,
+						Name:    arg.name,
+						Obj: &ast.Object{
+							Kind: ast.Var,
+							Name: mapCgoType(arg.name),
+							Decl: decl,
+						},
+					},
+				},
+				Type: &ast.Ident{
+					NamePos: info.importCPos,
+					Name:    mapCgoType(arg.typeName),
+				},
+			}
+		}
+		info.Decls = append(info.Decls, decl)
+	}
+}
+
+// addTypeAliases aliases some built-in Go types with their equivalent C types.
+// It adds code like the following to the AST:
+//
+//     type (
+//         C.int8_t  = int8
+//         C.int16_t = int16
+//         // ...
+//     )
+func (info *fileInfo) addTypeAliases() {
+	aliasKeys := make([]string, 0, len(cgoAliases))
+	for key := range cgoAliases {
+		aliasKeys = append(aliasKeys, key)
+	}
+	sort.Strings(aliasKeys)
+	gen := &ast.GenDecl{
+		TokPos: info.importCPos,
+		Tok:    token.TYPE,
+		Lparen: info.importCPos,
+		Rparen: info.importCPos,
+	}
+	for _, typeName := range aliasKeys {
+		goTypeName := cgoAliases[typeName]
+		obj := &ast.Object{
+			Kind: ast.Typ,
+			Name: typeName,
+		}
+		typeSpec := &ast.TypeSpec{
+			Name: &ast.Ident{
+				NamePos: info.importCPos,
+				Name:    typeName,
+				Obj:     obj,
+			},
+			Assign: info.importCPos,
+			Type: &ast.Ident{
+				NamePos: info.importCPos,
+				Name:    goTypeName,
+			},
+		}
+		obj.Decl = typeSpec
+		gen.Specs = append(gen.Specs, typeSpec)
+	}
+	info.Decls = append(info.Decls, gen)
+}
+
+func (info *fileInfo) addTypedefs() {
+	gen := &ast.GenDecl{
+		TokPos: info.importCPos,
+		Tok:    token.TYPE,
+	}
+	for _, typedef := range info.typedefs {
+		newType := mapCgoType(typedef.newName)
+		oldType := mapCgoType(typedef.oldName)
+		switch oldType {
+		// TODO: plain char (may be signed or unsigned)
+		case "C.schar", "C.short", "C.int", "C.long", "C.longlong":
+			switch typedef.size {
+			case 1:
+				oldType = "int8"
+			case 2:
+				oldType = "int16"
+			case 4:
+				oldType = "int32"
+			case 8:
+				oldType = "int64"
+			}
+		case "C.uchar", "C.ushort", "C.uint", "C.ulong", "C.ulonglong":
+			switch typedef.size {
+			case 1:
+				oldType = "uint8"
+			case 2:
+				oldType = "uint16"
+			case 4:
+				oldType = "uint32"
+			case 8:
+				oldType = "uint64"
+			}
+		}
+		if strings.HasPrefix(newType, "C._Cgo_") {
+			newType = "C." + newType[len("C._Cgo_"):]
+		}
+		if _, ok := cgoAliases[newType]; ok {
+			// This is a type that also exists in Go (defined in stdint.h).
+			continue
+		}
+		obj := &ast.Object{
+			Kind: ast.Typ,
+			Name: newType,
+		}
+		typeSpec := &ast.TypeSpec{
+			Name: &ast.Ident{
+				NamePos: info.importCPos,
+				Name:    newType,
+				Obj:     obj,
+			},
+			Type: &ast.Ident{
+				NamePos: info.importCPos,
+				Name:    oldType,
+			},
+		}
+		obj.Decl = typeSpec
+		gen.Specs = append(gen.Specs, typeSpec)
+	}
+	info.Decls = append(info.Decls, gen)
+}
+
+// walker replaces all "C".<something> call expressions to literal
+// "C.<something>" expressions. This is impossible to write in Go (a dot cannot
+// be used in the middle of a name) so is used as a new namespace for C call
+// expressions.
+func (info *fileInfo) walker(node ast.Node) bool {
+	switch node := node.(type) {
+	case *ast.CallExpr:
+		fun, ok := node.Fun.(*ast.SelectorExpr)
+		if !ok {
+			return true
+		}
+		x, ok := fun.X.(*ast.Ident)
+		if !ok {
+			return true
+		}
+		if x.Name == "C" {
+			node.Fun = &ast.Ident{
+				NamePos: x.NamePos,
+				Name:    mapCgoType(fun.Sel.Name),
+			}
+		}
+	case *ast.ValueSpec:
+		typ, ok := node.Type.(*ast.SelectorExpr)
+		if !ok {
+			return true
+		}
+		x, ok := typ.X.(*ast.Ident)
+		if !ok {
+			return true
+		}
+		if x.Name == "C" {
+			node.Type = &ast.Ident{
+				NamePos: x.NamePos,
+				Name:    mapCgoType(typ.Sel.Name),
+			}
+		}
+	}
+	return true
+}
+
+// mapCgoType converts a C type name into a Go type name with a "C." prefix.
+func mapCgoType(t string) string {
+	switch t {
+	case "signed char":
+		return "C.schar"
+	case "long long":
+		return "C.longlong"
+	case "unsigned char":
+		return "C.schar"
+	case "unsigned short":
+		return "C.ushort"
+	case "unsigned int":
+		return "C.uint"
+	case "unsigned long":
+		return "C.ulong"
+	case "unsigned long long":
+		return "C.ulonglong"
+	default:
+		return "C." + t
+	}
+}

loader/errors.go

@@ -1,10 +1,5 @@
 package loader
 
-import (
-	"go/token"
-	"strings"
-)
-
 // Errors contains a list of parser errors or a list of typechecker errors for
 // the given package.
 type Errors struct {
@@ -20,20 +15,13 @@ func (e Errors) Error() string {
 // packages is a list from the root package to the leaf package that imports one
 // of the packages in the list.
 type ImportCycleError struct {
-	Packages        []string
-	ImportPositions []token.Position
+	Packages []string
 }
 
 func (e *ImportCycleError) Error() string {
-	var msg strings.Builder
-	msg.WriteString("import cycle:\n\t")
-	msg.WriteString(strings.Join(e.Packages, "\n\t"))
-	msg.WriteString("\n at ")
-	for i, pos := range e.ImportPositions {
-		if i > 0 {
-			msg.WriteString(", ")
-		}
-		msg.WriteString(pos.String())
+	msg := "import cycle: " + e.Packages[0]
+	for _, path := range e.Packages[1:] {
+		msg += " → " + path
 	}
-	return msg.String()
+	return msg
 }

loader/libclang.go

@@ -0,0 +1,126 @@
+package loader
+
+// This file parses a fragment of C with libclang and stores the result for AST
+// modification. It does not touch the AST itself.
+
+import (
+	"errors"
+	"unsafe"
+)
+
+/*
+#cgo CFLAGS: -I/usr/lib/llvm-7/include
+#cgo LDFLAGS: -L/usr/lib/llvm-7/lib -lclang
+#include <clang-c/Index.h> // if this fails, install libclang-7-dev
+#include <stdlib.h>
+
+int tinygo_clang_visitor(CXCursor c, CXCursor parent, CXClientData client_data);
+*/
+import "C"
+
+var globalFileInfo *fileInfo
+
+func (info *fileInfo) parseFragment(fragment string, cflags []string) error {
+	index := C.clang_createIndex(0, 1)
+	defer C.clang_disposeIndex(index)
+
+	filenameC := C.CString("cgo-fake.c")
+	defer C.free(unsafe.Pointer(filenameC))
+
+	fragmentC := C.CString(fragment)
+	defer C.free(unsafe.Pointer(fragmentC))
+
+	unsavedFile := C.struct_CXUnsavedFile{
+		Filename: filenameC,
+		Length:   C.ulong(len(fragment)),
+		Contents: fragmentC,
+	}
+
+	// convert Go slice of strings to C array of strings.
+	cmdargsC := C.malloc(C.size_t(len(cflags)) * C.size_t(unsafe.Sizeof(uintptr(0))))
+	defer C.free(cmdargsC)
+	cmdargs := (*[1<<30 - 1]*C.char)(cmdargsC)
+	for i, cflag := range cflags {
+		s := C.CString(cflag)
+		cmdargs[i] = s
+		defer C.free(unsafe.Pointer(s))
+	}
+
+	var unit C.CXTranslationUnit
+	errCode := C.clang_parseTranslationUnit2(
+		index,
+		filenameC,
+		(**C.char)(cmdargsC), C.int(len(cflags)), // command line args
+		&unsavedFile, 1, // unsaved files
+		C.CXTranslationUnit_None,
+		&unit)
+	if errCode != 0 {
+		panic("loader: failed to parse source with libclang")
+	}
+	defer C.clang_disposeTranslationUnit(unit)
+
+	if C.clang_getNumDiagnostics(unit) != 0 {
+		return errors.New("cgo: libclang cannot parse fragment")
+	}
+
+	if globalFileInfo != nil {
+		// There is a race condition here but that doesn't really matter as it
+		// is a sanity check anyway.
+		panic("libclang.go cannot be used concurrently yet")
+	}
+	globalFileInfo = info
+	defer func() {
+		globalFileInfo = nil
+	}()
+
+	cursor := C.clang_getTranslationUnitCursor(unit)
+	C.clang_visitChildren(cursor, (*[0]byte)(unsafe.Pointer(C.tinygo_clang_visitor)), C.CXClientData(uintptr(0)))
+
+	return nil
+}
+
+//export tinygo_clang_visitor
+func tinygo_clang_visitor(c, parent C.CXCursor, client_data C.CXClientData) C.int {
+	info := globalFileInfo
+	kind := C.clang_getCursorKind(c)
+	switch kind {
+	case C.CXCursor_FunctionDecl:
+		name := getString(C.clang_getCursorSpelling(c))
+		cursorType := C.clang_getCursorType(c)
+		if C.clang_isFunctionTypeVariadic(cursorType) != 0 {
+			return C.CXChildVisit_Continue // not supported
+		}
+		numArgs := C.clang_Cursor_getNumArguments(c)
+		fn := &functionInfo{name: name}
+		info.functions = append(info.functions, fn)
+		for i := C.int(0); i < numArgs; i++ {
+			arg := C.clang_Cursor_getArgument(c, C.uint(i))
+			argName := getString(C.clang_getCursorSpelling(arg))
+			argType := C.clang_getArgType(cursorType, C.uint(i))
+			argTypeName := getString(C.clang_getTypeSpelling(argType))
+			fn.args = append(fn.args, paramInfo{argName, argTypeName})
+		}
+		resultType := C.clang_getCursorResultType(c)
+		resultTypeName := getString(C.clang_getTypeSpelling(resultType))
+		fn.result = resultTypeName
+	case C.CXCursor_TypedefDecl:
+		typedefType := C.clang_getCursorType(c)
+		name := getString(C.clang_getTypedefName(typedefType))
+		underlyingType := C.clang_getTypedefDeclUnderlyingType(c)
+		underlyingTypeName := getString(C.clang_getTypeSpelling(underlyingType))
+		typeSize := C.clang_Type_getSizeOf(underlyingType)
+		info.typedefs = append(info.typedefs, &typedefInfo{
+			newName: name,
+			oldName: underlyingTypeName,
+			size:    int(typeSize),
+		})
+	}
+	return C.CXChildVisit_Continue
+}
+
+func getString(clangString C.CXString) (s string) {
+	rawString := C.clang_getCString(clangString)
+	s = C.GoString(rawString)
+	C.clang_disposeString(clangString)
+	return
+}

loader/loader.go

@@ -10,22 +10,17 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
-
-	"github.com/tinygo-org/tinygo/cgo"
 )
 
 // Program holds all packages and some metadata about the program as a whole.
 type Program struct {
-	Build         *build.Context
-	OverlayBuild  *build.Context
-	ShouldOverlay func(path string) bool
-	Packages      map[string]*Package
-	sorted        []*Package
-	fset          *token.FileSet
-	TypeChecker   types.Config
-	Dir           string // current working directory (for error reporting)
-	TINYGOROOT    string // root of the TinyGo installation or root of the source code
-	CFlags        []string
+	Build       *build.Context
+	Packages    map[string]*Package
+	sorted      []*Package
+	fset        *token.FileSet
+	TypeChecker types.Config
+	Dir         string // current working directory (for error reporting)
+	CFlags      []string
 }
 
 // Package holds a loaded package, its imports, and its parsed files.
@@ -47,11 +42,7 @@ func (p *Program) Import(path, srcDir string) (*Package, error) {
 	}
 
 	// Load this package.
-	ctx := p.Build
-	if p.ShouldOverlay(path) {
-		ctx = p.OverlayBuild
-	}
-	buildPkg, err := ctx.Import(path, srcDir, build.ImportComment)
+	buildPkg, err := p.Build.Import(path, srcDir, build.ImportComment)
 	if err != nil {
 		return nil, err
 	}
@@ -175,9 +166,7 @@ func (p *Program) Parse() error {
 		err := pkg.importRecursively()
 		if err != nil {
 			if err, ok := err.(*ImportCycleError); ok {
-				if pkg.ImportPath != err.Packages[0] {
-					err.Packages = append([]string{pkg.ImportPath}, err.Packages...)
-				}
+				err.Packages = append([]string{pkg.ImportPath}, err.Packages...)
 			}
 			return err
 		}
@@ -302,23 +291,13 @@ func (p *Package) parseFiles() ([]*ast.File, error) {
 			fileErrs = append(fileErrs, err)
 			continue
 		}
+		err = p.processCgo(path, f, append(p.CFlags, "-I"+p.Package.Dir))
+		if err != nil {
+			fileErrs = append(fileErrs, err)
+			continue
+		}
 		files = append(files, f)
 	}
-	if len(p.CgoFiles) != 0 {
-		clangIncludes := ""
-		if _, err := os.Stat(filepath.Join(p.TINYGOROOT, "llvm", "tools", "clang", "lib", "Headers")); !os.IsNotExist(err) {
-			// Running from the source directory.
-			clangIncludes = filepath.Join(p.TINYGOROOT, "llvm", "tools", "clang", "lib", "Headers")
-		} else {
-			// Running from the installation directory.
-			clangIncludes = filepath.Join(p.TINYGOROOT, "lib", "clang", "include")
-		}
-		generated, errs := cgo.Process(files, p.Program.Dir, p.fset, append(p.CFlags, "-I"+p.Package.Dir, "-I"+clangIncludes))
-		if errs != nil {
-			fileErrs = append(fileErrs, errs...)
-		}
-		files = append(files, generated)
-	}
 	if len(fileErrs) != 0 {
 		return nil, Errors{p, fileErrs}
 	}
@@ -346,7 +325,7 @@ func (p *Package) importRecursively() error {
 	p.Importing = true
 	for _, to := range p.Package.Imports {
 		if to == "C" {
-			// Do CGo processing in a later stage.
+			// Do Cgo processing in a later stage.
 			continue
 		}
 		if _, ok := p.Imports[to]; ok {
@@ -360,13 +339,10 @@ func (p *Package) importRecursively() error {
 			return err
 		}
 		if importedPkg.Importing {
-			return &ImportCycleError{[]string{p.ImportPath, importedPkg.ImportPath}, p.ImportPos[to]}
+			return &ImportCycleError{[]string{p.ImportPath, importedPkg.ImportPath}}
 		}
 		err = importedPkg.importRecursively()
 		if err != nil {
-			if err, ok := err.(*ImportCycleError); ok {
-				err.Packages = append([]string{p.ImportPath}, err.Packages...)
-			}
 			return err
 		}
 		p.Imports[to] = importedPkg

main.go

@@ -11,49 +11,31 @@ import (
 	"os/exec"
 	"os/signal"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"strings"
 	"syscall"
 
-	"github.com/tinygo-org/tinygo/compiler"
-	"github.com/tinygo-org/tinygo/interp"
-	"github.com/tinygo-org/tinygo/loader"
+	"github.com/aykevl/tinygo/compiler"
+	"github.com/aykevl/tinygo/interp"
+	"github.com/aykevl/tinygo/loader"
 )
 
-// commandError is an error type to wrap os/exec.Command errors. This provides
-// some more information regarding what went wrong while running a command.
-type commandError struct {
-	Msg  string
-	File string
-	Err  error
-}
-
-func (e *commandError) Error() string {
-	return e.Msg + " " + e.File + ": " + e.Err.Error()
-}
-
-// multiError is a list of multiple errors (actually: diagnostics) returned
-// during LLVM IR generation.
-type multiError struct {
-	Errs []error
-}
-
-func (e *multiError) Error() string {
-	return e.Errs[0].Error()
+var commands = map[string]string{
+	"ar":    "ar",
+	"clang": "clang-7",
 }
 
 type BuildConfig struct {
-	opt           string
-	gc            string
-	panicStrategy string
-	printIR       bool
-	dumpSSA       bool
-	debug         bool
-	printSizes    string
-	cFlags        []string
-	ldFlags       []string
-	wasmAbi       string
+	opt        string
+	gc         string
+	printIR    bool
+	dumpSSA    bool
+	debug      bool
+	printSizes string
+	initInterp bool
+	cFlags     []string
+	ldFlags    []string
+	wasmAbi    string
 }
 
 // Helper function for Compiler object.
@@ -62,51 +44,24 @@ func Compile(pkgName, outpath string, spec *TargetSpec, config *BuildConfig, act
 		config.gc = spec.GC
 	}
 
-	root := sourceDir()
+	// Append command line passed CFlags and LDFlags
+	spec.CFlags = append(spec.CFlags, config.cFlags...)
+	spec.LDFlags = append(spec.LDFlags, config.ldFlags...)
 
-	// Merge and adjust CFlags.
-	cflags := append([]string{}, config.cFlags...)
-	for _, flag := range spec.CFlags {
-		cflags = append(cflags, strings.Replace(flag, "{root}", root, -1))
-	}
-
-	// Merge and adjust LDFlags.
-	ldflags := append([]string{}, config.ldFlags...)
-	for _, flag := range spec.LDFlags {
-		ldflags = append(ldflags, strings.Replace(flag, "{root}", root, -1))
-	}
-
-	goroot := getGoroot()
-	if goroot == "" {
-		return errors.New("cannot locate $GOROOT, please set it manually")
-	}
-	tags := spec.BuildTags
-	major, minor := getGorootVersion(goroot)
-	if major != 1 {
-		if major == 0 {
-			return errors.New("could not read version from GOROOT: " + goroot)
-		}
-		return fmt.Errorf("expected major version 1, got go%d.%d", major, minor)
-	}
-	for i := 1; i <= minor; i++ {
-		tags = append(tags, fmt.Sprintf("go1.%d", i))
-	}
 	compilerConfig := compiler.Config{
-		Triple:        spec.Triple,
-		CPU:           spec.CPU,
-		Features:      spec.Features,
-		GOOS:          spec.GOOS,
-		GOARCH:        spec.GOARCH,
-		GC:            config.gc,
-		PanicStrategy: config.panicStrategy,
-		CFlags:        cflags,
-		LDFlags:       ldflags,
-		Debug:         config.debug,
-		DumpSSA:       config.dumpSSA,
-		TINYGOROOT:    root,
-		GOROOT:        goroot,
-		GOPATH:        getGopath(),
-		BuildTags:     tags,
+		Triple:     spec.Triple,
+		CPU:        spec.CPU,
+		GOOS:       spec.GOOS,
+		GOARCH:     spec.GOARCH,
+		GC:         config.gc,
+		CFlags:     spec.CFlags,
+		LDFlags:    spec.LDFlags,
+		Debug:      config.debug,
+		DumpSSA:    config.dumpSSA,
+		RootDir:    sourceDir(),
+		GOPATH:     getGopath(),
+		BuildTags:  spec.BuildTags,
+		InitInterp: config.initInterp,
 	}
 	c, err := compiler.NewCompiler(pkgName, compilerConfig)
 	if err != nil {
@@ -114,32 +69,29 @@ func Compile(pkgName, outpath string, spec *TargetSpec, config *BuildConfig, act
 	}
 
 	// Compile Go code to IR.
-	errs := c.Compile(pkgName)
-	if len(errs) != 0 {
-		if len(errs) == 1 {
-			return errs[0]
-		}
-		return &multiError{errs}
+	err = c.Compile(pkgName)
+	if err != nil {
+		return err
 	}
 	if config.printIR {
-		fmt.Println("; Generated LLVM IR:")
+		fmt.Println("Generated LLVM IR:")
 		fmt.Println(c.IR())
 	}
 	if err := c.Verify(); err != nil {
 		return errors.New("verification error after IR construction")
 	}
 
-	err = interp.Run(c.Module(), c.TargetData(), config.dumpSSA)
-	if err != nil {
-		return err
-	}
-	if err := c.Verify(); err != nil {
-		return errors.New("verification error after interpreting runtime.initAll")
+	if config.initInterp {
+		err = interp.Run(c.Module(), c.TargetData(), config.dumpSSA)
+		if err != nil {
+			return err
+		}
+		if err := c.Verify(); err != nil {
+			return errors.New("verification error after interpreting runtime.initAll")
+		}
 	}
 
-	if spec.GOOS != "darwin" {
-		c.ApplyFunctionSections() // -ffunction-sections
-	}
+	c.ApplyFunctionSections() // -ffunction-sections
 	if err := c.Verify(); err != nil {
 		return errors.New("verification error after applying function sections")
 	}
@@ -222,33 +174,33 @@ func Compile(pkgName, outpath string, spec *TargetSpec, config *BuildConfig, act
 
 		// Load builtins library from the cache, possibly compiling it on the
 		// fly.
-		var librt string
+		var cachePath string
 		if spec.RTLib == "compiler-rt" {
-			librt, err = loadBuiltins(spec.Triple)
+			librt, err := loadBuiltins(spec.Triple)
 			if err != nil {
 				return err
 			}
+			cachePath, _ = filepath.Split(librt)
 		}
 
 		// Prepare link command.
 		executable := filepath.Join(dir, "main")
 		tmppath := executable // final file
-		ldflags := append(ldflags, "-o", executable, objfile, "-L", root)
+		ldflags := append(spec.LDFlags, "-o", executable, objfile)
 		if spec.RTLib == "compiler-rt" {
-			ldflags = append(ldflags, librt)
+			ldflags = append(ldflags, "-L", cachePath, "-lrt-"+spec.Triple)
 		}
 
 		// Compile extra files.
 		for i, path := range spec.ExtraFiles {
-			abspath := filepath.Join(root, path)
 			outpath := filepath.Join(dir, "extra-"+strconv.Itoa(i)+"-"+filepath.Base(path)+".o")
-			cmdNames := []string{spec.Compiler}
-			if names, ok := commands[spec.Compiler]; ok {
-				cmdNames = names
-			}
-			err := execCommand(cmdNames, append(cflags, "-c", "-o", outpath, abspath)...)
+			cmd := exec.Command(spec.Compiler, append(spec.CFlags, "-c", "-o", outpath, path)...)
+			cmd.Stdout = os.Stdout
+			cmd.Stderr = os.Stderr
+			cmd.Dir = sourceDir()
+			err := cmd.Run()
 			if err != nil {
-				return &commandError{"failed to build", path, err}
+				return err
 			}
 			ldflags = append(ldflags, outpath)
 		}
@@ -258,22 +210,26 @@ func Compile(pkgName, outpath string, spec *TargetSpec, config *BuildConfig, act
 			for _, file := range pkg.CFiles {
 				path := filepath.Join(pkg.Package.Dir, file)
 				outpath := filepath.Join(dir, "pkg"+strconv.Itoa(i)+"-"+file+".o")
-				cmdNames := []string{spec.Compiler}
-				if names, ok := commands[spec.Compiler]; ok {
-					cmdNames = names
-				}
-				err := execCommand(cmdNames, append(cflags, "-c", "-o", outpath, path)...)
+				cmd := exec.Command(spec.Compiler, append(spec.CFlags, "-c", "-o", outpath, path)...)
+				cmd.Stdout = os.Stdout
+				cmd.Stderr = os.Stderr
+				cmd.Dir = sourceDir()
+				err := cmd.Run()
 				if err != nil {
-					return &commandError{"failed to build", path, err}
+					return err
 				}
 				ldflags = append(ldflags, outpath)
 			}
 		}
 
 		// Link the object files together.
-		err = Link(spec.Linker, ldflags...)
+		cmd := exec.Command(spec.Linker, ldflags...)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		cmd.Dir = sourceDir()
+		err = cmd.Run()
 		if err != nil {
-			return &commandError{"failed to link", executable, err}
+			return err
 		}
 
 		if config.printSizes == "short" || config.printSizes == "full" {
@@ -295,17 +251,17 @@ func Compile(pkgName, outpath string, spec *TargetSpec, config *BuildConfig, act
 			}
 		}
 
-		// Get an Intel .hex file or .bin file from the .elf file.
 		if outext == ".hex" || outext == ".bin" {
+			// Get an Intel .hex file or .bin file from the .elf file.
 			tmppath = filepath.Join(dir, "main"+outext)
-			err := Objcopy(executable, tmppath)
-			if err != nil {
-				return err
-			}
-		} else if outext == ".uf2" {
-			// Get UF2 from the .elf file.
-			tmppath = filepath.Join(dir, "main"+outext)
-			err := ConvertELFFileToUF2File(executable, tmppath)
+			format := map[string]string{
+				".hex": "ihex",
+				".bin": "binary",
+			}[outext]
+			cmd := exec.Command(spec.Objcopy, "-O", format, executable, tmppath)
+			cmd.Stdout = os.Stdout
+			cmd.Stderr = os.Stderr
+			err = cmd.Run()
 			if err != nil {
 				return err
 			}
@@ -354,31 +310,14 @@ func Flash(pkgName, target, port string, config *BuildConfig) error {
 		return err
 	}
 
-	// determine the type of file to compile
-	var fileExt string
-
-	switch {
-	case strings.Contains(spec.Flasher, "{hex}"):
-		fileExt = ".hex"
-	case strings.Contains(spec.Flasher, "{elf}"):
-		fileExt = ".elf"
-	case strings.Contains(spec.Flasher, "{bin}"):
-		fileExt = ".bin"
-	case strings.Contains(spec.Flasher, "{uf2}"):
-		fileExt = ".uf2"
-	default:
-		return errors.New("invalid target file - did you forget the {hex} token in the 'flash' section?")
-	}
-
-	return Compile(pkgName, fileExt, spec, config, func(tmppath string) error {
+	return Compile(pkgName, ".hex", spec, config, func(tmppath string) error {
 		if spec.Flasher == "" {
 			return errors.New("no flash command specified - did you miss a -target flag?")
 		}
 
 		// Create the command.
 		flashCmd := spec.Flasher
-		fileToken := "{" + fileExt[1:] + "}"
-		flashCmd = strings.Replace(flashCmd, fileToken, tmppath, -1)
+		flashCmd = strings.Replace(flashCmd, "{hex}", tmppath, -1)
 		flashCmd = strings.Replace(flashCmd, "{port}", port, -1)
 
 		// Execute the command.
@@ -386,11 +325,7 @@ func Flash(pkgName, target, port string, config *BuildConfig) error {
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 		cmd.Dir = sourceDir()
-		err := cmd.Run()
-		if err != nil {
-			return &commandError{"failed to flash", tmppath, err}
-		}
-		return nil
+		return cmd.Run()
 	})
 }
 
@@ -457,11 +392,7 @@ func FlashGDB(pkgName, target, port string, ocdOutput bool, config *BuildConfig)
 		cmd.Stdin = os.Stdin
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
-		err := cmd.Run()
-		if err != nil {
-			return &commandError{"failed to run gdb with", tmppath, err}
-		}
-		return nil
+		return cmd.Run()
 	})
 }
 
@@ -484,9 +415,8 @@ func Run(pkgName, target string, config *BuildConfig) error {
 					// Workaround for QEMU which always exits with an error.
 					return nil
 				}
-				return &commandError{"failed to run compiled binary", tmppath, err}
 			}
-			return nil
+			return err
 		} else {
 			// Run in an emulator.
 			args := append(spec.Emulator[1:], tmppath)
@@ -499,16 +429,13 @@ func Run(pkgName, target string, config *BuildConfig) error {
 					// Workaround for QEMU which always exits with an error.
 					return nil
 				}
-				return &commandError{"failed to run emulator with", tmppath, err}
 			}
-			return nil
+			return err
 		}
 	})
 }
 
 func usage() {
-	fmt.Fprintln(os.Stderr, "TinyGo is a Go compiler for small places.")
-	fmt.Fprintln(os.Stderr, "version:", version)
 	fmt.Fprintf(os.Stderr, "usage: %s command [-printir] [-target=<target>] -o <output> <input>\n", os.Args[0])
 	fmt.Fprintln(os.Stderr, "\ncommands:")
 	fmt.Fprintln(os.Stderr, "  build: compile packages and dependencies")
@@ -535,10 +462,6 @@ func handleCompilerError(err error) {
 			for _, err := range errLoader.Errs {
 				fmt.Fprintln(os.Stderr, err)
 			}
-		} else if errMulti, ok := err.(*multiError); ok {
-			for _, err := range errMulti.Errs {
-				fmt.Fprintln(os.Stderr, err)
-			}
 		} else {
 			fmt.Fprintln(os.Stderr, "error:", err)
 		}
@@ -550,13 +473,13 @@ func main() {
 	outpath := flag.String("o", "", "output filename")
 	opt := flag.String("opt", "z", "optimization level: 0, 1, 2, s, z")
 	gc := flag.String("gc", "", "garbage collector to use (none, dumb, marksweep)")
-	panicStrategy := flag.String("panic", "print", "panic strategy (abort, trap)")
 	printIR := flag.Bool("printir", false, "print LLVM IR")
 	dumpSSA := flag.Bool("dumpssa", false, "dump internal Go SSA")
 	target := flag.String("target", "", "LLVM target")
 	printSize := flag.String("size", "", "print sizes (none, short, full)")
 	nodebug := flag.Bool("no-debug", false, "disable DWARF debug symbol generation")
 	ocdOutput := flag.Bool("ocd-output", false, "print OCD daemon output during debug")
+	initInterp := flag.Bool("initinterp", true, "enable/disable partial evaluator of generated IR")
 	port := flag.String("port", "/dev/ttyACM0", "flash port")
 	cFlags := flag.String("cflags", "", "additional cflags for compiler")
 	ldFlags := flag.String("ldflags", "", "additional ldflags for linker")
@@ -571,14 +494,14 @@ func main() {
 
 	flag.CommandLine.Parse(os.Args[2:])
 	config := &BuildConfig{
-		opt:           *opt,
-		gc:            *gc,
-		panicStrategy: *panicStrategy,
-		printIR:       *printIR,
-		dumpSSA:       *dumpSSA,
-		debug:         !*nodebug,
-		printSizes:    *printSize,
-		wasmAbi:       *wasmAbi,
+		opt:        *opt,
+		gc:         *gc,
+		printIR:    *printIR,
+		dumpSSA:    *dumpSSA,
+		debug:      !*nodebug,
+		printSizes: *printSize,
+		initInterp: *initInterp,
+		wasmAbi:    *wasmAbi,
 	}
 
 	if *cFlags != "" {
@@ -589,12 +512,6 @@ func main() {
 		config.ldFlags = strings.Split(*ldFlags, " ")
 	}
 
-	if *panicStrategy != "print" && *panicStrategy != "trap" {
-		fmt.Fprintln(os.Stderr, "Panic strategy must be either print or trap.")
-		usage()
-		os.Exit(1)
-	}
-
 	os.Setenv("CC", "clang -target="+*target)
 
 	switch command {
@@ -615,20 +532,6 @@ func main() {
 		}
 		err := Build(flag.Arg(0), *outpath, target, config)
 		handleCompilerError(err)
-	case "build-builtins":
-		// Note: this command is only meant to be used while making a release!
-		if *outpath == "" {
-			fmt.Fprintln(os.Stderr, "No output filename supplied (-o).")
-			usage()
-			os.Exit(1)
-		}
-		if *target == "" {
-			fmt.Fprintln(os.Stderr, "No target (-target).")
-		}
-		err := compileBuiltins(*target, func(path string) error {
-			return moveFile(path, *outpath)
-		})
-		handleCompilerError(err)
 	case "flash", "gdb":
 		if *outpath != "" {
 			fmt.Fprintln(os.Stderr, "Output cannot be specified with the flash command.")
@@ -665,8 +568,6 @@ func main() {
 		}
 	case "help":
 		usage()
-	case "version":
-		fmt.Printf("tinygo version %s %s/%s\n", version, runtime.GOOS, runtime.GOARCH)
 	default:
 		fmt.Fprintln(os.Stderr, "Unknown command:", command)
 		usage()

main_test.go

@@ -10,25 +10,19 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"sort"
 	"testing"
-
-	"github.com/tinygo-org/tinygo/loader"
 )
 
 const TESTDATA = "testdata"
 
 func TestCompiler(t *testing.T) {
-	matches, err := filepath.Glob(filepath.Join(TESTDATA, "*.go"))
+	matches, err := filepath.Glob(TESTDATA + "/*.go")
 	if err != nil {
 		t.Fatal("could not read test files:", err)
 	}
 
-	dirMatches, err := filepath.Glob(filepath.Join(TESTDATA, "*", "main.go"))
-	if err != nil {
-		t.Fatal("could not read test packages:", err)
-	}
+	dirMatches, err := filepath.Glob(TESTDATA + "/*/main.go")
 	if len(matches) == 0 || len(dirMatches) == 0 {
 		t.Fatal("no test files found")
 	}
@@ -45,61 +39,25 @@ func TestCompiler(t *testing.T) {
 	}
 	defer os.RemoveAll(tmpdir)
 
-	t.Log("running tests on host...")
+	t.Log("running tests on the host...")
 	for _, path := range matches {
 		t.Run(path, func(t *testing.T) {
 			runTest(path, tmpdir, "", t)
 		})
 	}
 
-	if testing.Short() {
-		return
-	}
-
-	t.Log("running tests for emulated cortex-m3...")
+	t.Log("running tests on the qemu target...")
 	for _, path := range matches {
 		t.Run(path, func(t *testing.T) {
 			runTest(path, tmpdir, "qemu", t)
 		})
 	}
-
-	if runtime.GOOS == "linux" {
-		t.Log("running tests for linux/arm...")
-		for _, path := range matches {
-			if path == filepath.Join("testdata", "cgo")+string(filepath.Separator) {
-				continue // TODO: improve CGo
-			}
-			t.Run(path, func(t *testing.T) {
-				runTest(path, tmpdir, "arm--linux-gnueabihf", t)
-			})
-		}
-
-		t.Log("running tests for linux/arm64...")
-		for _, path := range matches {
-			if path == filepath.Join("testdata", "cgo")+string(filepath.Separator) {
-				continue // TODO: improve CGo
-			}
-			t.Run(path, func(t *testing.T) {
-				runTest(path, tmpdir, "aarch64--linux-gnu", t)
-			})
-		}
-
-		t.Log("running tests for WebAssembly...")
-		for _, path := range matches {
-			if path == filepath.Join("testdata", "gc.go") {
-				continue // known to fail
-			}
-			t.Run(path, func(t *testing.T) {
-				runTest(path, tmpdir, "wasm", t)
-			})
-		}
-	}
 }
 
 func runTest(path, tmpdir string, target string, t *testing.T) {
 	// Get the expected output for this test.
 	txtpath := path[:len(path)-3] + ".txt"
-	if path[len(path)-1] == os.PathSeparator {
+	if path[len(path)-1] == '/' {
 		txtpath = path + "out.txt"
 	}
 	f, err := os.Open(txtpath)
@@ -118,18 +76,12 @@ func runTest(path, tmpdir string, target string, t *testing.T) {
 		dumpSSA:    false,
 		debug:      false,
 		printSizes: "",
-		wasmAbi:    "js",
+		initInterp: true,
 	}
 	binary := filepath.Join(tmpdir, "test")
 	err = Build("./"+path, binary, target, config)
 	if err != nil {
-		if errLoader, ok := err.(loader.Errors); ok {
-			for _, err := range errLoader.Errs {
-				t.Log("failed to build:", err)
-			}
-		} else {
-			t.Log("failed to build:", err)
-		}
+		t.Log("failed to build:", err)
 		t.Fail()
 		return
 	}

objcopy.go

@@ -1,127 +0,0 @@
-package main
-
-import (
-	"debug/elf"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sort"
-
-	"github.com/marcinbor85/gohex"
-)
-
-// ObjcopyError is an error returned by functions that act like objcopy.
-type ObjcopyError struct {
-	Op  string
-	Err error
-}
-
-func (e ObjcopyError) Error() string {
-	if e.Err == nil {
-		return e.Op
-	}
-	return e.Op + ": " + e.Err.Error()
-}
-
-type ProgSlice []*elf.Prog
-
-func (s ProgSlice) Len() int           { return len(s) }
-func (s ProgSlice) Less(i, j int) bool { return s[i].Paddr < s[j].Paddr }
-func (s ProgSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// ExtractROM extracts a firmware image and the first load address from the
-// given ELF file. It tries to emulate the behavior of objcopy.
-func ExtractROM(path string) (uint64, []byte, error) {
-	f, err := elf.Open(path)
-	if err != nil {
-		return 0, nil, ObjcopyError{"failed to open ELF file to extract text segment", err}
-	}
-	defer f.Close()
-
-	// The GNU objcopy command does the following for firmware extraction (from
-	// the man page):
-	// > When objcopy generates a raw binary file, it will essentially produce a
-	// > memory dump of the contents of the input object file. All symbols and
-	// > relocation information will be discarded. The memory dump will start at
-	// > the load address of the lowest section copied into the output file.
-
-	// Find the lowest section address.
-	startAddr := ^uint64(0)
-	for _, section := range f.Sections {
-		if section.Type != elf.SHT_PROGBITS || section.Flags&elf.SHF_ALLOC == 0 {
-			continue
-		}
-		if section.Addr < startAddr {
-			startAddr = section.Addr
-		}
-	}
-
-	progs := make(ProgSlice, 0, 2)
-	for _, prog := range f.Progs {
-		if prog.Type != elf.PT_LOAD || prog.Filesz == 0 {
-			continue
-		}
-		progs = append(progs, prog)
-	}
-	if len(progs) == 0 {
-		return 0, nil, ObjcopyError{"file does not contain ROM segments: " + path, nil}
-	}
-	sort.Sort(progs)
-
-	var rom []byte
-	for _, prog := range progs {
-		if prog.Paddr != progs[0].Paddr+uint64(len(rom)) {
-			return 0, nil, ObjcopyError{"ROM segments are non-contiguous: " + path, nil}
-		}
-		data, err := ioutil.ReadAll(prog.Open())
-		if err != nil {
-			return 0, nil, ObjcopyError{"failed to extract segment from ELF file: " + path, err}
-		}
-		rom = append(rom, data...)
-	}
-	if progs[0].Paddr < startAddr {
-		// The lowest memory address is before the first section. This means
-		// that there is some extra data loaded at the start of the image that
-		// should be discarded.
-		// Example: ELF files where .text doesn't start at address 0 because
-		// there is a bootloader at the start.
-		return startAddr, rom[startAddr-progs[0].Paddr:], nil
-	} else {
-		return progs[0].Paddr, rom, nil
-	}
-}
-
-// Objcopy converts an ELF file to a different (simpler) output file format:
-// .bin or .hex. It extracts only the .text section.
-func Objcopy(infile, outfile string) error {
-	f, err := os.OpenFile(outfile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	// Read the .text segment.
-	addr, data, err := ExtractROM(infile)
-	if err != nil {
-		return err
-	}
-
-	// Write to the file, in the correct format.
-	switch filepath.Ext(outfile) {
-	case ".bin":
-		// The address is not stored in a .bin file (therefore you
-		// should use .hex files in most cases).
-		_, err := f.Write(data)
-		return err
-	case ".hex":
-		mem := gohex.NewMemory()
-		err := mem.AddBinary(uint32(addr), data)
-		if err != nil {
-			return ObjcopyError{"failed to create .hex file", err}
-		}
-		mem.DumpIntelHex(f, 16) // TODO: handle error
-		return nil
-	default:
-		panic("unreachable")
-	}
-}

src/device/arm/arm.go

@@ -118,21 +118,3 @@ func SetPriority(irq uint32, priority uint32) {
 	priority = priority << (regpos * 8)  // bits to set
 	NVIC.IPR[regnum] = RegValue((uint32(NVIC.IPR[regnum]) &^ mask) | priority)
 }
-
-// DisableInterrupts disables all interrupts, and returns the old state.
-//
-// TODO: it doesn't actually return the old state, meaning that it cannot be
-// nested.
-func DisableInterrupts() uintptr {
-	Asm("cpsid if")
-	return 0
-}
-
-// EnableInterrupts enables all interrupts again. The value passed in must be
-// the mask returned by DisableInterrupts.
-//
-// TODO: it doesn't actually use the old state, meaning that it cannot be
-// nested.
-func EnableInterrupts(mask uintptr) {
-	Asm("cpsie if")
-}

src/device/arm/cortexm.s

@@ -1,21 +0,0 @@
-.syntax unified
-
-.section .text.HardFault_Handler
-.global  HardFault_Handler
-.type    HardFault_Handler, %function
-HardFault_Handler:
-    // Put the old stack pointer in the first argument, for easy debugging. This
-    // is especially useful on Cortex-M0, which supports far fewer debug
-    // facilities.
-    mov r0, sp
-
-    // Load the default stack pointer from address 0 so that we can call normal
-    // functions again that expect a working stack. However, it will corrupt the
-    // old stack so the function below must not attempt to recover from this
-    // fault.
-    movs r3, #0
-    ldr r3, [r3]
-    mov sp, r3
-
-    // Continue handling this error in Go.
-    bl handleHardFault

src/examples/adc/adc.go

@@ -11,8 +11,8 @@ import (
 func main() {
 	machine.InitADC()
 
-	led := machine.LED
-	led.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led := machine.GPIO{machine.LED}
+	led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
 	sensor := machine.ADC{machine.ADC2}
 	sensor.Configure()

src/examples/blinky1/blinky1.go

@@ -8,8 +8,8 @@ import (
 )
 
 func main() {
-	led := machine.LED
-	led.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led := machine.GPIO{machine.LED}
+	led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 	for {
 		led.Low()
 		time.Sleep(time.Millisecond * 500)

src/examples/blinky2/blinky2.go

@@ -16,8 +16,8 @@ func main() {
 }
 
 func led1() {
-	led := machine.LED1
-	led.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led := machine.GPIO{machine.LED}
+	led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 	for {
 		println("+")
 		led.Low()
@@ -30,8 +30,8 @@ func led1() {
 }
 
 func led2() {
-	led := machine.LED2
-	led.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led := machine.GPIO{machine.LED2}
+	led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 	for {
 		println("  +")
 		led.Low()

src/examples/button/button.go

@@ -7,14 +7,14 @@ import (
 
 // This example assumes that the button is connected to pin 8. Change the value
 // below to use a different pin.
-const (
-	led    = machine.LED
-	button = machine.Pin(8)
-)
+const buttonPin = 8
 
 func main() {
-	led.Configure(machine.PinConfig{Mode: machine.PinOutput})
-	button.Configure(machine.PinConfig{Mode: machine.PinInput})
+	led := machine.GPIO{machine.LED}
+	led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
+
+	button := machine.GPIO{buttonPin}
+	button.Configure(machine.GPIOConfig{Mode: machine.GPIO_INPUT})
 
 	for {
 		if button.Get() {

src/examples/button2/button2.go

@@ -8,29 +8,29 @@ import (
 // This example assumes that you are using the pca10040 board
 
 func main() {
-	led1 := machine.LED1
-	led1.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led1 := machine.GPIO{machine.LED1}
+	led1.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
-	led2 := machine.LED2
-	led2.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led2 := machine.GPIO{machine.LED2}
+	led2.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
-	led3 := machine.LED3
-	led3.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led3 := machine.GPIO{machine.LED3}
+	led3.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
-	led4 := machine.LED4
-	led4.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led4 := machine.GPIO{machine.LED4}
+	led4.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
-	button1 := machine.BUTTON1
-	button1.Configure(machine.PinConfig{Mode: machine.PinInputPullup})
+	button1 := machine.GPIO{machine.BUTTON1}
+	button1.Configure(machine.GPIOConfig{Mode: machine.GPIO_INPUT_PULLUP})
 
-	button2 := machine.BUTTON2
-	button2.Configure(machine.PinConfig{Mode: machine.PinInputPullup})
+	button2 := machine.GPIO{machine.BUTTON2}
+	button2.Configure(machine.GPIOConfig{Mode: machine.GPIO_INPUT_PULLUP})
 
-	button3 := machine.BUTTON3
-	button3.Configure(machine.PinConfig{Mode: machine.PinInputPullup})
+	button3 := machine.GPIO{machine.BUTTON3}
+	button3.Configure(machine.GPIOConfig{Mode: machine.GPIO_INPUT_PULLUP})
 
-	button4 := machine.BUTTON4
-	button4.Configure(machine.PinConfig{Mode: machine.PinInputPullup})
+	button4 := machine.GPIO{machine.BUTTON4}
+	button4.Configure(machine.GPIOConfig{Mode: machine.GPIO_INPUT_PULLUP})
 
 	for {
 		led1.Set(button1.Get())

src/examples/colorlamp/colorlamp.go

@@ -0,0 +1,79 @@
+// This program runs on an Arduino that has the following four devices connected:
+// - Button connected to D2
+// - Rotary analog dial connected to A0
+// - RGB LED connected to D3, D5, and D6 used as PWM pins
+// - BlinkM I2C RGB LED
+//
+// Pushing the button switches which color is selected.
+// Rotating the dial changes the value for the currently selected color.
+// Changing the color value updates the color displayed on both the
+// PWM-controlled RGB LED and the I2C-controlled BlinkM.
+package main
+
+import (
+	"machine"
+	"time"
+)
+
+const (
+	buttonPin = 2
+	redPin    = 3
+	greenPin  = 5
+	bluePin   = 6
+
+	red   = 0
+	green = 1
+	blue  = 2
+)
+
+func main() {
+	machine.InitADC()
+	machine.InitPWM()
+	machine.I2C0.Configure(machine.I2CConfig{})
+
+	// Init BlinkM
+	machine.I2C0.WriteTo(0x09, []byte("o"))
+
+	button := machine.GPIO{buttonPin}
+	button.Configure(machine.GPIOConfig{Mode: machine.GPIO_INPUT})
+
+	dial := machine.ADC{machine.ADC0}
+	dial.Configure()
+
+	redLED := machine.PWM{redPin}
+	redLED.Configure()
+
+	greenLED := machine.PWM{greenPin}
+	greenLED.Configure()
+
+	blueLED := machine.PWM{bluePin}
+	blueLED.Configure()
+
+	selectedColor := red
+	colors := []uint16{0, 0, 0}
+
+	for {
+		// If we pushed the button, switch active color.
+		if !button.Get() {
+			if selectedColor == blue {
+				selectedColor = red
+			} else {
+				selectedColor++
+			}
+		}
+
+		// Change the intensity for the currently selected color based on the dial setting.
+		colors[selectedColor] = (dial.Get())
+
+		// Update the RGB LED.
+		redLED.Set(colors[red])
+		greenLED.Set(colors[green])
+		blueLED.Set(colors[blue])
+
+		// Update the BlinkM.
+		machine.I2C0.WriteTo(0x09, []byte("n"))
+		machine.I2C0.WriteTo(0x09, []byte{byte(colors[red] >> 8), byte(colors[green] >> 8), byte(colors[blue] >> 8)})
+
+		time.Sleep(time.Millisecond * 100)
+	}
+}

src/examples/echo/echo.go

@@ -7,34 +7,27 @@ import (
 	"time"
 )
 
-// change these to test a different UART or pins if available
-var (
-	uart = machine.UART0
-	tx   = machine.UART_TX_PIN
-	rx   = machine.UART_RX_PIN
-)
-
 func main() {
-	uart.Configure(machine.UARTConfig{TX: tx, RX: rx})
-	uart.Write([]byte("Echo console enabled. Type something then press enter:\r\n"))
+	machine.UART0.Configure(machine.UARTConfig{})
+	machine.UART0.Write([]byte("Echo console enabled. Type something then press enter:\r\n"))
 
 	input := make([]byte, 64)
 	i := 0
 	for {
-		if uart.Buffered() > 0 {
-			data, _ := uart.ReadByte()
+		if machine.UART0.Buffered() > 0 {
+			data, _ := machine.UART0.ReadByte()
 
 			switch data {
 			case 13:
 				// return key
-				uart.Write([]byte("\r\n"))
-				uart.Write([]byte("You typed: "))
-				uart.Write(input[:i])
-				uart.Write([]byte("\r\n"))
+				machine.UART0.Write([]byte("\r\n"))
+				machine.UART0.Write([]byte("You typed: "))
+				machine.UART0.Write(input[:i])
+				machine.UART0.Write([]byte("\r\n"))
 				i = 0
 			default:
 				// just echo the character
-				uart.WriteByte(data)
+				machine.UART0.WriteByte(data)
 				input[i] = data
 				i++
 			}

src/examples/i2s/i2s.go

@@ -1,25 +0,0 @@
-// Example using the i2s hardware interface on the Adafruit Circuit Playground Express
-// to read data from the onboard MEMS microphone.
-//
-package main
-
-import (
-	"machine"
-)
-
-func main() {
-	machine.I2S0.Configure(machine.I2SConfig{
-		Mode:        machine.I2SModePDM,
-		ClockSource: machine.I2SClockSourceExternal,
-		Stereo:      true,
-	})
-
-	data := make([]uint32, 64)
-
-	for {
-		// get the next group of samples
-		machine.I2S0.Read(data)
-
-		println("data", data[0], data[1], data[2], data[4], "...")
-	}
-}

src/examples/mcp3008/mcp3008.go

@@ -8,17 +8,19 @@ import (
 	"time"
 )
 
-// cs is the pin used for Chip Select (CS). Change to whatever is in use on your board.
-const cs = machine.Pin(3)
+// CS_PIN is the pin used for Chip Select (CS). Change to whatever is in use on your board.
+const CS_PIN = 3
 
 var (
 	tx          []byte
 	rx          []byte
 	val, result uint16
+	cs          machine.GPIO
 )
 
 func main() {
-	cs.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	cs = machine.GPIO{CS_PIN}
+	cs.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
 	machine.SPI0.Configure(machine.SPIConfig{
 		Frequency: 4000000,

src/examples/microbit-blink/microbit-blink.go

@@ -1,24 +0,0 @@
-// blink program for the BBC micro:bit
-package main
-
-import (
-	"machine"
-	"time"
-)
-
-// The LED matrix in the micro:bit is a multiplexed display: https://en.wikipedia.org/wiki/Multiplexed_display
-// Driver for easier control: https://github.com/tinygo-org/drivers/tree/master/microbitmatrix
-func main() {
-	ledrow := machine.LED_ROW_1
-	ledrow.Configure(machine.PinConfig{Mode: machine.PinOutput})
-	ledcol := machine.LED_COL_1
-	ledcol.Configure(machine.PinConfig{Mode: machine.PinOutput})
-	ledcol.Low()
-	for {
-		ledrow.Low()
-		time.Sleep(time.Millisecond * 500)
-
-		ledrow.High()
-		time.Sleep(time.Millisecond * 500)
-	}
-}

src/examples/wasm/.gitignore

@@ -1 +0,0 @@
-html/*

src/examples/wasm/Makefile

@@ -1,20 +0,0 @@
-export: clean wasm_exec
-	tinygo build -o ./html/wasm.wasm -target wasm -no-debug ./export/wasm.go
-	cp ./export/wasm.js ./html/
-	cp ./export/index.html ./html/
-
-callback: clean wasm_exec
-	tinygo build -o ./html/wasm.wasm -target wasm ./callback/wasm.go
-	cp ./callback/wasm.js ./html/
-	cp ./callback/index.html ./html/
-
-main: clean wasm_exec
-	tinygo build -o ./html/wasm.wasm -target wasm -no-debug ./main/main.go
-	cp ./main/index.html ./html/
-
-wasm_exec:
-	cp ../../../targets/wasm_exec.js ./html/
-
-clean:
-	rm -rf ./html
-	mkdir ./html

src/examples/wasm/README.md

@@ -1,131 +0,0 @@
-# TinyGo WebAssembly examples
-
-The examples here show two different ways of using WebAssembly with TinyGo:
-
-1. Defining and exporting functions via the `//go:export <name>` directive. See
-[the export folder](./export) for an example of this.
-1. Defining and executing a `func main()`. This is similar to how the Go
-standard library implementation works. See [the main folder](./main) for an
-example of this.
-
-## Building
-
-Build using the `tinygo` compiler:
-
-```bash
-$ tinygo build -o ./wasm.wasm -target wasm ./main/main.go
-```
-
-This creates a `wasm.wasm` file, which we can load in JavaScript and execute in
-a browser.
-
-This examples folder contains two examples that can be built using `make`:
-
-```bash
-$ make export
-```
-
-```bash
-$ make main
-```
-
-## Running
-
-Start the local web server:
-
-```bash
-$ go run main.go
-Serving ./html on http://localhost:8080
-```
-
-Use your web browser to visit http://localhost:8080.
-
-* The wasm "export" example displays a simple math equation using HTML, with
-the result calculated dynamically using WebAssembly.  Changing any of the
-values on the left hand side triggers the exported wasm `update` function to
-recalculate the result.
-* The wasm "main" example uses `println` to write to your browser JavaScript
-console. You may need to open the browser development tools console to see it.
-
-## How it works
-
-Execution of the contents require a few JavaScript helper functions which are
-called from WebAssembly.
-
-We have defined these in [wasm_exec.js](../../../targets/wasm_exec.js).  It is
-based on `$GOROOT/misc/wasm/wasm_exec.js` from the standard library, but is
-slightly different. Ensure you are using the same version of `wasm_exec.js` as
-the version of `tinygo` you are using to compile.
-
-The general steps required to run the WebAssembly file in the browser includes
-loading it into JavaScript with `WebAssembly.instantiateStreaming`, or
-`WebAssembly.instantiate` in some browsers:
-
-```js
-const go = new Go(); // Defined in wasm_exec.js
-const WASM_URL = 'wasm.wasm';
-
-var wasm;
-
-if ('instantiateStreaming' in WebAssembly) {
-	WebAssembly.instantiateStreaming(fetch(WASM_URL), go.importObject).then(function (obj) {
-		wasm = obj.instance;
-		go.run(wasm);
-	})
-} else {
-	fetch(WASM_URL).then(resp =>
-		resp.arrayBuffer()
-	).then(bytes =>
-		WebAssembly.instantiate(bytes, go.importObject).then(function (obj) {
-			wasm = obj.instance;
-			go.run(wasm);
-		})
-	)
-}
-```
-
-If you have used explicit exports, you can call them by invoking them under the
-`wasm.exports` namespace. See the [`export`](./export/wasm.js) directory for an
-example of this.
-
-In addition to the JavaScript, it is important the wasm file is served with the
-[`Content-Type`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type)
-header set to `application/wasm`.  Without it, most browsers won't run it.
-
-```go
-package main
-
-import (
-	"log"
-	"net/http"
-	"strings"
-)
-
-const dir = "./html"
-
-func main() {
-	fs := http.FileServer(http.Dir(dir))
-	log.Print("Serving " + dir + " on http://localhost:8080")
-	http.ListenAndServe(":8080", http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
-		resp.Header().Add("Cache-Control", "no-cache")
-		if strings.HasSuffix(req.URL.Path, ".wasm") {
-			resp.Header().Set("content-type", "application/wasm")
-		}
-		fs.ServeHTTP(resp, req)
-	}))}
-```
-
-This simple server serves anything inside the `./html` directory on port
-`8080`, setting any `*.wasm` files `Content-Type` header appropriately.
-
-For development purposes (**only!**), it also sets the `Cache-Control` header
-so your browser doesn't cache the files.  This is useful while developing, to
-ensure your browser displays the newest wasm when you recompile.
-
-In a production environment you **probably wouldn't** want to set the
-`Cache-Control` header like this.  Caching is generally beneficial for end
-users.
-
-Further information on the `Cache-Control` header can be found here:
-
-* https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control

src/examples/wasm/callback/index.html

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-
-<head>
-	<meta charset="utf-8" />
-	<title>Go WebAssembly</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<script src="wasm_exec.js" defer></script>
-	<script src="wasm.js" defer></script>
-</head>
-
-<body>
-	<h1>WebAssembly</h1>
-	<p>Add two numbers, using WebAssembly:</p>
-	<input type="number" id="a" value="0" /> + <input type="number" id="b" value="0" /> = <input type="number" id="result" readonly />
-</body>
-
-</html>

src/examples/wasm/callback/wasm.go

@@ -1,27 +0,0 @@
-package main
-
-import (
-	"strconv"
-	"syscall/js"
-)
-
-var a, b int
-
-func main() {
-	document := js.Global().Get("document")
-	document.Call("getElementById", "a").Set("oninput", updater(&a))
-	document.Call("getElementById", "b").Set("oninput", updater(&b))
-	update()
-}
-
-func updater(n *int) js.Func {
-	return js.FuncOf(func(this js.Value, args []js.Value) interface{} {
-		*n, _ = strconv.Atoi(this.Get("value").String())
-		update()
-		return nil
-	})
-}
-
-func update() {
-	js.Global().Get("document").Call("getElementById", "result").Set("value", a+b)
-}

src/examples/wasm/callback/wasm.js

@@ -1,26 +0,0 @@
-'use strict';
-
-const WASM_URL = 'wasm.wasm';
-
-var wasm;
-
-function init() {
-  const go = new Go();
-  if ('instantiateStreaming' in WebAssembly) {
-    WebAssembly.instantiateStreaming(fetch(WASM_URL), go.importObject).then(function (obj) {
-      wasm = obj.instance;
-      go.run(wasm);
-    })
-  } else {
-    fetch(WASM_URL).then(resp =>
-      resp.arrayBuffer()
-    ).then(bytes =>
-      WebAssembly.instantiate(bytes, go.importObject).then(function (obj) {
-        wasm = obj.instance;
-        go.run(wasm);
-      })
-    )
-  }
-}
-
-init();

src/examples/wasm/export/index.html

@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-
-<head>
-	<meta charset="utf-8" />
-	<title>Go WebAssembly</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<script src="wasm_exec.js" defer></script>
-	<script src="wasm.js" defer></script>
-</head>
-
-<body>
-	<h1>WebAssembly</h1>
-	<p>Add two numbers, using WebAssembly:</p>
-	<input type="number" id="a" value="2" /> + <input type="number" id="b" value="2" /> = <input type="number"
-		id="result" readonly />
-</body>
-
-</html>

src/examples/wasm/export/wasm.js

@@ -1,35 +0,0 @@
-'use strict';
-
-const WASM_URL = 'wasm.wasm';
-
-var wasm;
-
-function updateResult() {
-  wasm.exports.update();
-}
-
-function init() {
-  document.querySelector('#a').oninput = updateResult;
-  document.querySelector('#b').oninput = updateResult;
-
-  const go = new Go();
-  if ('instantiateStreaming' in WebAssembly) {
-    WebAssembly.instantiateStreaming(fetch(WASM_URL), go.importObject).then(function (obj) {
-      wasm = obj.instance;
-      go.run(wasm);
-      updateResult();
-    })
-  } else {
-    fetch(WASM_URL).then(resp =>
-      resp.arrayBuffer()
-    ).then(bytes =>
-      WebAssembly.instantiate(bytes, go.importObject).then(function (obj) {
-        wasm = obj.instance;
-        go.run(wasm);
-        updateResult();
-      })
-    )
-  }
-}
-
-init();

src/examples/wasm/main/README.md

@@ -1,8 +0,0 @@
-# WebAssembly main execution example
-
-A simple hello world that prints to the browser console.
-
-## License
-
-Note that `index.html` is copied almost verbatim from the Go 1.12 source at
-`$GOROOT/misc/wasm/wasm_exec.html`. Its license applies to this file.

src/examples/wasm/main/index.html

@@ -1,49 +0,0 @@
-<!doctype html>
-<!--
-Copyright 2018 The Go Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
--->
-<html>
-
-<head>
-	<meta charset="utf-8">
-	<title>Go wasm</title>
-</head>
-
-<body>
-	<!--
-	Add the following polyfill for Microsoft Edge 17/18 support:
-	<script src="https://cdn.jsdelivr.net/npm/text-encoding@0.7.0/lib/encoding.min.js"></script>
-	(see https://caniuse.com/#feat=textencoder)
-	-->
-	<script src="wasm_exec.js"></script>
-	<script>
-		if (!WebAssembly.instantiateStreaming) { // polyfill
-			WebAssembly.instantiateStreaming = async (resp, importObject) => {
-				const source = await (await resp).arrayBuffer();
-				return await WebAssembly.instantiate(source, importObject);
-			};
-		}
-
-		const go = new Go();
-		let mod, inst;
-		WebAssembly.instantiateStreaming(fetch("wasm.wasm"), go.importObject).then((result) => {
-			mod = result.module;
-			inst = result.instance;
-			document.getElementById("runButton").disabled = false;
-		}).catch((err) => {
-			console.error(err);
-		});
-
-		async function run() {
-			console.clear();
-			await go.run(inst);
-			inst = await WebAssembly.instantiate(mod, go.importObject); // reset instance
-		}
-	</script>
-
-	<button onClick="run();" id="runButton" disabled>Run</button>
-</body>
-
-</html>

src/examples/wasm/main/main.go

@@ -1,5 +0,0 @@
-package main
-
-func main() {
-	println("Hello world!")
-}

src/examples/wasm/server.go

@@ -1,21 +0,0 @@
-package main
-
-import (
-	"log"
-	"net/http"
-	"strings"
-)
-
-const dir = "./html"
-
-func main() {
-	fs := http.FileServer(http.Dir(dir))
-	log.Print("Serving " + dir + " on http://localhost:8080")
-	http.ListenAndServe(":8080", http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
-		resp.Header().Add("Cache-Control", "no-cache")
-		if strings.HasSuffix(req.URL.Path, ".wasm") {
-			resp.Header().Set("content-type", "application/wasm")
-		}
-		fs.ServeHTTP(resp, req)
-	}))
-}

src/examples/wasm/wasm.go

@@ -16,10 +16,10 @@ func add(a, b int) int {
 //go:export update
 func update() {
 	document := js.Global().Get("document")
-	aStr := document.Call("getElementById", "a").Get("value").String()
-	bStr := document.Call("getElementById", "b").Get("value").String()
-	a, _ := strconv.Atoi(aStr)
-	b, _ := strconv.Atoi(bStr)
-	result := add(a, b)
+	a_str := document.Call("getElementById", "a").Get("value").String()
+	b_str := document.Call("getElementById", "b").Get("value").String()
+	a, _ := strconv.Atoi(a_str)
+	b, _ := strconv.Atoi(b_str)
+	result := a + b
 	document.Call("getElementById", "result").Set("value", result)
 }

src/examples/wasm/wasm.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta charset="utf-8"/>
+		<title>Go WebAssembly</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1"/>
+		<script src="../../../targets/wasm_exec.js" defer></script>
+		<script src="wasm.js" defer></script>
+	</head>
+	<body>
+		<h1>WebAssembly</h1>
+		<p>Add two numbers, using WebAssembly:</p>
+		<input type="number" id="a" value="2"/> + <input type="number" id="b" value="2"/> = <input type="number" id="result" readonly/>
+	</body>
+</html>

src/examples/wasm/wasm.js

@@ -0,0 +1,23 @@
+'use strict';
+
+const WASM_URL = '../../../wasm.wasm';
+
+var wasm;
+
+function updateResult() {
+  wasm.exports.update();
+}
+
+function init() {
+  document.querySelector('#a').oninput = updateResult;
+  document.querySelector('#b').oninput = updateResult;
+
+  const go = new Go();
+  WebAssembly.instantiateStreaming(fetch(WASM_URL), go.importObject).then(function(obj) {
+    wasm = obj.instance;
+    go.run(wasm);
+    updateResult();
+  })
+}
+
+init();

src/machine/board_arduino.go

@@ -5,20 +5,14 @@ package machine
 const CPU_FREQUENCY = 16000000
 
 // LED on the Arduino
-const LED Pin = 13
+const LED = 13
 
 // ADC on the Arduino
 const (
-	ADC0 Pin = 0
-	ADC1 Pin = 1
-	ADC2 Pin = 2
-	ADC3 Pin = 3
-	ADC4 Pin = 4 // Used by TWI for SDA
-	ADC5 Pin = 5 // Used by TWI for SCL
-)
-
-// UART pins
-const (
-	UART_TX_PIN Pin = 1
-	UART_RX_PIN Pin = 0
+	ADC0 = 0
+	ADC1 = 1
+	ADC2 = 2
+	ADC3 = 3
+	ADC4 = 4 // Used by TWI for SDA
+	ADC5 = 5 // Used by TWI for SCL
 )

src/machine/board_circuitplay_express.go

@@ -1,113 +0,0 @@
-// +build sam,atsamd21,circuitplay_express
-
-package machine
-
-import "device/sam"
-
-// GPIO Pins
-const (
-	D0  = PB09
-	D1  = PB08
-	D2  = PB02
-	D3  = PB03
-	D4  = PA28
-	D5  = PA14
-	D6  = PA05
-	D7  = PA15
-	D8  = PB23
-	D9  = PA06
-	D10 = PA07
-	D11 = NoPin // does not seem to exist
-	D12 = PA02
-	D13 = PA17 // PWM available
-)
-
-// Analog Pins
-const (
-	A0  = PA02 // PWM available, also ADC/AIN[0]
-	A1  = PA05 // ADC/AIN[5]
-	A2  = PA06 // PWM available, also ADC/AIN[6]
-	A3  = PA07 // PWM available, also ADC/AIN[7]
-	A4  = PB03 // PORTB
-	A5  = PB02 // PORTB
-	A6  = PB09 // PORTB
-	A7  = PB08 // PORTB
-	A8  = PA11 // ADC/AIN[19]
-	A9  = PA09 // ADC/AIN[17]
-	A10 = PA04
-)
-
-const (
-	LED       = D13
-	NEOPIXELS = D8
-
-	BUTTONA = D4
-	BUTTONB = D5
-	SLIDER  = D7 // built-in slide switch
-
-	BUTTON  = BUTTONA
-	BUTTON1 = BUTTONB
-
-	LIGHTSENSOR = A8
-	TEMPSENSOR  = A9
-	PROXIMITY   = A10
-)
-
-// USBCDC pins (logical UART0)
-const (
-	USBCDC_DM_PIN = PA24
-	USBCDC_DP_PIN = PA25
-)
-
-// UART0 pins (logical UART1)
-const (
-	UART_TX_PIN = PB08 // PORTB
-	UART_RX_PIN = PB09 // PORTB
-)
-
-// I2C pins
-const (
-	SDA_PIN = PB02 // I2C0 external
-	SCL_PIN = PB03 // I2C0 external
-
-	SDA1_PIN = PA00 // I2C1 internal
-	SCL1_PIN = PA01 // I2C1 internal
-)
-
-// I2C on the Circuit Playground Express.
-var (
-	// external device
-	I2C0 = I2C{Bus: sam.SERCOM5_I2CM,
-		SDA:     SDA_PIN,
-		SCL:     SCL_PIN,
-		PinMode: PinSERCOM}
-	// internal device
-	I2C1 = I2C{Bus: sam.SERCOM1_I2CM,
-		SDA:     SDA1_PIN,
-		SCL:     SCL1_PIN,
-		PinMode: PinSERCOMAlt}
-)
-
-// SPI pins (internal flash)
-const (
-	SPI0_SCK_PIN  = PA21 // SCK: SERCOM3/PAD[3]
-	SPI0_MOSI_PIN = PA20 // MOSI: SERCOM3/PAD[2]
-	SPI0_MISO_PIN = PA16 // MISO: SERCOM3/PAD[0]
-)
-
-// SPI on the Circuit Playground Express.
-var (
-	SPI0 = SPI{Bus: sam.SERCOM3_SPI}
-)
-
-// I2S pins
-const (
-	I2S_SCK_PIN = PA10
-	I2S_SD_PIN  = PA08
-	I2S_WS_PIN  = NoPin // no WS, instead uses SCK to sync
-)
-
-// I2S on the Circuit Playground Express.
-var (
-	I2S0 = I2S{Bus: sam.I2S}
-)

src/machine/board_digispark.go

@@ -3,5 +3,5 @@
 package machine
 
 const (
-	LED Pin = 1
+	LED = 1
 )

src/machine/board_feather-m0.go

@@ -1,82 +0,0 @@
-// +build sam,atsamd21,feather_m0
-
-package machine
-
-import "device/sam"
-
-// GPIO Pins
-const (
-	D0  = PA11  // UART0 RX
-	D1  = PA10  // UART0 TX
-	D2  = NoPin // does not seem to exist
-	D3  = PA09
-	D4  = PA08
-	D5  = PA15  // PWM available
-	D6  = PA20  // PWM available
-	D7  = NoPin // does not seem to exist
-	D8  = PA06
-	D9  = PA07 // PWM available
-	D10 = PA18 // can be used for PWM or UART1 TX
-	D11 = PA16 // can be used for PWM or UART1 RX
-	D12 = PA19 // PWM available
-	D13 = PA17 // PWM available
-)
-
-// Analog pins
-const (
-	A0 = PA02 // ADC/AIN[0]
-	A1 = PB08 // ADC/AIN[2]
-	A2 = PB09 // ADC/AIN[3]
-	A3 = PA04 // ADC/AIN[4]
-	A4 = PA05 // ADC/AIN[5]
-	A5 = PB02 // ADC/AIN[10]
-)
-
-const (
-	LED = D13
-)
-
-// UART0 aka USBCDC pins
-const (
-	USBCDC_DM_PIN = PA24
-	USBCDC_DP_PIN = PA25
-)
-
-// UART1 pins
-const (
-	UART_TX_PIN = D10
-	UART_RX_PIN = D11
-)
-
-// I2C pins
-const (
-	SDA_PIN = PA22 // SDA: SERCOM3/PAD[0]
-	SCL_PIN = PA23 // SCL: SERCOM3/PAD[1]
-)
-
-// I2C on the Feather M0.
-var (
-	I2C0 = I2C{Bus: sam.SERCOM3_I2CM,
-		SDA:     SDA_PIN,
-		SCL:     SCL_PIN,
-		PinMode: PinSERCOM}
-)
-
-// SPI pins
-const (
-	SPI0_SCK_PIN  = PB11 // SCK: SERCOM4/PAD[3]
-	SPI0_MOSI_PIN = PB10 // MOSI: SERCOM4/PAD[2]
-	SPI0_MISO_PIN = PA12 // MISO: SERCOM4/PAD[0]
-)
-
-// SPI on the Feather M0.
-var (
-	SPI0 = SPI{Bus: sam.SERCOM4_SPI}
-)
-
-// I2S pins
-const (
-	I2S_SCK_PIN = PA10
-	I2S_SD_PIN  = PA08
-	I2S_WS_PIN  = NoPin // TODO: figure out what this is on Feather M0.
-)

src/machine/board_itsybitsy-m0.go

@@ -1,87 +0,0 @@
-// +build sam,atsamd21,itsybitsy_m0
-
-package machine
-
-import "device/sam"
-
-// GPIO Pins
-const (
-	D0  = PA11 // UART0 RX
-	D1  = PA10 // UART0 TX
-	D2  = PA14
-	D3  = PA09 // PWM available
-	D4  = PA08 // PWM available
-	D5  = PA15 // PWM available
-	D6  = PA20 // PWM available
-	D7  = PA21 // PWM available
-	D8  = PA06 // PWM available
-	D9  = PA07 // PWM available
-	D10 = PA18 // can be used for PWM or UART1 TX
-	D11 = PA16 // can be used for PWM or UART1 RX
-	D12 = PA19 // PWM available
-	D13 = PA17 // PWM available
-)
-
-// Analog pins
-const (
-	A0 = PA02 // ADC/AIN[0]
-	A1 = PB08 // ADC/AIN[2]
-	A2 = PB09 // ADC/AIN[3]
-	A3 = PA04 // ADC/AIN[4]
-	A4 = PA05 // ADC/AIN[5]
-	A5 = PB02 // ADC/AIN[10]
-)
-
-const (
-	LED = D13
-)
-
-// UART0 aka USBCDC pins
-const (
-	USBCDC_DM_PIN = PA24
-	USBCDC_DP_PIN = PA25
-)
-
-// UART1 pins
-const (
-	UART_TX_PIN = D10
-	UART_RX_PIN = D11
-)
-
-// I2C pins
-const (
-	SDA_PIN = PA22 // SDA: SERCOM3/PAD[0]
-	SCL_PIN = PA23 // SCL: SERCOM3/PAD[1]
-)
-
-// I2C on the ItsyBitsy M0.
-var (
-	I2C0 = I2C{Bus: sam.SERCOM3_I2CM,
-		SDA:     SDA_PIN,
-		SCL:     SCL_PIN,
-		PinMode: PinSERCOM}
-)
-
-// SPI pins
-const (
-	SPI0_SCK_PIN  = PB11 // SCK: SERCOM4/PAD[3]
-	SPI0_MOSI_PIN = PB10 // MOSI: SERCOM4/PAD[2]
-	SPI0_MISO_PIN = PA12 // MISO: SERCOM4/PAD[0]
-)
-
-// SPI on the ItsyBitsy M0.
-var (
-	SPI0 = SPI{Bus: sam.SERCOM4_SPI}
-)
-
-// I2S pins
-const (
-	I2S_SCK_PIN = PA10
-	I2S_SD_PIN  = PA08
-	I2S_WS_PIN  = NoPin // TODO: figure out what this is on ItsyBitsy M0.
-)
-
-// I2S on the ItsyBitsy M0.
-var (
-	I2S0 = I2S{Bus: sam.I2S}
-)

src/machine/board_microbit.go

@@ -2,75 +2,121 @@
 
 package machine
 
+import (
+	"device/nrf"
+	"errors"
+)
+
 // The micro:bit does not have a 32kHz crystal on board.
 const HasLowFrequencyCrystal = false
 
 // Buttons on the micro:bit (A and B)
 const (
-	BUTTON  Pin = BUTTONA
-	BUTTONA Pin = 17
-	BUTTONB Pin = 26
+	BUTTON  = BUTTONA
+	BUTTONA = 17
+	BUTTONB = 26
 )
 
 // UART pins
 const (
-	UART_TX_PIN Pin = 24
-	UART_RX_PIN Pin = 25
+	UART_TX_PIN = 24
+	UART_RX_PIN = 25
 )
 
 // ADC pins
 const (
-	ADC0 Pin = 3 // P0 on the board
-	ADC1 Pin = 2 // P1 on the board
-	ADC2 Pin = 1 // P2 on the board
+	ADC0 = 3 // P0 on the board
+	ADC1 = 2 // P1 on the board
+	ADC2 = 1 // P2 on the board
 )
 
 // I2C pins
 const (
-	SDA_PIN Pin = 30 // P20 on the board
-	SCL_PIN Pin = 0  // P19 on the board
+	SDA_PIN = 30 // P20 on the board
+	SCL_PIN = 0  // P19 on the board
 )
 
 // SPI pins
 const (
-	SPI0_SCK_PIN  Pin = 23 // P13 on the board
-	SPI0_MOSI_PIN Pin = 21 // P15 on the board
-	SPI0_MISO_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
+	SPI0_SCK_PIN  = 23 // P13 on the board
+	SPI0_MOSI_PIN = 21 // P15 on the board
+	SPI0_MISO_PIN = 22 // P14 on the board
 )
 
 // LED matrix pins
 const (
-	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
+	LED_COL_1 = 4
+	LED_COL_2 = 5
+	LED_COL_3 = 6
+	LED_COL_4 = 7
+	LED_COL_5 = 8
+	LED_COL_6 = 9
+	LED_COL_7 = 10
+	LED_COL_8 = 11
+	LED_COL_9 = 12
+	LED_ROW_1 = 13
+	LED_ROW_2 = 14
+	LED_ROW_3 = 15
 )
+
+// matrixSettings has the legs of the LED grid in the form {row, column} for each LED position.
+var matrixSettings = [5][5][2]uint8{
+	{{LED_ROW_1, LED_COL_1}, {LED_ROW_2, LED_COL_4}, {LED_ROW_1, LED_COL_2}, {LED_ROW_2, LED_COL_5}, {LED_ROW_1, LED_COL_3}},
+	{{LED_ROW_3, LED_COL_4}, {LED_ROW_3, LED_COL_5}, {LED_ROW_3, LED_COL_6}, {LED_ROW_3, LED_COL_7}, {LED_ROW_3, LED_COL_8}},
+	{{LED_ROW_2, LED_COL_2}, {LED_ROW_1, LED_COL_9}, {LED_ROW_2, LED_COL_3}, {LED_ROW_3, LED_COL_9}, {LED_ROW_2, LED_COL_1}},
+	{{LED_ROW_1, LED_COL_8}, {LED_ROW_1, LED_COL_7}, {LED_ROW_1, LED_COL_6}, {LED_ROW_1, LED_COL_5}, {LED_ROW_1, LED_COL_4}},
+	{{LED_ROW_3, LED_COL_3}, {LED_ROW_2, LED_COL_7}, {LED_ROW_3, LED_COL_1}, {LED_ROW_2, LED_COL_6}, {LED_ROW_3, LED_COL_2}}}
+
+// InitLEDMatrix initializes the LED matrix, by setting all of the row/col pins to output
+// then calling ClearLEDMatrix.
+func InitLEDMatrix() {
+	set := 0
+	for i := LED_COL_1; i <= LED_ROW_3; i++ {
+		set |= 1 << uint8(i)
+	}
+	nrf.GPIO.DIRSET = nrf.RegValue(set)
+	ClearLEDMatrix()
+}
+
+// ClearLEDMatrix clears the entire LED matrix.
+func ClearLEDMatrix() {
+	set := 0
+	for i := LED_COL_1; i <= LED_COL_9; i++ {
+		set |= 1 << uint8(i)
+	}
+	nrf.GPIO.OUTSET = nrf.RegValue(set)
+	nrf.GPIO.OUTCLR = (1 << LED_ROW_1) | (1 << LED_ROW_2) | (1 << LED_ROW_3)
+}
+
+// SetLEDMatrix turns on a single LED on the LED matrix.
+// Currently limited to a single LED at a time, it will clear the matrix before setting it.
+func SetLEDMatrix(x, y uint8) error {
+	if x > 4 || y > 4 {
+		return errors.New("Invalid LED matrix row or column")
+	}
+
+	// Clear matrix
+	ClearLEDMatrix()
+
+	nrf.GPIO.OUTSET = (1 << matrixSettings[y][x][0])
+	nrf.GPIO.OUTCLR = (1 << matrixSettings[y][x][1])
+
+	return nil
+}
+
+// SetEntireLEDMatrixOn turns on all of the LEDs on the LED matrix.
+func SetEntireLEDMatrixOn() error {
+	set := 0
+	for i := LED_ROW_1; i <= LED_ROW_3; i++ {
+		set |= 1 << uint8(i)
+	}
+	nrf.GPIO.OUTSET = nrf.RegValue(set)
+
+	set = 0
+	for i := LED_COL_1; i <= LED_COL_9; i++ {
+		set |= 1 << uint8(i)
+	}
+	nrf.GPIO.OUTCLR = nrf.RegValue(set)
+
+	return nil
+}

src/machine/board_nrf52840-mdk.go

@@ -6,27 +6,27 @@ 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       = LED_GREEN
+	LED_GREEN = 22
+	LED_RED   = 23
+	LED_BLUE  = 24
 )
 
 // UART pins
 const (
-	UART_TX_PIN Pin = 20
-	UART_RX_PIN Pin = 19
+	UART_TX_PIN = 20
+	UART_RX_PIN = 19
 )
 
 // I2C pins (unused)
 const (
-	SDA_PIN = NoPin
-	SCL_PIN = NoPin
+	SDA_PIN = 0xff
+	SCL_PIN = 0xff
 )
 
 // SPI pins (unused)
 const (
-	SPI0_SCK_PIN  = NoPin
-	SPI0_MOSI_PIN = NoPin
-	SPI0_MISO_PIN = NoPin
+	SPI0_SCK_PIN  = 0
+	SPI0_MOSI_PIN = 0
+	SPI0_MISO_PIN = 0
 )

src/machine/board_pca10031.go

@@ -10,30 +10,30 @@ const HasLowFrequencyCrystal = true
 
 // LED on the pca10031
 const (
-	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
+	LED       = LED_RED
+	LED1      = LED_RED
+	LED2      = LED_GREEN
+	LED3      = LED_BLUE
+	LED_RED   = 21
+	LED_GREEN = 22
+	LED_BLUE  = 23
 )
 
 // UART pins
 const (
-	UART_TX_PIN Pin = 9
-	UART_RX_PIN Pin = 11
+	UART_TX_PIN = 9
+	UART_RX_PIN = 11
 )
 
 // I2C pins (disabled)
 const (
-	SDA_PIN = NoPin
-	SCL_PIN = NoPin
+	SDA_PIN = 0xff
+	SCL_PIN = 0xff
 )
 
 // SPI pins (unused)
 const (
-	SPI0_SCK_PIN  = NoPin
-	SPI0_MOSI_PIN = NoPin
-	SPI0_MISO_PIN = NoPin
+	SPI0_SCK_PIN  = 0
+	SPI0_MOSI_PIN = 0
+	SPI0_MISO_PIN = 0
 )