diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-14 12:10:52 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-14 12:10:52 -0500 |
| commit | 6b31cfd20257f4d7226d5c4e95c67ed9b48ab58c (patch) | |
| tree | fd7941be82dd45f113d8f0668e2c9b6a6ec3c77f /src/reflect | |
| parent | 9cabb766eb4acbe2c11ad0084659710919f40c0d (diff) | |
| parent | 0fdd42d52b29f44cf6cffa4c881ee8b40f9b3090 (diff) | |
| download | go-6b31cfd20257f4d7226d5c4e95c67ed9b48ab58c.tar.gz | |
[dev.cc] all: merge dev.power64 (7667e41f3ced) into dev.cc
This is to reduce the delta between dev.cc and dev.garbage to just garbage collector changes.
These are the files that had merge conflicts and have been edited by hand:
malloc.go
mem_linux.go
mgc.go
os1_linux.go
proc1.go
panic1.go
runtime1.go
LGTM=austin
R=austin
CC=golang-codereviews
https://codereview.appspot.com/174180043
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/type.go | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/reflect/type.go b/src/reflect/type.go index 572e611fa..e05a3f9d1 100644 --- a/src/reflect/type.go +++ b/src/reflect/type.go @@ -1533,12 +1533,8 @@ func (gc *gcProg) appendProg(t *rtype) { gc.appendProg(e) } case Interface: - gc.appendWord(bitsMultiWord) - if t.NumMethod() == 0 { - gc.appendWord(bitsEface) - } else { - gc.appendWord(bitsIface) - } + gc.appendWord(bitsPointer) + gc.appendWord(bitsPointer) case Struct: c := t.NumField() for i := 0; i < c; i++ { @@ -1592,9 +1588,8 @@ func (gc *gcProg) align(a uintptr) { // These constants must stay in sync with ../runtime/mgc0.h. const ( - bitsScalar = 1 - bitsPointer = 2 - bitsMultiWord = 3 + bitsScalar = 1 + bitsPointer = 2 bitsIface = 2 bitsEface = 3 |