Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile/internal: decouple scope tracking from location lists

Browse source 
We're trying to enable location lists by default, and it's easier to do
that if we don't have to worry about scope tracking at the same time.
We can evaluate their performance impact separately.

However, that does mean that "err" is ambiguous in the test case, so
rename it to err2 for now.

Change-Id: I24f119016185c52b7d9affc74207f6a5b450fb6f
Reviewed-on: https://go-review.googlesource.com/89355
Run-TryBot: Heschi Kreinick <heschi@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Chase <drchase@google.com>
This commit is contained in:
Heschi Kreinick 2018-01-23 14:10:08 -05:00
parent 07751f4b58
commit 7d7af6106f
4 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/compile/internal/gc/main.go
View file

@ -405,7 +405,7 @@ func Main(archInit func(*Arch)) {
Debug['l'] = 1 - Debug['l'] Debug['l'] = 1 - Debug['l']
} }
trackScopes = flagDWARF && ((Debug['l'] == 0 && Debug['N'] != 0) || Ctxt.Flag_locationlists) trackScopes = flagDWARF && (Debug['l'] == 0 && Debug['N'] != 0)
Widthptr = thearch.LinkArch.PtrSize Widthptr = thearch.LinkArch.PtrSize
Widthreg = thearch.LinkArch.RegSize Widthreg = thearch.LinkArch.RegSize

36
src/cmd/compile/internal/ssa/testdata/hist.gdb-dbg.nexts vendored
View file

@ -14,64 +14,64 @@ hist = []int = {0, 0, 0, 0, 0, 0, 0}
73: scanner := bufio.NewScanner(reader) 73: scanner := bufio.NewScanner(reader)
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
i = 1 i = 1
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
82: hist[int(i)]++ 82: hist[int(i)]++
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
i = 1 i = 1
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
82: hist[int(i)]++ 82: hist[int(i)]++
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
i = 1 i = 1
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
82: hist[int(i)]++ 82: hist[int(i)]++
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
i = 2 i = 2
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
82: hist[int(i)]++ 82: hist[int(i)]++
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
i = 2 i = 2
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
82: hist[int(i)]++ 82: hist[int(i)]++
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
i = 2 i = 2
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
82: hist[int(i)]++ 82: hist[int(i)]++
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
i = 4 i = 4
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
82: hist[int(i)]++ 82: hist[int(i)]++
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
i = 4 i = 4
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
82: hist[int(i)]++ 82: hist[int(i)]++
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
i = 5 i = 5
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
82: hist[int(i)]++ 82: hist[int(i)]++

54
src/cmd/compile/internal/ssa/testdata/hist.gdb-opt.nexts vendored
View file

@ -22,9 +22,9 @@ dy = <Optimized out, as expected>
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
scanner = (struct bufio.Scanner *) <A> scanner = (struct bufio.Scanner *) <A>
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
err = {tab = 0x0, data = 0x0} err2 = {tab = 0x0, data = 0x0}
hist = []int = {0, 0, 0, 0, 0, 0, 0} hist = []int = {0, 0, 0, 0, 0, 0, 0}
i = 1 i = 1
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
@ -32,9 +32,9 @@ i = 1
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
scanner = (struct bufio.Scanner *) <A> scanner = (struct bufio.Scanner *) <A>
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
err = {tab = 0x0, data = 0x0} err2 = {tab = 0x0, data = 0x0}
hist = []int = {0, 1, 0, 0, 0, 0, 0} hist = []int = {0, 1, 0, 0, 0, 0, 0}
i = 1 i = 1
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
@ -42,9 +42,9 @@ i = 1
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
scanner = (struct bufio.Scanner *) <A> scanner = (struct bufio.Scanner *) <A>
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
err = {tab = 0x0, data = 0x0} err2 = {tab = 0x0, data = 0x0}
hist = []int = {0, 2, 0, 0, 0, 0, 0} hist = []int = {0, 2, 0, 0, 0, 0, 0}
i = 1 i = 1
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
@ -52,9 +52,9 @@ i = 1
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
scanner = (struct bufio.Scanner *) <A> scanner = (struct bufio.Scanner *) <A>
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
err = {tab = 0x0, data = 0x0} err2 = {tab = 0x0, data = 0x0}
hist = []int = {0, 3, 0, 0, 0, 0, 0} hist = []int = {0, 3, 0, 0, 0, 0, 0}
i = 2 i = 2
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
@ -62,9 +62,9 @@ i = 2
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
scanner = (struct bufio.Scanner *) <A> scanner = (struct bufio.Scanner *) <A>
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
err = {tab = 0x0, data = 0x0} err2 = {tab = 0x0, data = 0x0}
hist = []int = {0, 3, 1, 0, 0, 0, 0} hist = []int = {0, 3, 1, 0, 0, 0, 0}
i = 2 i = 2
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
@ -72,9 +72,9 @@ i = 2
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
scanner = (struct bufio.Scanner *) <A> scanner = (struct bufio.Scanner *) <A>
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
err = {tab = 0x0, data = 0x0} err2 = {tab = 0x0, data = 0x0}
hist = []int = {0, 3, 2, 0, 0, 0, 0} hist = []int = {0, 3, 2, 0, 0, 0, 0}
i = 2 i = 2
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
@ -82,9 +82,9 @@ i = 2
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
scanner = (struct bufio.Scanner *) <A> scanner = (struct bufio.Scanner *) <A>
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
err = {tab = 0x0, data = 0x0} err2 = {tab = 0x0, data = 0x0}
hist = []int = {0, 3, 3, 0, 0, 0, 0} hist = []int = {0, 3, 3, 0, 0, 0, 0}
i = 4 i = 4
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
@ -92,9 +92,9 @@ i = 4
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
scanner = (struct bufio.Scanner *) <A> scanner = (struct bufio.Scanner *) <A>
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
err = {tab = 0x0, data = 0x0} err2 = {tab = 0x0, data = 0x0}
hist = []int = {0, 3, 3, 0, 1, 0, 0} hist = []int = {0, 3, 3, 0, 1, 0, 0}
i = 4 i = 4
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)
@ -102,9 +102,9 @@ i = 4
74: for scanner.Scan() { //gdb-opt=(scanner/A) 74: for scanner.Scan() { //gdb-opt=(scanner/A)
scanner = (struct bufio.Scanner *) <A> scanner = (struct bufio.Scanner *) <A>
75: s := scanner.Text() 75: s := scanner.Text()
76: i, err := strconv.ParseInt(s, 10, 64) 76: i, err2 := strconv.ParseInt(s, 10, 64)
77: if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) 77: if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
err = {tab = 0x0, data = 0x0} err2 = {tab = 0x0, data = 0x0}
hist = []int = {0, 3, 3, 0, 2, 0, 0} hist = []int = {0, 3, 3, 0, 2, 0, 0}
i = 5 i = 5
81: hist = ensure(int(i), hist) 81: hist = ensure(int(i), hist)

6
src/cmd/compile/internal/ssa/testdata/hist.go vendored
View file

@ -73,9 +73,9 @@ func test() {
scanner := bufio.NewScanner(reader) scanner := bufio.NewScanner(reader)
for scanner.Scan() { //gdb-opt=(scanner/A) for scanner.Scan() { //gdb-opt=(scanner/A)
s := scanner.Text() s := scanner.Text()
i, err := strconv.ParseInt(s, 10, 64) i, err2 := strconv.ParseInt(s, 10, 64)
if err != nil { //gdb-dbg=(i) //gdb-opt=(err,hist,i) if err2 != nil { //gdb-dbg=(i) //gdb-opt=(err2,hist,i)
fmt.Fprintf(os.Stderr, "There was an error: %v\n", err) fmt.Fprintf(os.Stderr, "There was an error: %v\n", err2)
return return
} }
hist = ensure(int(i), hist) hist = ensure(int(i), hist)