mirror of
https://github.com/golang/go
synced 2024-09-04 23:44:16 +00:00
cmd/gc: resolve static addresses of the form &x.f at link time
When we do y = &x for global variables x and y, y gets initialized at link time. Do the same for y = &x.f if x is a struct and y=&x[5] if x is an array. fixes #9217 fixes #9355 Change-Id: Iea3c0ce2ce1b309e2b760e345608fd95460b5713 Reviewed-on: https://go-review.googlesource.com/1691 Reviewed-by: Minux Ma <minux@golang.org>
This commit is contained in:
parent
340ef004d6
commit
2fc29a83ae
|
@ -374,7 +374,7 @@ staticcopy(Node *l, Node *r, NodeList **out)
|
|||
static int
|
||||
staticassign(Node *l, Node *r, NodeList **out)
|
||||
{
|
||||
Node *a, n1;
|
||||
Node *a, n1, nam;
|
||||
Type *ta;
|
||||
InitPlan *p;
|
||||
InitEntry *e;
|
||||
|
@ -398,13 +398,10 @@ staticassign(Node *l, Node *r, NodeList **out)
|
|||
return 1;
|
||||
|
||||
case OADDR:
|
||||
switch(r->left->op) {
|
||||
default:
|
||||
//dump("not static addr", r);
|
||||
break;
|
||||
|
||||
case ONAME:
|
||||
gdata(l, r, l->type->width);
|
||||
if(stataddr(&nam, r->left)) {
|
||||
n1 = *r;
|
||||
n1.left = &nam;
|
||||
gdata(l, &n1, l->type->width);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
16
test/fixedbugs/issue9355.dir/a.go
Normal file
16
test/fixedbugs/issue9355.dir/a.go
Normal file
|
@ -0,0 +1,16 @@
|
|||
package main
|
||||
|
||||
var x struct {
|
||||
a, b, c int64
|
||||
d struct{ p, q, r int32 }
|
||||
e [8]byte
|
||||
f [4]struct{ p, q, r int32 }
|
||||
}
|
||||
|
||||
var y = &x.b
|
||||
var z = &x.d.q
|
||||
|
||||
var b [10]byte
|
||||
var c = &b[5]
|
||||
|
||||
var w = &x.f[3].r
|
51
test/fixedbugs/issue9355.go
Normal file
51
test/fixedbugs/issue9355.go
Normal file
|
@ -0,0 +1,51 @@
|
|||
// run
|
||||
|
||||
// Copyright 2014 The Go Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go/build"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"runtime"
|
||||
)
|
||||
|
||||
func main() {
|
||||
if runtime.Compiler != "gc" {
|
||||
return
|
||||
}
|
||||
a, err := build.ArchChar(runtime.GOARCH)
|
||||
if err != nil {
|
||||
fmt.Println("BUG:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
out := run("go", "tool", a+"g", "-S", filepath.Join("fixedbugs", "issue9355.dir", "a.go"))
|
||||
patterns := []string{
|
||||
`rel 0\+\d t=1 \"\"\.x\+8\n`, // y = &x.b
|
||||
`rel 0\+\d t=1 \"\"\.x\+28\n`, // z = &x.d.q
|
||||
`rel 0\+\d t=1 \"\"\.b\+5\n`, // c = &b[5]
|
||||
`rel 0\+\d t=1 \"\"\.x\+88\n`, // w = &x.f[3].r
|
||||
}
|
||||
for _, p := range patterns {
|
||||
if ok, err := regexp.Match(p, out); !ok || err != nil {
|
||||
println(string(out))
|
||||
panic("can't find pattern " + p)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func run(cmd string, args ...string) []byte {
|
||||
out, err := exec.Command(cmd, args...).CombinedOutput()
|
||||
if err != nil {
|
||||
fmt.Println(string(out))
|
||||
fmt.Println(err)
|
||||
os.Exit(1)
|
||||
}
|
||||
return out
|
||||
}
|
Loading…
Reference in a new issue