commit af3382cf8702c1dfb5a98b2b2093aac21a5c4dff
Author: Jason Merrill <jason@redhat.com>
Date:   Fri Aug 19 10:38:12 2011 -0400

    	Core 903 (partial)
    	* call.c (null_ptr_cst_p): Only 0 qualifies in C++11.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index d2700cb..e5f65b3 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -541,20 +541,14 @@ null_ptr_cst_p (tree t)
     return true;
   if (CP_INTEGRAL_TYPE_P (TREE_TYPE (t)))
     {
-      if (cxx_dialect >= cxx0x)
-	{
-	  t = fold_non_dependent_expr (t);
-	  t = maybe_constant_value (t);
-	  if (TREE_CONSTANT (t) && integer_zerop (t))
-	    return true;
-	}
-      else
+      /* Core issue 903 says only literal 0 is a null pointer constant.  */
+      if (cxx_dialect < cxx0x)
 	{
 	  t = integral_constant_value (t);
 	  STRIP_NOPS (t);
-	  if (integer_zerop (t) && !TREE_OVERFLOW (t))
-	    return true;
 	}
+      if (integer_zerop (t) && !TREE_OVERFLOW (t))
+	return true;
     }
   return false;
 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C
index 7ac53db..6381323 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C
@@ -2,5 +2,5 @@
 
 constexpr int zero() { return 0; }
 
-void* ptr1 = zero(); // #1
-constexpr void* ptr2 = zero(); // #2
+void* ptr1 = zero();		// { dg-error "int" }
+constexpr void* ptr2 = zero();	// { dg-error "int" }