[PATCH] [llgo] llgoi: Fix importing source packages together with dependent binary packages.

[Peter Collingbourne]

Hi axw,

Note that this means that llgoi does not support the case
where a package's pkgpath is different from its import path,
but I don't think this should actually happen with llgoi.

http://reviews.llvm.org/D8403

Files:
  cmd/llgoi/llgoi.go
  test/llgoi/Inputs/src/bar/answer.go
  test/llgoi/import-source.test
  test/llgoi/import-source2.test

Index: cmd/llgoi/llgoi.go
===================================================================
--- cmd/llgoi/llgoi.go
+++ cmd/llgoi/llgoi.go
@@ -102,6 +102,9 @@
 		if pkg, ok := in.inputPkgmap[pkgpath]; ok {
 			return pkg, nil
 		}
+		if pkg, ok := pkgmap[pkgpath]; ok && pkg.Complete() {
+			return pkg, nil
+		}
 		return origImporter(pkgmap, pkgpath)
 	}
 	return nil
Index: test/llgoi/Inputs/src/bar/answer.go
===================================================================
--- test/llgoi/Inputs/src/bar/answer.go
+++ test/llgoi/Inputs/src/bar/answer.go
@@ -1,5 +1,8 @@
 package bar
 
+import "strconv"
+
 func Answer() int {
-	return 42
+	n, _ := strconv.Atoi("42")
+	return n
 }
Index: test/llgoi/import-source.test
===================================================================
--- test/llgoi/import-source.test
+++ test/llgoi/import-source.test
@@ -7,8 +7,14 @@
 // CHECK: # bar
 // CHECK: # foo
 
+// Test that importing binary after source works.
+import "strconv"
+
 foo.Answer()
 // CHECK: #0 int = 42
 
+strconv.FormatBool(true)
+// CHECK: #0 string = true
+
 import "foo_cgo"
 // CHECK: foo_cgo: cannot load cgo package
Index: test/llgoi/import-source2.test
===================================================================
--- /dev/null
+++ test/llgoi/import-source2.test
@@ -0,0 +1,14 @@
+// RUN: env GOPATH=%S/Inputs llgoi < %s | FileCheck %s
+
+// Test that importing binary before source works.
+import "strconv"
+
+import "foo"
+// CHECK: # bar
+// CHECK: # foo
+
+foo.Answer()
+// CHECK: #0 int = 42
+
+strconv.FormatBool(true)
+// CHECK: #0 string = true

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D8403.22143.patch
Type: text/x-patch
Size: 1588 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150317/894796f2/attachment.bin>