Move to upstream LLVM bindings

Author: pcc

.travis.yml

@@ -10,8 +10,8 @@ before_install:
   - sudo $APT_GET install mercurial git subversion cmake gcc-4.8 g++-4.8
   - export CXX=g++-4.8 CC=gcc-4.8
 install:
-  - go get -d github.com/go-llvm/llvm
-  - $(go list -f '{{.Dir}}' github.com/go-llvm/llvm)/update_llvm.sh -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD=host
+  - go get -d llvm.org/llvm/bindings/go/llvm
+  - $(go list -f '{{.Dir}}' llvm.org/llvm/bindings/go/llvm)/../build.sh -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD=host
   - make install prefix=`pwd`/.install
 script:
   - make check-llgo check-libgo

Makefile

@@ -1,7 +1,7 @@
 j = 1
 prefix = /usr/local
 bootstrap = quick
-gollvmdir = $(shell go list -f '{{.Dir}}' github.com/go-llvm/llvm)
+gollvmdir = $(shell go list -f '{{.Dir}}' llvm.org/llvm/bindings/go/llvm)
 llvmdir = $(gollvmdir)/workdir/llvm_build
 
 bootstrap: workdir/.bootstrap-stamp
@@ -21,10 +21,12 @@ workdir/.bootstrap-stamp: workdir/.build-libgodeps-stamp bootstrap.sh build/*.go
 workdir/.build-libgodeps-stamp: workdir/.update-clang-stamp workdir/.update-libgo-stamp bootstrap.sh
 	./bootstrap.sh libgodeps -j$(j)
 
-workdir/.update-clang-stamp: update_clang.sh $(gollvmdir)/llvm_dep.go
+workdir/.update-clang-stamp: update_clang.sh alwaysrun
 	./update_clang.sh
 
 workdir/.update-libgo-stamp: update_libgo.sh
 	./update_libgo.sh
 
 .SUFFIXES:
+
+alwaysrun:

README.md

@@ -28,9 +28,8 @@ To build and install llgo:
 
     # Ensure $GOPATH is set.
     go get -d github.com/go-llvm/llgo/cmd/gllgo
-    cd $GOPATH/src/github.com/go-llvm/llvm
-    ./update_llvm.sh -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD=host
-    cd ../llgo
+    $GOPATH/src/llvm.org/llvm/bindings/go/build.sh -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD=host
+    cd $GOPATH/src/github.com/go-llvm/llgo
     make install prefix=/path/to/prefix j=N  # where N is the number of cores on your machine.
 
 # Running

cmd/gllgo/gllgo.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/go-llvm/llgo/debug"
 	"github.com/go-llvm/llgo/irgen"
-	"github.com/go-llvm/llvm"
+	"llvm.org/llvm/bindings/go/llvm"
 )
 
 func report(err error) {

debug/debug.go

@@ -15,7 +15,7 @@ import (
 	"code.google.com/p/go.tools/go/types"
 	"code.google.com/p/go.tools/go/types/typeutil"
 
-	"github.com/go-llvm/llvm"
+	"llvm.org/llvm/bindings/go/llvm"
 )
 
 const (
@@ -160,7 +160,8 @@ func (d *DIBuilder) Declare(b llvm.Builder, v ssa.Value, llv llvm.Value, paramIn
 		ArgNo: paramIndex + 1,
 		Type:  d.DIType(v.Type()),
 	})
-	d.builder.InsertDeclareAtEnd(llv, localVar, b.GetInsertBlock())
+	expr := d.builder.CreateExpression(nil)
+	d.builder.InsertDeclareAtEnd(llv, localVar, expr, b.GetInsertBlock())
 }
 
 // Value creates an llvm.dbg.value call for the specified register value.

irgen/annotations.go

@@ -8,9 +8,9 @@ import (
 	"code.google.com/p/go.tools/go/loader"
 	"code.google.com/p/go.tools/go/ssa"
 	"code.google.com/p/go.tools/go/types"
-	"github.com/go-llvm/llvm"
 	"go/ast"
 	"go/token"
+	"llvm.org/llvm/bindings/go/llvm"
 )
 
 // processAnnotations takes an *ssa.Package and a

irgen/attribute.go

@@ -6,8 +6,8 @@ package irgen
 
 import (
 	"fmt"
-	"github.com/go-llvm/llvm"
 	"go/ast"
+	"llvm.org/llvm/bindings/go/llvm"
 	"strings"
 )
 
@@ -89,10 +89,6 @@ func parseLinkageAttribute(value string) linkageAttribute {
 		switch strings.ToLower(field) {
 		case "private":
 			result |= linkageAttribute(llvm.PrivateLinkage)
-		case "linker_private":
-			result |= linkageAttribute(llvm.LinkerPrivateLinkage)
-		case "linker_private_weak":
-			result |= linkageAttribute(llvm.LinkerPrivateWeakLinkage)
 		case "internal":
 			result |= linkageAttribute(llvm.InternalLinkage)
 		case "available_externally":
@@ -113,10 +109,6 @@ func parseLinkageAttribute(value string) linkageAttribute {
 			result |= linkageAttribute(llvm.WeakODRLinkage)
 		case "external":
 			result |= linkageAttribute(llvm.ExternalLinkage)
-		case "dllimport":
-			result |= linkageAttribute(llvm.DLLImportLinkage)
-		case "dllexport":
-			result |= linkageAttribute(llvm.DLLExportLinkage)
 		}
 	}
 	return result

irgen/builtins.go

@@ -6,7 +6,7 @@ package irgen
 
 import (
 	"code.google.com/p/go.tools/go/types"
-	"github.com/go-llvm/llvm"
+	"llvm.org/llvm/bindings/go/llvm"
 )
 
 func (fr *frame) callCap(arg *govalue) *govalue {

irgen/cabi.go

@@ -2,7 +2,7 @@ package irgen
 
 import (
 	"code.google.com/p/go.tools/go/types"
-	"github.com/go-llvm/llvm"
+	"llvm.org/llvm/bindings/go/llvm"
 )
 
 type abiArgInfo int

irgen/call.go

@@ -6,7 +6,7 @@ package irgen
 
 import (
 	"code.google.com/p/go.tools/go/types"
-	"github.com/go-llvm/llvm"
+	"llvm.org/llvm/bindings/go/llvm"
 )
 
 // createCall emits the code for a function call,