From: Jason Merrill <jason@redhat.com>
Date: Tue, 8 Mar 2011 05:28:02 +0000 (-0500)
Subject: re PR c++/48015 ([C++0x] ICE: unexpected expression 'std::min' of kind overload)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8152661be6564d7369d88e32dded29641183b248;p=gcc.git

re PR c++/48015 ([C++0x] ICE: unexpected expression 'std::min' of kind overload)

	PR c++/48015
	* init.c (constant_value_1): Always require init to be TREE_CONSTANT.

From-SVN: r170770
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 03fe7def983..a82947f205f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-07  Jason Merrill  <jason@redhat.com>
 
+	PR c++/48015
+	* init.c (constant_value_1): Always require init to be TREE_CONSTANT.
+
 	PR c++/48008
 	* mangle.c (write_type): Strip cv-quals from FUNCTION_TYPE here.
 	(write_CV_qualifiers_for_type): Not here.
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index e590118f3cf..56f66faffdd 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1760,17 +1760,15 @@ constant_value_1 (tree decl, bool integral_p)
 	init = TREE_VALUE (init);
       if (!init
 	  || !TREE_TYPE (init)
-	  || uses_template_parms (init)
-	  || (integral_p
-	      ? false
-	      : (!TREE_CONSTANT (init)
-		 /* Do not return an aggregate constant (of which
-		    string literals are a special case), as we do not
-		    want to make inadvertent copies of such entities,
-		    and we must be sure that their addresses are the
-		    same everywhere.  */
-		 || TREE_CODE (init) == CONSTRUCTOR
-		 || TREE_CODE (init) == STRING_CST)))
+	  || !TREE_CONSTANT (init)
+	  || (!integral_p
+	      /* Do not return an aggregate constant (of which
+		 string literals are a special case), as we do not
+		 want to make inadvertent copies of such entities,
+		 and we must be sure that their addresses are the
+		 same everywhere.  */
+	      && (TREE_CODE (init) == CONSTRUCTOR
+		  || TREE_CODE (init) == STRING_CST)))
 	break;
       decl = unshare_expr (init);
     }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f5783968966..b27cd59e5eb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-07  Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/cpp0x/regress/non-const1.C: New.
+
 2011-03-07  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/47991
diff --git a/gcc/testsuite/g++.dg/cpp0x/regress/non-const1.C b/gcc/testsuite/g++.dg/cpp0x/regress/non-const1.C
new file mode 100644
index 00000000000..7fc66a7ae81
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/regress/non-const1.C
@@ -0,0 +1,9 @@
+// PR c++/48015
+// { dg-options -std=c++0x }
+
+template <typename T> T f(T);
+template <typename T> void g()
+{
+  int const c = f (1);
+  int i = c - 0;
+}