aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-12-01 04:45:53 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-12-01 04:45:53 +0000
commit3002293ac6a0719607f3d9946bf9e053e835842f (patch)
tree164f98c4dab2ade3905c22958c2e0849f14c0c86 /gcc
parentb1d47f0c51851fa6db7b50e045dceede48666396 (diff)
PR go/68477
* go-gcc.cc (Gcc_backend::string_constant_expression): Don't set TYPE_STRING_FLAG on a variant type. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231096 138bc75d-0d04-0410-961f-82ee72b054a4
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 6ae73977ea8..1a120950a13 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 31aac2ec9eb..cfb1995faf2 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;