diff options
| author | Ian Lance Taylor <iant@golang.org> | 2010-08-30 13:47:40 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2010-08-30 13:47:40 -0700 |
| commit | 7a2daa7d3a1871385d5d09b80578bda7bf857037 (patch) | |
| tree | 0652cc751ee6d765964c050da1d0c5f79b3f0aa4 | |
| parent | b433552ebc20ed8669dac61c7a46f438c1bf3627 (diff) | |
| download | go-7a2daa7d3a1871385d5d09b80578bda7bf857037.tar.gz go-7a2daa7d3a1871385d5d09b80578bda7bf857037.zip | |
proc, eval: Don't assign address of an array to a slice.
R=rsc
CC=golang-dev
https://golang.org/cl/2084041
| -rw-r--r-- | src/pkg/debug/proc/regs_linux_amd64.go | 2 | ||||
| -rw-r--r-- | src/pkg/exp/eval/eval_test.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pkg/debug/proc/regs_linux_amd64.go b/src/pkg/debug/proc/regs_linux_amd64.go index a9f3569d3a..381be29b17 100644 --- a/src/pkg/debug/proc/regs_linux_amd64.go +++ b/src/pkg/debug/proc/regs_linux_amd64.go @@ -71,7 +71,7 @@ func (r *amd64Regs) SetSP(val Word) os.Error { return r.setter(&r.PtraceRegs) } -func (r *amd64Regs) Names() []string { return &names } +func (r *amd64Regs) Names() []string { return names[0:] } func (r *amd64Regs) Get(i int) Word { switch i { diff --git a/src/pkg/exp/eval/eval_test.go b/src/pkg/exp/eval/eval_test.go index cd4bbbbb0a..fcdbeb85c0 100644 --- a/src/pkg/exp/eval/eval_test.go +++ b/src/pkg/exp/eval/eval_test.go @@ -205,7 +205,7 @@ func toValue(val interface{}) Value { type testFunc struct{} -func (*testFunc) NewFrame() *Frame { return &Frame{nil, &[2]Value{}} } +func (*testFunc) NewFrame() *Frame { return &Frame{nil, make([]Value, 2)} } func (*testFunc) Call(t *Thread) { n := t.f.Vars[0].(IntValue).Get(t) @@ -217,7 +217,7 @@ func (*testFunc) Call(t *Thread) { type oneTwoFunc struct{} -func (*oneTwoFunc) NewFrame() *Frame { return &Frame{nil, &[2]Value{}} } +func (*oneTwoFunc) NewFrame() *Frame { return &Frame{nil, make([]Value, 2)} } func (*oneTwoFunc) Call(t *Thread) { t.f.Vars[0].(IntValue).Set(t, 1) |