Upgrade to 0.12

[github/fretlink/terraform-provider-statuscake.git] / vendor / github.com / golang / protobuf / proto / pointer_unsafe.go

diff --git a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
index d55a335d9453204ae01c7c21d474efdbefa7d120..dbfffe071b82aabab10a91d5b0c084bf7327b89a 100644 (file)
--- a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
+++ b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
@@ -85,16 +85,21 @@ func toPointer(i *Message) pointer {
 
 // toAddrPointer converts an interface to a pointer that points to
 // the interface data.
-func toAddrPointer(i *interface{}, isptr bool) pointer {
+func toAddrPointer(i *interface{}, isptr, deref bool) (p pointer) {
        // Super-tricky - read or get the address of data word of interface value.
        if isptr {
                // The interface is of pointer type, thus it is a direct interface.
                // The data word is the pointer data itself. We take its address.
-               return pointer{p: unsafe.Pointer(uintptr(unsafe.Pointer(i)) + ptrSize)}
+               p = pointer{p: unsafe.Pointer(uintptr(unsafe.Pointer(i)) + ptrSize)}
+       } else {
+               // The interface is not of pointer type. The data word is the pointer
+               // to the data.
+               p = pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]}
        }
-       // The interface is not of pointer type. The data word is the pointer
-       // to the data.
-       return pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]}
+       if deref {
+               p.p = *(*unsafe.Pointer)(p.p)
+       }
+       return p
 }
 
 // valToPointer converts v to a pointer. v must be of pointer type.