code review 3849043: cgo: export unsafe.Pointer as void *

src/cmd/cgo/out.go

 // Copyright 2009 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.
 
 package main
 
 import (
         "bytes"
         "debug/elf"
         "debug/macho"
@@ skipping 590 matching lines @@
                         return &Type{Size: p.PtrSize + 4, Align: p.PtrSize, C: "GoString"}
                 }
                 if r, ok := goTypes[t.Name]; ok {
                         if r.Align > p.PtrSize {
                                 r.Align = p.PtrSize
                         }
                         return r
                 }
         case *ast.SelectorExpr:
                 id, ok := t.X.(*ast.Ident)
-                if !ok || t.Sel.Name != "Pointer" {
-                        break
-                }
-
-                // Check if it's unsafe.Pointer.
-                for _, d := range p.Decl {
-                        gd, ok := d.(*ast.GenDecl)
-                        if !ok || gd.Tok != token.IMPORT {
-                                continue
-                        }
-                        for _, spec := range gd.Specs {
-                                s, ok := spec.(*ast.ImportSpec)
-                                if !ok || string(s.Path.Value) != "\"unsafe\"" {
-                                        continue
-                                }
-                                if (s.Name == nil && id.Name == "unsafe") ||
-                                        (s.Name != nil && id.Name == s.Name.Name) {
-                                        return &Type{Size: p.PtrSize, Align: p.PtrSize, C: "void*"}
-                                }
-                        }
+                if ok && id.Name == "unsafe" && t.Sel.Name == "Pointer" {
+                        return &Type{Size: p.PtrSize, Align: p.PtrSize, C: "void*"}
                 }
         }
         error(e.Pos(), "unrecognized Go type %T", e)
         return &Type{Size: 4, Align: 4, C: "int"}
 }
 
 const gccProlog = `
 // Usual nonsense: if x and y are not equal, the type will be invalid
 // (have a negative array count) and an inscrutable error will come
 // out of the compiler and hopefully mention "name".
@@ skipping 58 matching lines @@
 typedef unsigned short ushort;
 typedef long long int64;
 typedef unsigned long long uint64;
 typedef __SIZE_TYPE__ uintptr;
 
 typedef struct { char *p; int n; } GoString;
 typedef void *GoMap;
 typedef void *GoChan;
 typedef struct { void *t; void *v; } GoInterface;
 `