diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2020-09-14 12:53:36 -0700 |
|---|---|---|
| committer | Matthew Dempsky <mdempsky@google.com> | 2020-09-14 23:42:35 +0000 |
| commit | 237410547bb81ae3c58e9c5bf0cf59edc989e243 (patch) | |
| tree | e05ecd25ac116c5fcd8ba7a495865c0bbf5f2dce /src/cmd/compile/internal/gc/main.go | |
| parent | 506eb0a9b1a7051f64788f330ea26722fa293f3c (diff) | |
| download | go-237410547bb81ae3c58e9c5bf0cf59edc989e243.tar.gz go-237410547bb81ae3c58e9c5bf0cf59edc989e243.zip | |
cmd/compile: better dclcontext handling in func{hdr,body}
funchdr and funcbody currently assume that either (1) Curfn == nil &&
dclcontext == PEXTERN, or (2) Curfn != nil && dclcontext == PAUTO.
This is a reasonable assumption during parsing. However, these
functions end up getting used in other contexts, and not all callers
are so disciplined about Curfn/dclcontext handling.
This CL changes them to save/restore arbitrary Curfn/dclcontext pairs
instead. This is necessary for the followup CL, which pushes fninit
earlier. Otherwise, Curfn/dclcontext fall out of sync, and funchdr
panics.
Passes toolstash-check.
Updates #33485.
Change-Id: I19b1be23db1bad6475345ae5c81bbdc66291a3a7
Reviewed-on: https://go-review.googlesource.com/c/go/+/254838
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Trust: Matthew Dempsky <mdempsky@google.com>
Diffstat (limited to 'src/cmd/compile/internal/gc/main.go')
| -rw-r--r-- | src/cmd/compile/internal/gc/main.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go index eedfc4bb25..9bce6cf8cb 100644 --- a/src/cmd/compile/internal/gc/main.go +++ b/src/cmd/compile/internal/gc/main.go @@ -809,6 +809,9 @@ func Main(archInit func(*Arch)) { } } + if len(funcStack) != 0 { + Fatalf("funcStack is non-empty: %v", len(funcStack)) + } if len(compilequeue) != 0 { Fatalf("%d uncompiled functions", len(compilequeue)) } |