cmd/go: use build ID as plugin symbol prefix

Updates #17821

Change-Id: Iebd2e88b2d4f3d757ffad72456f4bfc0607d8110
Reviewed-on: https://go-review.googlesource.com/33162
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/misc/cgo/testplugin/src/host/host.go b/misc/cgo/testplugin/src/host/host.go
index b3b4df3d5840a7d734e04ab09d06b74d4f1684af..898f44efa154e967e026aefbbe14607d67259cca 100644 (file)
--- a/misc/cgo/testplugin/src/host/host.go
+++ b/misc/cgo/testplugin/src/host/host.go
@@ -18,6 +18,35 @@ func init() {
        common.X *= 5
 }
 
+// testUnnamed tests that two plugins built with .go files passed on
+// the command line do not have overlapping symbols. That is,
+// unnamed1.so/FuncInt and unnamed2.so/FuncInt should be distinct functions.
+func testUnnamed() {
+       p, err := plugin.Open("unnamed1.so")
+       if err != nil {
+               log.Fatalf(`plugin.Open("unnamed1.so"): %v`, err)
+       }
+       fn, err := p.Lookup("FuncInt")
+       if err != nil {
+               log.Fatalf(`unnamed1.so: Lookup("FuncInt") failed: %v`, err)
+       }
+       if got, want := fn.(func() int)(), 1; got != want {
+               log.Fatalf("unnamed1.so: FuncInt()=%d, want %d", got, want)
+       }
+
+       p, err = plugin.Open("unnamed2.so")
+       if err != nil {
+               log.Fatalf(`plugin.Open("unnamed2.so"): %v`, err)
+       }
+       fn, err = p.Lookup("FuncInt")
+       if err != nil {
+               log.Fatalf(`unnamed2.so: Lookup("FuncInt") failed: %v`, err)
+       }
+       if got, want := fn.(func() int)(), 2; got != want {
+               log.Fatalf("unnamed2.so: FuncInt()=%d, want %d", got, want)
+       }
+}
+
 func main() {
        if got, want := common.X, 3*5; got != want {
                log.Fatalf("before plugin load common.X=%d, want %d", got, want)
@@ -113,5 +142,7 @@ func main() {
                log.Fatalf(`plugin.Open("plugin-mismatch.so"): error does not mention "different version": %v`, s)
        }
 
+       testUnnamed()
+
        fmt.Println("PASS")
 }

diff --git a/misc/cgo/testplugin/test.bash b/misc/cgo/testplugin/test.bash
index bba46b51c66bbb47f901243442c5414b4f94061b..fee99a758c0c0aea6cd81efe760b9349631e993b 100755 (executable)
--- a/misc/cgo/testplugin/test.bash
+++ b/misc/cgo/testplugin/test.bash
@@ -15,7 +15,8 @@ goos=$(go env GOOS)
 goarch=$(go env GOARCH)
 
 function cleanup() {
-       rm -rf plugin1.so host pkg sub
+       rm -f plugin*.so unnamed*.so
+       rm -rf host pkg sub
 }
 trap cleanup EXIT
 
@@ -26,6 +27,8 @@ GOPATH=$(pwd) go build -buildmode=plugin plugin1
 GOPATH=$(pwd) go build -buildmode=plugin plugin2
 GOPATH=$(pwd)/altpath go build -buildmode=plugin plugin-mismatch
 GOPATH=$(pwd) go build -buildmode=plugin -o=sub/plugin1.so sub/plugin1
+GOPATH=$(pwd) go build -buildmode=plugin unnamed1.go
+GOPATH=$(pwd) go build -buildmode=plugin unnamed2.go
 GOPATH=$(pwd) go build host
 
 LD_LIBRARY_PATH=$(pwd) ./host

diff --git a/misc/cgo/testplugin/unnamed1.go b/misc/cgo/testplugin/unnamed1.go
new file mode 100644 (file)
index 0000000..102edaf
--- /dev/null
+++ b/misc/cgo/testplugin/unnamed1.go
@@ -0,0 +1,12 @@
+// Copyright 2016 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.
+
+package main
+
+// // No C code required.
+import "C"
+
+func FuncInt() int { return 1 }
+
+func main() {}

diff --git a/misc/cgo/testplugin/unnamed2.go b/misc/cgo/testplugin/unnamed2.go
new file mode 100644 (file)
index 0000000..55070d5
--- /dev/null
+++ b/misc/cgo/testplugin/unnamed2.go
@@ -0,0 +1,12 @@
+// Copyright 2016 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.
+
+package main
+
+// // No C code required.
+import "C"
+
+func FuncInt() int { return 2 }
+
+func main() {}

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index 2863d20d9c8e0d0afcfc332350e2873a95327653..684d033d3a3e9e08b141556ab2ffb670ee9ca843 100644 (file)
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -2580,7 +2580,11 @@ func (gcToolchain) ld(b *builder, root *action, out string, allactions []*action
                ldflags = append(ldflags, "-w")
        }
        if buildBuildmode == "plugin" {
-               ldflags = append(ldflags, "-pluginpath", root.p.ImportPath)
+               pluginpath := root.p.ImportPath
+               if pluginpath == "command-line-arguments" {
+                       pluginpath = "plugin/unnamed-" + root.p.buildID
+               }
+               ldflags = append(ldflags, "-pluginpath", pluginpath)
        }
 
        // If the user has not specified the -extld option, then specify the