reflect: Fix invalid sharing in valueInterface.

[pf3gnuchains/gcc-fork.git] / libgo / go / reflect / value.go

diff --git a/libgo/go/reflect/value.go b/libgo/go/reflect/value.go
index a12fcb2..5d08900 100644 (file)
--- a/libgo/go/reflect/value.go
+++ b/libgo/go/reflect/value.go
@@ -841,7 +841,7 @@ func valueInterface(v Value, safe bool) interface{} {
        eface.typ = v.typ.runtimeType()
        eface.word = v.iword()
 
        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.
                // 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.


@@ -1705,10 +1705,11 @@ func ValueOf(i interface{}) Value {
        return Value{typ, unsafe.Pointer(eface.word), fl}
 }
 
        return Value{typ, unsafe.Pointer(eface.word), fl}
 }
 

-// Zero returns a Value representing a zero value for the specified type.
+// Zero returns a Value representing the zero value for the specified type.

 // The result is different from the zero value of the Value struct,
 // which represents no value at all.
 // For example, Zero(TypeOf(42)) returns a Value with Kind Int and value 0.
 // The result is different from the zero value of the Value struct,
 // which represents no value at all.
 // For example, Zero(TypeOf(42)) returns a Value with Kind Int and value 0.

+// The returned value is neither addressable nor settable.

 func Zero(typ Type) Value {
        if typ == nil {
                panic("reflect: Zero(nil)")
 func Zero(typ Type) Value {
        if typ == nil {
                panic("reflect: Zero(nil)")