Imported Upstream version 58upstream/58

3 files changed, 13 insertions, 12 deletions

diff --git a/src/cmd/godefs/a.h b/src/cmd/godefs/a.h
index 03ab91f65..9b4957467 100644
--- a/src/cmd/godefs/a.h
+++ b/src/cmd/godefs/a.h
@@ -75,6 +75,7 @@ extern Const *con;
 extern int ncon;
 extern Type **typ;
 extern int ntyp;
+extern int kindsize[];
 
 // Language output
 typedef struct Lang Lang;
diff --git a/src/cmd/godefs/main.c b/src/cmd/godefs/main.c
index d4163421d..6a8630179 100644
--- a/src/cmd/godefs/main.c
+++ b/src/cmd/godefs/main.c
@@ -181,7 +181,7 @@ main(int argc, char **argv)
 	char **av, *q, *r, *tofree, *name;
 	char nambuf[100];
 	Biobuf *bin, *bout;
-	Type *t;
+	Type *t, *tt;
 	Field *f;
 	int orig_output_fd;
 
@@ -373,8 +373,16 @@ Continue:
 				prefix = prefixlen(t);
 			for(j=0; j<t->nf; j++) {
 				f = &t->f[j];
-				if(f->type->kind == 0)
-					continue;
+				if(f->type->kind == 0 && f->size <= 64 && (f->size&(f->size-1)) == 0) {
+					// unknown type but <= 64 bits and bit size is a power of two.
+					// could be enum - make Uint64 and then let it reduce
+					tt = emalloc(sizeof *tt);
+					*tt = *f->type;
+					f->type = tt;
+					tt->kind = Uint64;
+					while(tt->kind > Uint8 && kindsize[tt->kind] > f->size)
+						tt->kind -= 2;
+				}
 				// padding
 				if(t->kind == Struct || lang == &go) {
 					if(f->offset%8 != 0 || f->size%8 != 0) {
diff --git a/src/cmd/godefs/stabs.c b/src/cmd/godefs/stabs.c
index 30a05fc70..2c3d431b8 100644
--- a/src/cmd/godefs/stabs.c
+++ b/src/cmd/godefs/stabs.c
@@ -149,7 +149,7 @@ Intrange intranges[] = {
 	16, 0, Void,
 };
 
-static int kindsize[] = {
+int kindsize[] = {
 	0,
 	0,
 	8,
@@ -381,14 +381,6 @@ parsedef(char **pp, char *name)
 
 			while(f->type->kind == Typedef)
 				f->type = f->type->type;
-			if(f->type->kind == 0 && f->size <= 64 && (f->size&(f->size-1)) == 0) {
-				// unknown type but <= 64 bits and bit size is a power of two.
-				// could be enum - make Uint64 and then let it reduce
-				tt = emalloc(sizeof *tt);
-				*tt = *f->type;
-				f->type = tt;
-				tt->kind = Uint64;
-			}
 
 			// rewrite
 			//	uint32 x : 8;