From e4d02f5277072c691de079b3b8aa9b862e070a9e Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 4 Jan 2017 00:58:34 +0000 Subject: [PATCH] godump.c (go_format_type): Treat ENUMERAL_TYPE like INTEGER_TYPE. gcc/: * godump.c (go_format_type): Treat ENUMERAL_TYPE like INTEGER_TYPE. gcc/testsuite/: * gcc.misc-tests/godump-1.c: Update for accurate representation of enums. From-SVN: r244041 --- gcc/ChangeLog | 5 +++++ gcc/godump.c | 5 +---- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.misc-tests/godump-1.c | 8 ++++---- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 882856412e2..f7cf7c98151 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-01-03 Ian Lance Taylor + + * godump.c (go_format_type): Treat ENUMERAL_TYPE like + INTEGER_TYPE. + 2017-01-03 Martin Sebor PR tree-optimization/78696 diff --git a/gcc/godump.c b/gcc/godump.c index 65a8b393358..4884deead80 100644 --- a/gcc/godump.c +++ b/gcc/godump.c @@ -722,10 +722,6 @@ go_format_type (struct godump_container *container, tree type, switch (TREE_CODE (type)) { - case ENUMERAL_TYPE: - obstack_grow (ob, "int", 3); - break; - case TYPE_DECL: { void **slot; @@ -741,6 +737,7 @@ go_format_type (struct godump_container *container, tree type, } break; + case ENUMERAL_TYPE: case INTEGER_TYPE: { const char *s; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c12b94a85f9..3b448dd98f9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-01-03 Ian Lance Taylor + + * gcc.misc-tests/godump-1.c: Update for accurate representation of + enums. + 2017-01-03 Martin Sebor PR tree-optimization/78696 diff --git a/gcc/testsuite/gcc.misc-tests/godump-1.c b/gcc/testsuite/gcc.misc-tests/godump-1.c index 675802b8c30..ee984e5b574 100644 --- a/gcc/testsuite/gcc.misc-tests/godump-1.c +++ b/gcc/testsuite/gcc.misc-tests/godump-1.c @@ -373,7 +373,7 @@ enum { E11 }; /* { dg-final { scan-file godump-1.out "(?n)^const _E11 = 0$" } } */ enum { EV11 } e1_v1; -/* { dg-final { scan-file godump-1.out "(?n)^var _e1_v1 int$" } } */ +/* { dg-final { scan-file godump-1.out "(?n)^var _e1_v1 u?int\[0-9\]*$" } } */ /* { dg-final { scan-file godump-1.out "(?n)^const _EV11 = 0$" } } */ enum { E21, E22 }; @@ -381,7 +381,7 @@ enum { E21, E22 }; /* { dg-final { scan-file godump-1.out "(?n)^const _E22 = 1$" } } */ enum { EV21, EV22 } e2_v1; -/* { dg-final { scan-file godump-1.out "(?n)^var _e2_v1 int$" } } */ +/* { dg-final { scan-file godump-1.out "(?n)^var _e2_v1 u?int\[0-9\]*$" } } */ /* { dg-final { scan-file godump-1.out "(?n)^const _EV21 = 0$" } } */ /* { dg-final { scan-file godump-1.out "(?n)^const _EV22 = 1$" } } */ @@ -392,12 +392,12 @@ enum { EN1 = 3, EN2 = 77, EN3 = -1, EN4 }; /* { dg-final { scan-file godump-1.out "(?n)^const _EN4 = 0$" } } */ typedef enum { ET1, ET2 } et_t; -/* { dg-final { scan-file godump-1.out "(?n)^type _et_t int$" } } */ +/* { dg-final { scan-file godump-1.out "(?n)^type _et_t u?int\[0-9\]*$" } } */ /* { dg-final { scan-file godump-1.out "(?n)^const _ET1 = 0$" } } */ /* { dg-final { scan-file godump-1.out "(?n)^const _ET2 = 1$" } } */ enum { ETV1, ETV2 } et_v1; -/* { dg-final { scan-file godump-1.out "(?n)^var _et_v1 int$" } } */ +/* { dg-final { scan-file godump-1.out "(?n)^var _et_v1 u?int\[0-9\]*$" } } */ /* { dg-final { scan-file godump-1.out "(?n)^const _ETV1 = 0$" } } */ /* { dg-final { scan-file godump-1.out "(?n)^const _ETV2 = 1$" } } */ -- 2.30.2