summaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/types.cc5
2 files changed, 3 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 81deef2cb79..bfc7856cce5 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-f9e44c6e510df9f047dbe28eb5fa19642e350f8f
+c8456995b0118a92820c6c1d8f996d4b1adf55c2
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/types.cc b/gcc/go/gofrontend/types.cc
index ecb93b099db..12e783010db 100644
--- a/gcc/go/gofrontend/types.cc
+++ b/gcc/go/gofrontend/types.cc
@@ -8908,11 +8908,10 @@ Channel_type::select_case_type()
Type* uint16_type = Type::lookup_integer_type("uint16");
Type* int64_type = Type::lookup_integer_type("int64");
scase_type =
- Type::make_builtin_struct_type(4,
+ Type::make_builtin_struct_type(3,
"c", unsafe_pointer_type,
"elem", unsafe_pointer_type,
- "kind", uint16_type,
- "releasetime", int64_type);
+ "kind", uint16_type);
scase_type->set_is_struct_incomparable();
}
return scase_type;