diff options
author | Russ Cox <rsc@golang.org> | 2014-10-29 12:25:24 -0400 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2014-10-29 12:25:24 -0400 |
commit | 710efc5a3085f55968c120abb25206fb72c05d46 (patch) | |
tree | 433262b4bdac6643d923971ea21bb39cb69822a7 /src/reflect | |
parent | 40520a21d8b050635a417666db959f75d757fff5 (diff) | |
parent | cc517ca5f7183e7f5d91bf75897b23cc0f4ed04f (diff) | |
download | go-710efc5a3085f55968c120abb25206fb72c05d46.tar.gz |
[dev.garbage] all: merge dev.power64 (5ad5e85cfb99) into dev.garbage
The goal here is to get the big-endian fixes so that
in some upcoming code movement for write barriers
I don't make them unmergeable.
LGTM=rlh
R=rlh
CC=golang-codereviews
https://codereview.appspot.com/166890043
Diffstat (limited to 'src/reflect')
-rw-r--r-- | src/reflect/all_test.go | 5 | ||||
-rw-r--r-- | src/reflect/asm_power64x.s | 29 |
2 files changed, 34 insertions, 0 deletions
diff --git a/src/reflect/all_test.go b/src/reflect/all_test.go index 268a9e319..c62f227f4 100644 --- a/src/reflect/all_test.go +++ b/src/reflect/all_test.go @@ -1052,6 +1052,11 @@ func TestChan(t *testing.T) { ok = cv.TrySend(ValueOf(6)) if !ok { t.Errorf("TrySend on empty chan failed") + select { + case x := <-c: + t.Errorf("TrySend failed but it did send %d", x) + default: + } } else { if i = <-c; i != 6 { t.Errorf("TrySend 6, recv %d", i) diff --git a/src/reflect/asm_power64x.s b/src/reflect/asm_power64x.s new file mode 100644 index 000000000..e430cdf04 --- /dev/null +++ b/src/reflect/asm_power64x.s @@ -0,0 +1,29 @@ +// Copyright 2012 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. + +// +build power64 power64le + +#include "textflag.h" + +// makeFuncStub is the code half of the function returned by MakeFunc. +// See the comment on the declaration of makeFuncStub in makefunc.go +// for more details. +// No argsize here, gc generates argsize info at call site. +TEXT ·makeFuncStub(SB),(NOSPLIT|WRAPPER),$16 + MOVD R11, 8(R1) + MOVD $argframe+0(FP), R3 + MOVD R3, 16(R1) + BL ·callReflect(SB) + RETURN + +// methodValueCall is the code half of the function returned by makeMethodValue. +// See the comment on the declaration of methodValueCall in makefunc.go +// for more details. +// No argsize here, gc generates argsize info at call site. +TEXT ·methodValueCall(SB),(NOSPLIT|WRAPPER),$16 + MOVD R11, 8(R1) + MOVD $argframe+0(FP), R3 + MOVD R3, 16(R1) + BL ·callMethod(SB) + RETURN |