aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2010-02-14 10:17:30 -0500
committerJason Merrill <jason@gcc.gnu.org>2010-02-14 10:17:30 -0500
commit1acb8caa791e6bddc4ba4ab531aedad64803323a (patch)
treeb68209d0619d2bb1ccd80959b46646f170406e52
parent912eb5a4de998af3cb0d41cb84534467d93c2270 (diff)
downloadgcc-1acb8caa791e6bddc4ba4ab531aedad64803323a.zip
gcc-1acb8caa791e6bddc4ba4ab531aedad64803323a.tar.gz
gcc-1acb8caa791e6bddc4ba4ab531aedad64803323a.tar.bz2
re PR c++/41997 ([C++0x] constant initializer_list not optimised)
PR c++/41997 * semantics.c (finish_compound_literal): Use cp_apply_type_quals_to_decl when creating a static variable. From-SVN: r156760
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/semantics.c1
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/initlist-opt.C19
4 files changed, 31 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7e37b69..0b96f4c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-14 Jason Merrill <jason@redhat.com>
+
+ PR c++/41997
+ * semantics.c (finish_compound_literal): Use
+ cp_apply_type_quals_to_decl when creating a static variable.
+
2010-02-12 Jason Merrill <jason@redhat.com>
PR c++/43024
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 985e2c0..90a76d9 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2257,6 +2257,7 @@ finish_compound_literal (tree type, tree compound_literal)
tree decl = create_temporary_var (type);
DECL_INITIAL (decl) = compound_literal;
TREE_STATIC (decl) = 1;
+ cp_apply_type_quals_to_decl (cp_type_quals (type), decl);
decl = pushdecl_top_level (decl);
DECL_NAME (decl) = make_anon_name ();
SET_DECL_ASSEMBLER_NAME (decl, DECL_NAME (decl));
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 157d79c..891e33d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-14 Jason Merrill <jason@redhat.com>
+
+ PR c++/41997
+ * g++.dg/cpp0x/initlist-opt.C: New.
+
2010-02-13 Paul Thomas <pault@gcc.gnu.org>
PR fortran/41113
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-opt.C b/gcc/testsuite/g++.dg/cpp0x/initlist-opt.C
new file mode 100644
index 0000000..f515ed8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-opt.C
@@ -0,0 +1,19 @@
+// PR c++/41997
+// { dg-options "-std=c++0x -O2 -fdump-tree-optimized" }
+// { dg-final { scan-tree-dump-not "_0" "optimized" } }
+// { dg-final { cleanup-tree-dump "optimized" } }
+
+#include <initializer_list>
+
+int max_val(std::initializer_list<int> il)
+{
+ int i = *(il.begin());
+ int j = *(il.begin() + 1);
+ return (i > j ? i : j);
+}
+
+int main(void)
+{
+ return max_val({1,2});
+}
+