From: Ian Lance Taylor <iant@golang.org>
Date: Wed, 8 Aug 2018 23:54:15 +0000 (-0700)
Subject: cmd/go: include experiments in compiler tool ID
X-Git-Tag: go1.11rc1~21
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0cac563132d2bf38423f3e39860469dc70790aee;p=gostls13.git

cmd/go: include experiments in compiler tool ID

No test because testing this would require building a new toolchain
with a different experiment.

Fixes #26883

Change-Id: Iadd513d0920ef12463006dd2a61e94370dd13f68
Reviewed-on: https://go-review.googlesource.com/128735
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/cmd/go/internal/work/buildid.go b/src/cmd/go/internal/work/buildid.go
index 9a2528b914..fbc05af19b 100644
--- a/src/cmd/go/internal/work/buildid.go
+++ b/src/cmd/go/internal/work/buildid.go
@@ -18,6 +18,7 @@ import (
 	"cmd/go/internal/load"
 	"cmd/go/internal/str"
 	"cmd/internal/buildid"
+	"cmd/internal/objabi"
 )
 
 // Build IDs
@@ -206,6 +207,11 @@ func (b *Builder) toolID(name string) string {
 		id = f[2]
 	}
 
+	// For the compiler, add any experiments.
+	if name == "compile" {
+		id += " " + objabi.Expstring()
+	}
+
 	b.id.Lock()
 	b.toolIDCache[name] = id
 	b.id.Unlock()