summaryrefslogtreecommitdiff
path: root/libgo
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-19 05:34:08 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-19 05:34:08 +0000
commita398fe99bd7b94863ee97cb03403f6b78eb03b5f (patch)
tree1750e12378b941560d41e98869d3351ba1390dd0 /libgo
parent5d2fca09d543d4b42b99fe20f412efb78cc50ec3 (diff)
downloadgcc-a398fe99bd7b94863ee97cb03403f6b78eb03b5f.tar.gz
reflect: Fix invalid sharing in valueInterface.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193614 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
-rw-r--r--libgo/go/reflect/value.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/libgo/go/reflect/value.go b/libgo/go/reflect/value.go
index 6d3ddd836c2..4e557414d34 100644
--- a/libgo/go/reflect/value.go
+++ b/libgo/go/reflect/value.go
@@ -342,7 +342,7 @@ func (v Value) Call(in []Value) []Value {
}
// CallSlice calls the variadic function v with the input arguments in,
-// assigning the slice in[len(in)-1] to v's final variadic argument.
+// assigning the slice in[len(in)-1] to v's final variadic argument.
// For example, if len(in) == 3, v.Call(in) represents the Go call v(in[0], in[1], in[2]...).
// Call panics if v's Kind is not Func or if v is not variadic.
// It returns the output results as Values.
@@ -905,7 +905,7 @@ func valueInterface(v Value, safe bool) interface{} {
if safe && v.flag&flagRO != 0 {
// Do not allow access to unexported values via Interface,
- // because they might be pointers that should not be
+ // because they might be pointers that should not be
// writable or methods or function that should not be callable.
panic("reflect.Value.Interface: cannot return value obtained from unexported field or method")
}
@@ -928,7 +928,7 @@ func valueInterface(v Value, safe bool) interface{} {
eface.typ = v.typ.runtimeType()
eface.word = v.iword()
- if v.flag&flagIndir != 0 && v.typ.size > ptrSize {
+ if v.flag&flagIndir != 0 && v.kind() != Ptr && v.kind() != UnsafePointer {
// eface.word is a pointer to the actual data,
// which might be changed. We need to return
// a pointer to unchanging data, so make a copy.
@@ -1777,7 +1777,7 @@ func Select(cases []SelectCase) (chosen int, recv Value, recvOK bool) {
default:
panic("reflect.Select: invalid Dir")
- case SelectDefault: // default
+ case SelectDefault: // default
if haveDefault {
panic("reflect.Select: multiple default cases")
}