aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/ChangeLog6
-rw-r--r--gcc/go/go-gcc.cc1
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 6ae7397..1a12095 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-30 Ian Lance Taylor <iant@google.com>
+
+ PR go/68477
+ * go-gcc.cc (Gcc_backend::string_constant_expression): Don't set
+ TYPE_STRING_FLAG on a variant type.
+
2015-11-11 Andrew MacLeod <amacleod@redhat.com>
* go-backend.c: Remove unused header files.
diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index 31aac2e..cfb1995 100644
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -1279,7 +1279,6 @@ Gcc_backend::string_constant_expression(const std::string& val)
tree const_char_type = build_qualified_type(unsigned_char_type_node,
TYPE_QUAL_CONST);
tree string_type = build_array_type(const_char_type, index_type);
- string_type = build_variant_type_copy(string_type);
TYPE_STRING_FLAG(string_type) = 1;
tree string_val = build_string(val.length(), val.data());
TREE_TYPE(string_val) = string_type;