From: Rob Findley <rfindley@google.com>
Date: Tue, 3 Nov 2020 17:31:40 +0000 (-0500)
Subject: [dev.typeparams] merge master into dev.typeparams
X-Git-Tag: go1.17beta1~1473^2~197
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=165ceb09f95fdcf76ebf894908b9a170d7b7524b;p=gostls13.git

[dev.typeparams] merge master into dev.typeparams

Change-Id: I0e56b7b659ac84e14121325c560a242554196808
---

165ceb09f95fdcf76ebf894908b9a170d7b7524b
diff --cc src/cmd/compile/internal/gc/noder.go
index 9685794ec4,67d24ef0bc..14bacc14a8
--- a/src/cmd/compile/internal/gc/noder.go
+++ b/src/cmd/compile/internal/gc/noder.go
@@@ -12,12 -11,11 +12,13 @@@ import 
  	"runtime"
  	"strconv"
  	"strings"
+ 	"unicode"
  	"unicode/utf8"
  
 +	"cmd/compile/internal/importer"
  	"cmd/compile/internal/syntax"
  	"cmd/compile/internal/types"
 +	"cmd/compile/internal/types2"
  	"cmd/internal/obj"
  	"cmd/internal/objabi"
  	"cmd/internal/src"