re PR c++/46552 ([C++0x] Internal compiler error on pointer to member variable with template)

	PR c++/46552
	* semantics.c (cxx_eval_constant_expression): Handle OFFSET_REF.

From-SVN: r169099

gcc/cp/ChangeLog

 2011-01-21  Jason Merrill  <jason@redhat.com>
 
+	PR c++/46552
+	* semantics.c (cxx_eval_constant_expression): Handle OFFSET_REF.
+
 	PR c++/46977
 	* semantics.c (potential_constant_expression_1): Split out from
 	potential_constant_expression.  Add want_rval parm.  Handle

gcc/cp/semantics.c

@@ -7024,6 +7024,7 @@ cxx_eval_constant_expression (const constexpr_call *call, tree t,
     case NON_DEPENDENT_EXPR:
     case BASELINK:
     case EXPR_STMT:
+    case OFFSET_REF:
       if (!allow_non_constant)
         error_at (EXPR_LOC_OR_HERE (t),
 		  "expression %qE is not a constant-expression", t);

gcc/testsuite/ChangeLog

 2011-01-21  Jason Merrill  <jason@redhat.com>
 
+	PR c++/46552
+	* g++.dg/cpp0x/constexpr-regress2.C: New.
+
 	* g++.dg/cpp0x/constexpr-stmtexpr.C: New.
 
 2011-01-21  Jeff Law <law@redhat.com>

gcc/testsuite/g++.dg/cpp0x/constexpr-regress2.C

+// PR c++/46552
+// { dg-options -std=c++0x }
+
+struct S
+{
+    int x;
+};
+
+template < typename >
+void f( void )
+{
+    &S::x;
+}