Merge pull request #1121 from visualfc/closure

fix reflect.pointer  for closure; fix runtime unsafe.pointer ptrBytes

runtime/internal/lib/reflect/value.go

@@ -124,6 +124,9 @@ func (v Value) typ() *abi.Type {
 // v.Kind() must be Pointer, Map, Chan, Func, or UnsafePointer
 // if v.Kind() == Pointer, the base type must not be not-in-heap.
 func (v Value) pointer() unsafe.Pointer {
+	if v.typ_.IsClosure() {
+		return v.ptr
+	}
 	if v.typ().Size() != goarch.PtrSize || !v.typ().Pointers() {
 		panic("can't call pointer on a non-pointer Value")
 	}

runtime/internal/runtime/z_type.go

@@ -72,13 +72,13 @@ func Basic(_kind Kind) *Type {
 	kind := _kind & abi.KindMask
 	if tyBasic[kind] == nil {
 		name, size, align := basicTypeInfo(kind)
-		var bytes uintptr
-		if kind == abi.String {
-			bytes = pointerSize
+		var ptrBytes uintptr
+		if kind == abi.String || kind == abi.UnsafePointer {
+			ptrBytes = pointerSize
 		}
 		tyBasic[kind] = &Type{
 			Size_:       size,
-			PtrBytes:    bytes,
+			PtrBytes:    ptrBytes,
 			Hash:        uint32(kind),
 			Align_:      uint8(align),
 			FieldAlign_: uint8(align),