diff options
| author | Russ Cox <rsc@golang.org> | 2014-10-16 15:00:08 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-10-16 15:00:08 -0400 |
| commit | 78db2eb9c66d478bee0d56edcc55d4f865f8c6c7 (patch) | |
| tree | d08da7ddd82570422ae87dc9d3ac061f8ce3b648 /src/reflect/makefunc.go | |
| parent | af64ab79c0ad72decf083d78cf54257d009741b5 (diff) | |
| parent | 25c63c2c30f4807b073f849d248144d97893ce70 (diff) | |
| download | go-78db2eb9c66d478bee0d56edcc55d4f865f8c6c7.tar.gz | |
all: merge default branch into dev.garbage
hg was unable to create a CL on the code review server for this,
so I am submitting the merge by hand.
The only manual edits are in mgc0.c, to reapply the
removal of cached/ncached to the new code.
Diffstat (limited to 'src/reflect/makefunc.go')
| -rw-r--r-- | src/reflect/makefunc.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/reflect/makefunc.go b/src/reflect/makefunc.go index bdb8c21d7..1072c7fab 100644 --- a/src/reflect/makefunc.go +++ b/src/reflect/makefunc.go @@ -60,7 +60,7 @@ func MakeFunc(typ Type, fn func(args []Value) (results []Value)) Value { impl := &makeFuncImpl{code: code, stack: stack, typ: ftyp, fn: fn} - return Value{t, unsafe.Pointer(impl), 0, flag(Func) << flagKindShift} + return Value{t, unsafe.Pointer(impl), flag(Func) << flagKindShift} } // makeFuncStub is an assembly function that is the code half of @@ -92,7 +92,7 @@ func makeMethodValue(op string, v Value) Value { // Ignoring the flagMethod bit, v describes the receiver, not the method type. fl := v.flag & (flagRO | flagAddr | flagIndir) fl |= flag(v.typ.Kind()) << flagKindShift - rcvr := Value{v.typ, v.ptr, v.scalar, fl} + rcvr := Value{v.typ, v.ptr, fl} // v.Type returns the actual type of the method value. funcType := v.Type().(*rtype) @@ -118,7 +118,7 @@ func makeMethodValue(op string, v Value) Value { // but we want Interface() and other operations to fail early. methodReceiver(op, fv.rcvr, fv.method) - return Value{funcType, unsafe.Pointer(fv), 0, v.flag&flagRO | flag(Func)<<flagKindShift} + return Value{funcType, unsafe.Pointer(fv), v.flag&flagRO | flag(Func)<<flagKindShift} } // methodValueCall is an assembly function that is the code half of |