From c6069476a7d7f16bbd000004bf574a46d5d2222f Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Fri, 30 Nov 2018 12:45:38 +0100
Subject: [PATCH] cgo: do not rely on stdint.h to be available

---
 loader/cgo.go        | 44 +++++++++++++++++++++++++++++++++-----------
 testdata/cgo/main.c  |  8 +-------
 testdata/cgo/main.go | 10 +++++-----
 testdata/cgo/out.txt |  2 +-
 4 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/loader/cgo.go b/loader/cgo.go
index 21548f82..3678526c 100644
--- a/loader/cgo.go
+++ b/loader/cgo.go
@@ -142,13 +142,13 @@ func (info *fileInfo) addFuncDecls() {
 	for _, fn := range info.functions {
 		obj := &ast.Object{
 			Kind: ast.Fun,
-			Name: "C." + fn.name,
+			Name: mapCgoType(fn.name),
 		}
 		args := make([]*ast.Field, len(fn.args))
 		decl := &ast.FuncDecl{
 			Name: &ast.Ident{
 				NamePos: info.importCPos,
-				Name:    "C." + fn.name,
+				Name:    mapCgoType(fn.name),
 				Obj:     obj,
 			},
 			Type: &ast.FuncType{
@@ -163,7 +163,7 @@ func (info *fileInfo) addFuncDecls() {
 						&ast.Field{
 							Type: &ast.Ident{
 								NamePos: info.importCPos,
-								Name:    "C." + fn.result,
+								Name:    mapCgoType(fn.result),
 							},
 						},
 					},
@@ -179,14 +179,14 @@ func (info *fileInfo) addFuncDecls() {
 						Name:    arg.name,
 						Obj: &ast.Object{
 							Kind: ast.Var,
-							Name: "C." + arg.name,
+							Name: mapCgoType(arg.name),
 							Decl: decl,
 						},
 					},
 				},
 				Type: &ast.Ident{
 					NamePos: info.importCPos,
-					Name:    "C." + arg.typeName,
+					Name:    mapCgoType(arg.typeName),
 				},
 			}
 		}
@@ -244,11 +244,11 @@ func (info *fileInfo) addTypedefs() {
 		Tok:    token.TYPE,
 	}
 	for _, typedef := range info.typedefs {
-		newType := "C." + typedef.newName
-		oldType := "C." + typedef.oldName
+		newType := mapCgoType(typedef.newName)
+		oldType := mapCgoType(typedef.oldName)
 		switch oldType {
 		// TODO: plain char (may be signed or unsigned)
-		case "C.signed char", "C.short", "C.int", "C.long", "C.long long":
+		case "C.schar", "C.short", "C.int", "C.long", "C.longlong":
 			switch typedef.size {
 			case 1:
 				oldType = "int8"
@@ -259,7 +259,7 @@ func (info *fileInfo) addTypedefs() {
 			case 8:
 				oldType = "int64"
 			}
-		case "C.unsigned char", "C.unsigned short", "C.unsigned int", "C.unsigned long", "C.unsigned long long":
+		case "C.uchar", "C.ushort", "C.uint", "C.ulong", "C.ulonglong":
 			switch typedef.size {
 			case 1:
 				oldType = "uint8"
@@ -317,7 +317,7 @@ func (info *fileInfo) walker(node ast.Node) bool {
 		if x.Name == "C" {
 			node.Fun = &ast.Ident{
 				NamePos: x.NamePos,
-				Name:    "C." + fun.Sel.Name,
+				Name:    mapCgoType(fun.Sel.Name),
 			}
 		}
 	case *ast.ValueSpec:
@@ -332,9 +332,31 @@ func (info *fileInfo) walker(node ast.Node) bool {
 		if x.Name == "C" {
 			node.Type = &ast.Ident{
 				NamePos: x.NamePos,
-				Name:    "C." + typ.Sel.Name,
+				Name:    mapCgoType(typ.Sel.Name),
 			}
 		}
 	}
 	return true
 }
+
+// mapCgoType converts a C type name into a Go type name with a "C." prefix.
+func mapCgoType(t string) string {
+	switch t {
+	case "signed char":
+		return "C.schar"
+	case "long long":
+		return "C.longlong"
+	case "unsigned char":
+		return "C.schar"
+	case "unsigned short":
+		return "C.ushort"
+	case "unsigned int":
+		return "C.uint"
+	case "unsigned long":
+		return "C.ulong"
+	case "unsigned long long":
+		return "C.ulonglong"
+	default:
+		return "C." + t
+	}
+}
diff --git a/testdata/cgo/main.c b/testdata/cgo/main.c
index 0ce7b683..ecee9317 100644
--- a/testdata/cgo/main.c
+++ b/testdata/cgo/main.c
@@ -1,13 +1,7 @@
-#include <stdint.h>
-
-int32_t fortytwo() {
+int fortytwo() {
 	return 42;
 }
 
 int add(int a, int b) {
 	return a + b;
 }
-
-int32_t mul(int32_t a, int32_t b) {
-	return a * b;
-}
diff --git a/testdata/cgo/main.go b/testdata/cgo/main.go
index f37c95eb..f4a5d4d8 100644
--- a/testdata/cgo/main.go
+++ b/testdata/cgo/main.go
@@ -1,20 +1,20 @@
 package main
 
 /*
-#include <stdint.h>
-int32_t fortytwo(void);
-int32_t mul(int32_t a, int32_t b);
-typedef int32_t myint;
+int fortytwo(void);
+typedef short myint;
 int add(int a, int b);
 */
 import "C"
 
+import "unsafe"
+
 func main() {
 	println("fortytwo:", C.fortytwo())
-	println("mul:", C.mul(C.int32_t(3), 5))
 	println("add:", C.add(C.int(3), 5))
 	var x C.myint = 3
 	println("myint:", x, C.myint(5))
+	println("myint size:", int(unsafe.Sizeof(x)))
 	var y C.longlong = -(1 << 40)
 	println("longlong:", y)
 }
diff --git a/testdata/cgo/out.txt b/testdata/cgo/out.txt
index 5f222ce0..d6d20873 100644
--- a/testdata/cgo/out.txt
+++ b/testdata/cgo/out.txt
@@ -1,5 +1,5 @@
 fortytwo: 42
-mul: 15
 add: 8
 myint: 3 5
+myint size: 2
 longlong: -1099511627776