[dev.fuzz] all: merge master (b0fa2f5) into dev.fuzz
Merge List:
+ 2021-09-20 b0fa2f5b09 cmd/compile: fix ExampleInfo output
Change-Id: Iccc726a8925082688faa94d07b829a5705f58dda
diff --git a/src/cmd/compile/internal/types2/example_test.go b/src/cmd/compile/internal/types2/example_test.go
index 714bf77..4edaad5 100644
--- a/src/cmd/compile/internal/types2/example_test.go
+++ b/src/cmd/compile/internal/types2/example_test.go
@@ -216,36 +216,36 @@
// var x int:
// defined at fib.go:8:10
// used at 10:10, 12:13, 12:24, 9:5
-
- // TODO(gri) Enable once positions are updated/verified
- // Types and Values of each expression:
- // 4: 8 | string | type : string
- // 6:15 | len | builtin : func(string) int
- // 6:15 | len(b) | value : int
- // 6:19 | b | var : fib.S
- // 6:23 | S | type : fib.S
- // 6:23 | S(c) | value : fib.S
- // 6:25 | c | var : string
- // 6:29 | "hello" | value : string = "hello"
- // 8:12 | int | type : int
- // 8:17 | int | type : int
- // 9: 5 | x | var : int
- // 9: 5 | x < 2 | value : untyped bool
- // 9: 9 | 2 | value : int = 2
- // 10:10 | x | var : int
- // 12: 9 | fib | value : func(x int) int
- // 12: 9 | fib(x - 1) | value : int
- // 12: 9 | fib(x - 1) - fib(x - 2) | value : int
- // 12:13 | x | var : int
- // 12:13 | x - 1 | value : int
- // 12:15 | 1 | value : int = 1
- // 12:20 | fib | value : func(x int) int
- // 12:20 | fib(x - 2) | value : int
- // 12:24 | x | var : int
- // 12:24 | x - 2 | value : int
- // 12:26 | 2 | value : int = 2
}
+// TODO(gri) Enable once positions are updated/verified
+// Types and Values of each expression:
+// 4: 8 | string | type : string
+// 6:15 | len | builtin : func(string) int
+// 6:15 | len(b) | value : int
+// 6:19 | b | var : fib.S
+// 6:23 | S | type : fib.S
+// 6:23 | S(c) | value : fib.S
+// 6:25 | c | var : string
+// 6:29 | "hello" | value : string = "hello"
+// 8:12 | int | type : int
+// 8:17 | int | type : int
+// 9: 5 | x | var : int
+// 9: 5 | x < 2 | value : untyped bool
+// 9: 9 | 2 | value : int = 2
+// 10:10 | x | var : int
+// 12: 9 | fib | value : func(x int) int
+// 12: 9 | fib(x - 1) | value : int
+// 12: 9 | fib(x - 1) - fib(x - 2) | value : int
+// 12:13 | x | var : int
+// 12:13 | x - 1 | value : int
+// 12:15 | 1 | value : int = 1
+// 12:20 | fib | value : func(x int) int
+// 12:20 | fib(x - 2) | value : int
+// 12:24 | x | var : int
+// 12:24 | x - 2 | value : int
+// 12:26 | 2 | value : int = 2
+
func mode(tv types2.TypeAndValue) string {
switch {
case tv.IsVoid():
