Roll gotools to 47f2109c.

At the same time, perform a number of simplifications:

- Rename go.tools directory to gotools.

- Import only the go directory; all required Go analysis code and
  its dependencies have now been moved to this directory.

llvm-svn: 225825

21 files changed, 37 insertions, 37 deletions

diff --git a/llgo/irgen/annotations.go b/llgo/irgen/annotations.go
index d88bb808504..4976a625a5f 100644
--- a/llgo/irgen/annotations.go
+++ b/llgo/irgen/annotations.go
@@ -16,9 +16,9 @@ package irgen
 import (
 	"go/ast"
 	"go/token"
-	"llvm.org/llgo/third_party/go.tools/go/loader"
-	"llvm.org/llgo/third_party/go.tools/go/ssa"
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/loader"
+	"llvm.org/llgo/third_party/gotools/go/ssa"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/builtins.go b/llgo/irgen/builtins.go
index 8e4dc872210..64d1c6d4ffb 100644
--- a/llgo/irgen/builtins.go
+++ b/llgo/irgen/builtins.go
@@ -14,7 +14,7 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/cabi.go b/llgo/irgen/cabi.go
index 5d6c634952e..f13cf28acb7 100644
--- a/llgo/irgen/cabi.go
+++ b/llgo/irgen/cabi.go
@@ -15,7 +15,7 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/call.go b/llgo/irgen/call.go
index 753a086d82a..49876bb9858 100644
--- a/llgo/irgen/call.go
+++ b/llgo/irgen/call.go
@@ -14,7 +14,7 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/channels.go b/llgo/irgen/channels.go
index f0f4aab1040..c5cc322d910 100644
--- a/llgo/irgen/channels.go
+++ b/llgo/irgen/channels.go
@@ -14,8 +14,8 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/ssa"
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/ssa"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/closures.go b/llgo/irgen/closures.go
index 4ed3ab745bb..bc21dd324e8 100644
--- a/llgo/irgen/closures.go
+++ b/llgo/irgen/closures.go
@@ -14,7 +14,7 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 )
 
 // makeClosure creates a closure from a function pointer and
diff --git a/llgo/irgen/compiler.go b/llgo/irgen/compiler.go
index 16c3988ba7b..c77f4a55e96 100644
--- a/llgo/irgen/compiler.go
+++ b/llgo/irgen/compiler.go
@@ -26,11 +26,11 @@ import (
 	"llvm.org/llgo/debug"
 	"llvm.org/llvm/bindings/go/llvm"
 
-	"llvm.org/llgo/third_party/go.tools/go/gccgoimporter"
-	"llvm.org/llgo/third_party/go.tools/go/importer"
-	"llvm.org/llgo/third_party/go.tools/go/loader"
-	"llvm.org/llgo/third_party/go.tools/go/ssa"
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/gccgoimporter"
+	"llvm.org/llgo/third_party/gotools/go/importer"
+	"llvm.org/llgo/third_party/gotools/go/loader"
+	"llvm.org/llgo/third_party/gotools/go/ssa"
+	"llvm.org/llgo/third_party/gotools/go/types"
 )
 
 type Module struct {
diff --git a/llgo/irgen/indirect.go b/llgo/irgen/indirect.go
index ea27007089a..d01df25ae15 100644
--- a/llgo/irgen/indirect.go
+++ b/llgo/irgen/indirect.go
@@ -15,8 +15,8 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/ssa"
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/ssa"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/interfaces.go b/llgo/irgen/interfaces.go
index 0c451827271..fba95ba5aa0 100644
--- a/llgo/irgen/interfaces.go
+++ b/llgo/irgen/interfaces.go
@@ -14,7 +14,7 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/maps.go b/llgo/irgen/maps.go
index ada24e1ac38..b694bdedebb 100644
--- a/llgo/irgen/maps.go
+++ b/llgo/irgen/maps.go
@@ -14,7 +14,7 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/predicates.go b/llgo/irgen/predicates.go
index 6607da8c527..2ef133647e1 100644
--- a/llgo/irgen/predicates.go
+++ b/llgo/irgen/predicates.go
@@ -14,7 +14,7 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 )
 
 func isBoolean(typ types.Type) bool {
diff --git a/llgo/irgen/println.go b/llgo/irgen/println.go
index 98ccedb2260..2d4e42cffce 100644
--- a/llgo/irgen/println.go
+++ b/llgo/irgen/println.go
@@ -17,7 +17,7 @@ package irgen
 import (
 	"fmt"
 
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 )
 
 func (fr *frame) printValues(println_ bool, values ...*govalue) {
diff --git a/llgo/irgen/runtime.go b/llgo/irgen/runtime.go
index e14a026c8bd..2e13de76c29 100644
--- a/llgo/irgen/runtime.go
+++ b/llgo/irgen/runtime.go
@@ -16,7 +16,7 @@ package irgen
 import (
 	"strconv"
 
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 
 	"llvm.org/llvm/bindings/go/llvm"
 )
diff --git a/llgo/irgen/slice.go b/llgo/irgen/slice.go
index ee267a874ee..49cde636b38 100644
--- a/llgo/irgen/slice.go
+++ b/llgo/irgen/slice.go
@@ -14,7 +14,7 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/ssa.go b/llgo/irgen/ssa.go
index 903e80416e1..e2be8747da9 100644
--- a/llgo/irgen/ssa.go
+++ b/llgo/irgen/ssa.go
@@ -21,9 +21,9 @@ import (
 	"sort"
 
 	"llvm.org/llgo/ssaopt"
-	"llvm.org/llgo/third_party/go.tools/go/ssa"
-	"llvm.org/llgo/third_party/go.tools/go/ssa/ssautil"
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/ssa"
+	"llvm.org/llgo/third_party/gotools/go/ssa/ssautil"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/strings.go b/llgo/irgen/strings.go
index 5ab1730f8ea..5762485d807 100644
--- a/llgo/irgen/strings.go
+++ b/llgo/irgen/strings.go
@@ -16,7 +16,7 @@ package irgen
 import (
 	"go/token"
 
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/switches.go b/llgo/irgen/switches.go
index 861a2dda82f..e4bf9a65fbb 100644
--- a/llgo/irgen/switches.go
+++ b/llgo/irgen/switches.go
@@ -16,9 +16,9 @@ package irgen
 import (
 	"go/token"
 
-	"llvm.org/llgo/third_party/go.tools/go/exact"
-	"llvm.org/llgo/third_party/go.tools/go/ssa"
-	"llvm.org/llgo/third_party/go.tools/go/ssa/ssautil"
+	"llvm.org/llgo/third_party/gotools/go/exact"
+	"llvm.org/llgo/third_party/gotools/go/ssa"
+	"llvm.org/llgo/third_party/gotools/go/ssa/ssautil"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/typemap.go b/llgo/irgen/typemap.go
index 5e12e41a41c..63da78b9186 100644
--- a/llgo/irgen/typemap.go
+++ b/llgo/irgen/typemap.go
@@ -21,10 +21,10 @@ import (
 	"strconv"
 	"strings"
 
-	"llvm.org/llgo/third_party/go.tools/go/ssa"
-	"llvm.org/llgo/third_party/go.tools/go/ssa/ssautil"
-	"llvm.org/llgo/third_party/go.tools/go/types"
-	"llvm.org/llgo/third_party/go.tools/go/types/typeutil"
+	"llvm.org/llgo/third_party/gotools/go/ssa"
+	"llvm.org/llgo/third_party/gotools/go/ssa/ssautil"
+	"llvm.org/llgo/third_party/gotools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types/typeutil"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/types.go b/llgo/irgen/types.go
index b9c897372bc..acbbdfc346d 100644
--- a/llgo/irgen/types.go
+++ b/llgo/irgen/types.go
@@ -14,7 +14,7 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 )
 
 func deref(t types.Type) types.Type {
diff --git a/llgo/irgen/utils.go b/llgo/irgen/utils.go
index 398a7cb274d..37cecd7d74c 100644
--- a/llgo/irgen/utils.go
+++ b/llgo/irgen/utils.go
@@ -14,7 +14,7 @@
 package irgen
 
 import (
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )
 
diff --git a/llgo/irgen/value.go b/llgo/irgen/value.go
index 12999819507..366069b3e10 100644
--- a/llgo/irgen/value.go
+++ b/llgo/irgen/value.go
@@ -17,8 +17,8 @@ package irgen
 import (
 	"fmt"
 	"go/token"
-	"llvm.org/llgo/third_party/go.tools/go/exact"
-	"llvm.org/llgo/third_party/go.tools/go/types"
+	"llvm.org/llgo/third_party/gotools/go/exact"
+	"llvm.org/llgo/third_party/gotools/go/types"
 	"llvm.org/llvm/bindings/go/llvm"
 )