[pull] master from golang:master

lib/time/update.bash

@@ -24,8 +24,8 @@
 # in the CL match the update.bash in the CL.
 
 # Versions to use.
-CODE=2026b
-DATA=2026b
+CODE=2026c
+DATA=2026c
 
 set -e
 

src/cmd/go/testdata/script/build_overlay.txt

@@ -33,28 +33,10 @@ exec ./print_trimpath_two_files$GOEXE
 stdout $WORK[/\\]gopath[/\\]src[/\\]m[/\\]printpath[/\\]main.go
 stdout $WORK[/\\]gopath[/\\]src[/\\]m[/\\]printpath[/\\]other.go
 
-[cgo] go build -overlay overlay.json -o main_cgo_replace$GOEXE ./cgo_hello_replace
-[cgo] exec ./main_cgo_replace$GOEXE
-[cgo] stdout '^hello cgo\r?\n'
-
-[cgo] go build -overlay overlay.json -o main_cgo_quote$GOEXE ./cgo_hello_quote
-[cgo] exec ./main_cgo_quote$GOEXE
-[cgo] stdout '^hello cgo\r?\n'
-
-[cgo] go build -overlay overlay.json -o main_cgo_angle$GOEXE ./cgo_hello_angle
-[cgo] exec ./main_cgo_angle$GOEXE
-[cgo] stdout '^hello cgo\r?\n'
-
 go build -overlay overlay.json -o main_call_asm$GOEXE ./call_asm
 exec ./main_call_asm$GOEXE
 ! stdout .
 
-[cgo] go list -compiled -overlay overlay.json -f '{{range .CompiledGoFiles}}{{. | printf "%s\n"}}{{end}}' ./cgo_hello_replace
-[cgo] cp stdout compiled_cgo_sources.txt
-[cgo] go run ../print_line_comments.go compiled_cgo_sources.txt
-[cgo] stdout $GOPATH[/\\]src[/\\]m[/\\]cgo_hello_replace[/\\]cgo_hello_replace.go
-[cgo] ! stdout $GOPATH[/\\]src[/\\]m[/\\]overlay[/\\]hello.c
-
 # Change the contents of a file in the overlay and ensure that makes the target stale
 env OLD_GOCACHE=$GOCACHE
 env GOCACHE=$WORK/cache  # use a fresh cache so that multiple runs of the test don't interfere
@@ -67,42 +49,6 @@ go build -x -overlay overlay.json ./test_cache
 stderr '(compile|gccgo)( |\.exe).*test_cache.go'  # not cached
 env CACHE=$OLD_GOCACHE
 
-# Run same tests but with gccgo.
-env GO111MODULE=off
-[!exec:gccgo] stop
-[cross] stop  # gccgo can't necessarily cross-compile
-
-! go build -compiler=gccgo .
-go build -compiler=gccgo -overlay overlay.json -o main_gccgo$GOEXE .
-exec ./main_gccgo$goexe
-stdout '^hello$'
-
-go build -compiler=gccgo -overlay overlay.json -o print_abspath_gccgo$GOEXE ./printpath
-exec ./print_abspath_gccgo$GOEXE
-stdout $WORK[/\\]gopath[/\\]src[/\\]m[/\\]printpath[/\\]main.go
-
-go build -compiler=gccgo -overlay overlay.json -o print_trimpath_gccgo$GOEXE -trimpath ./printpath
-exec ./print_trimpath_gccgo$GOEXE
-stdout ^\.[/\\]printpath[/\\]main.go
-
-
-go build -compiler=gccgo  -overlay overlay.json -o main_cgo_replace_gccgo$GOEXE ./cgo_hello_replace
-exec ./main_cgo_replace_gccgo$GOEXE
-stdout '^hello cgo\r?\n'
-
-go build -compiler=gccgo  -overlay overlay.json -o main_cgo_quote_gccgo$GOEXE ./cgo_hello_quote
-exec ./main_cgo_quote_gccgo$GOEXE
-stdout '^hello cgo\r?\n'
-
-go build -compiler=gccgo  -overlay overlay.json -o main_cgo_angle_gccgo$GOEXE ./cgo_hello_angle
-exec ./main_cgo_angle_gccgo$GOEXE
-stdout '^hello cgo\r?\n'
-
-go build -compiler=gccgo -overlay overlay.json -o main_call_asm_gccgo$GOEXE ./call_asm
-exec ./main_call_asm_gccgo$GOEXE
-! stdout .
-
-
 -- m/go.mod --
 // TODO(matloob): how do overlays work with go.mod (especially if mod=readonly)
 module m
@@ -131,33 +77,9 @@ the actual code is in the overlay
 		"printpath/other.go": "overlay2/printpath2.go",
 		"call_asm/asm_gc.s": "overlay/asm_gc.s",
 		"call_asm/asm_gccgo.s": "overlay/asm_gccgo.s",
-		"test_cache/main.go": "overlay/test_cache.go",
-		"cgo_hello_replace/cgo_header.h": "overlay/cgo_head.h",
-		"cgo_hello_replace/hello.c": "overlay/hello.c",
-		"cgo_hello_quote/cgo_hello.go": "overlay/cgo_hello_quote.go",
-		"cgo_hello_quote/cgo_header.h": "overlay/cgo_head.h",
-		"cgo_hello_angle/cgo_hello.go": "overlay/cgo_hello_angle.go",
-		"cgo_hello_angle/cgo_header.h": "overlay/cgo_head.h"
+		"test_cache/main.go": "overlay/test_cache.go"
 	}
 }
--- m/cgo_hello_replace/cgo_hello_replace.go --
-package main
-
-// #include "cgo_header.h"
-import "C"
-
-func main() {
-	C.say_hello()
-}
--- m/cgo_hello_replace/cgo_header.h --
- // Test that this header is replaced with one that has the proper declaration.
-void say_goodbye();
-
--- m/cgo_hello_replace/hello.c --
-#include <stdio.h>
-
-void say_goodbye() { puts("goodbye cgo\n"); fflush(stdout); }
-
 -- m/overlay/f.go --
 package main
 
@@ -220,30 +142,6 @@ import "m/dir"
 func printMessage() {
 	dir.PrintMessage()
 }
--- m/overlay/cgo_hello_quote.go --
-package main
-
-// #include "cgo_header.h"
-import "C"
-
-func main() {
-	C.say_hello()
-}
--- m/overlay/cgo_hello_angle.go --
-package main
-
-// #include <cgo_header.h>
-import "C"
-
-func main() {
-	C.say_hello()
-}
--- m/overlay/cgo_head.h --
-void say_hello();
--- m/overlay/hello.c --
-#include <stdio.h>
-
-void say_hello() { puts("hello cgo\n"); fflush(stdout); }
 -- m/overlay/asm_gc.s --
 // +build gc
 
@@ -274,42 +172,3 @@ import "fmt"
 func bar() {
 	fmt.Println("different")
 }
--- m/cgo_hello_quote/hello.c --
-#include <stdio.h>
-
-void say_hello() { puts("hello cgo\n"); fflush(stdout); }
--- m/cgo_hello_angle/hello.c --
-#include <stdio.h>
-
-void say_hello() { puts("hello cgo\n"); fflush(stdout); }
-
--- print_line_comments.go --
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"strings"
-)
-
-func main() {
-	compiledGoFilesArg := os.Args[1]
-	b, err := ioutil.ReadFile(compiledGoFilesArg)
-	if err != nil {
-		log.Fatal(err)
-	}
-	compiledGoFiles := strings.Split(strings.TrimSpace(string(b)), "\n")
-	for _, f := range compiledGoFiles {
-		b, err := ioutil.ReadFile(f)
-		if err != nil {
-			log.Fatal(err)
-		}
-		for _, line := range strings.Split(string(b), "\n") {
-			if strings.HasPrefix(line, "#line") || strings.HasPrefix(line, "//line") {
-				fmt.Println(line)
-			}
-		}
-	}
-}

src/cmd/go/testdata/script/build_overlay_cgo.txt

@@ -0,0 +1,128 @@
+[short] skip
+[!cgo] skip
+
+# Test building cgo packages in overlays.
+
+cd m
+
+go build -overlay overlay.json -o main_cgo_replace$GOEXE ./cgo_hello_replace
+exec ./main_cgo_replace$GOEXE
+stdout '^hello cgo\r?\n'
+
+go build -overlay overlay.json -o main_cgo_quote$GOEXE ./cgo_hello_quote
+exec ./main_cgo_quote$GOEXE
+stdout '^hello cgo\r?\n'
+
+go build -overlay overlay.json -o main_cgo_angle$GOEXE ./cgo_hello_angle
+exec ./main_cgo_angle$GOEXE
+stdout '^hello cgo\r?\n'
+
+go list -compiled -overlay overlay.json -f '{{range .CompiledGoFiles}}{{. | printf "%s\n"}}{{end}}' ./cgo_hello_replace
+cp stdout compiled_cgo_sources.txt
+go run ../print_line_comments.go compiled_cgo_sources.txt
+stdout $GOPATH[/\\]src[/\\]m[/\\]cgo_hello_replace[/\\]cgo_hello_replace.go
+! stdout $GOPATH[/\\]src[/\\]m[/\\]overlay[/\\]hello.c
+
+-- m/go.mod --
+// TODO(matloob): how do overlays work with go.mod (especially if mod=readonly)
+module m
+
+go 1.16
+
+-- m/overlay.json --
+{
+	"Replace": {
+		"printpath/main.go": "overlay/printpath.go",
+		"printpath/other.go": "overlay2/printpath2.go",
+		"call_asm/asm_gc.s": "overlay/asm_gc.s",
+		"call_asm/asm_gccgo.s": "overlay/asm_gccgo.s",
+		"test_cache/main.go": "overlay/test_cache.go",
+		"cgo_hello_replace/cgo_header.h": "overlay/cgo_head.h",
+		"cgo_hello_replace/hello.c": "overlay/hello.c",
+		"cgo_hello_quote/cgo_hello.go": "overlay/cgo_hello_quote.go",
+		"cgo_hello_quote/cgo_header.h": "overlay/cgo_head.h",
+		"cgo_hello_angle/cgo_hello.go": "overlay/cgo_hello_angle.go",
+		"cgo_hello_angle/cgo_header.h": "overlay/cgo_head.h"
+	}
+}
+-- m/cgo_hello_replace/cgo_hello_replace.go --
+package main
+
+// #include "cgo_header.h"
+import "C"
+
+func main() {
+	C.say_hello()
+}
+-- m/cgo_hello_replace/cgo_header.h --
+ // Test that this header is replaced with one that has the proper declaration.
+void say_goodbye();
+
+-- m/cgo_hello_replace/hello.c --
+#include <stdio.h>
+
+void say_goodbye() { puts("goodbye cgo\n"); fflush(stdout); }
+
+-- m/overlay/cgo_hello_quote.go --
+package main
+
+// #include "cgo_header.h"
+import "C"
+
+func main() {
+	C.say_hello()
+}
+-- m/overlay/cgo_hello_angle.go --
+package main
+
+// #include <cgo_header.h>
+import "C"
+
+func main() {
+	C.say_hello()
+}
+-- m/overlay/cgo_head.h --
+void say_hello();
+-- m/overlay/hello.c --
+#include <stdio.h>
+
+void say_hello() { puts("hello cgo\n"); fflush(stdout); }
+-- m/cgo_hello_quote/hello.c --
+#include <stdio.h>
+
+void say_hello() { puts("hello cgo\n"); fflush(stdout); }
+-- m/cgo_hello_angle/hello.c --
+#include <stdio.h>
+
+void say_hello() { puts("hello cgo\n"); fflush(stdout); }
+
+-- print_line_comments.go --
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"strings"
+)
+
+func main() {
+	compiledGoFilesArg := os.Args[1]
+	b, err := ioutil.ReadFile(compiledGoFilesArg)
+	if err != nil {
+		log.Fatal(err)
+	}
+	compiledGoFiles := strings.Split(strings.TrimSpace(string(b)), "\n")
+	for _, f := range compiledGoFiles {
+		b, err := ioutil.ReadFile(f)
+		if err != nil {
+			log.Fatal(err)
+		}
+		for _, line := range strings.Split(string(b), "\n") {
+			if strings.HasPrefix(line, "#line") || strings.HasPrefix(line, "//line") {
+				fmt.Println(line)
+			}
+		}
+	}
+}