ci: add support for LLVM 15

Also switch to LLVM 15 for builds with a system-installed LLVM.

Author: aykevl

.circleci/config.yml

@@ -118,12 +118,12 @@ jobs:
     steps:
       - test-linux:
           llvm: "14"
-  test-llvm14-go119:
+  test-llvm15-go119:
     docker:
-      - image: golang:1.19beta1-buster
+      - image: golang:1.19-buster
     steps:
       - test-linux:
-          llvm: "14"
+          llvm: "15"
           fmt-check: false
 
 workflows:
@@ -132,6 +132,6 @@ workflows:
       # This tests our lowest supported versions of Go and LLVM, to make sure at
       # least the smoke tests still pass.
       - test-llvm14-go118
-      # This tests a beta version of Go. It should be removed once regular
-      # release builds are built using this version.
-      - test-llvm14-go119
+      # This tests a newer version of Go and LLVM. It should be removed once
+      # regular release builds are built using these versions.
+      - test-llvm15-go119

.github/workflows/build-macos.yml

@@ -108,7 +108,7 @@ jobs:
       - name: Install LLVM
         shell: bash
         run: |
-          HOMEBREW_NO_AUTO_UPDATE=1 brew install llvm@14
+          HOMEBREW_NO_AUTO_UPDATE=1 brew install llvm@15
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install Go

cgo/libclang_config_llvm14.go

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

cgo/libclang_config_llvm15.go

@@ -0,0 +1,16 @@
+//go:build !byollvm && !llvm14
+// +build !byollvm,!llvm14
+
+package cgo
+
+/*
+#cgo linux        CFLAGS:  -I/usr/lib/llvm-15/include
+#cgo darwin,amd64 CFLAGS:  -I/usr/local/opt/llvm@15/include
+#cgo darwin,arm64 CFLAGS:  -I/opt/homebrew/opt/llvm@15/include
+#cgo freebsd      CFLAGS:  -I/usr/local/llvm15/include
+#cgo linux        LDFLAGS: -L/usr/lib/llvm-15/lib -lclang
+#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@15/lib -lclang -lffi
+#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@15/lib -lclang -lffi
+#cgo freebsd      LDFLAGS: -L/usr/local/llvm15/lib -lclang
+*/
+import "C"

go.mod

@@ -17,7 +17,7 @@ require (
 	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261
 	golang.org/x/tools v0.1.11
 	gopkg.in/yaml.v2 v2.4.0
-	tinygo.org/x/go-llvm v0.0.0-20220922113433-4b5ad7ff76ec
+	tinygo.org/x/go-llvm v0.0.0-20220922115213-dcb078a26266
 )
 
 require (

go.sum

@@ -64,5 +64,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-tinygo.org/x/go-llvm v0.0.0-20220922113433-4b5ad7ff76ec h1:FYtAFrw/YQPc644uNN65dW50FrEuVNaPBf70x23ApY4=
-tinygo.org/x/go-llvm v0.0.0-20220922113433-4b5ad7ff76ec/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=
+tinygo.org/x/go-llvm v0.0.0-20220922115213-dcb078a26266 h1:vg4sYKEM+w6epr5S1nXqP/7UhMYcc8nRt7Ohkq28rok=
+tinygo.org/x/go-llvm v0.0.0-20220922115213-dcb078a26266/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=