4 files changed, 25 insertions, 19 deletions
diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc
index 9a57f48..37ea65c 100644
--- a/gcc/cp/constexpr.cc
+++ b/gcc/cp/constexpr.cc
@@ -10279,22 +10279,7 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now,
       return true;
 
     case INDIRECT_REF:
-      {
-        tree x = TREE_OPERAND (t, 0);
-        STRIP_NOPS (x);
-        if (is_this_parameter (x) && !is_capture_proxy (x))
-	  {
-	    if (now || !var_in_maybe_constexpr_fn (x))
-	      {
-		if (flags & tf_error)
-		  constexpr_error (loc, fundef_p, "use of %<this%> in a "
-				   "constant expression");
-		return false;
-	      }
-	    return true;
-	  }
-	return RECUR (x, rval);
-      }
+      return RECUR (TREE_OPERAND (t, 0), rval);
 
     case STATEMENT_LIST:
       for (tree stmt : tsi_range (t))
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ref14.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref14.C
new file mode 100644
index 0000000..f201afb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref14.C
@@ -0,0 +1,21 @@
+// PR c++/118249
+// { dg-do compile { target c++11 } }
+
+template <int I>
+void f() { }
+
+template <int N>
+struct array {
+    constexpr int size() const { return N; }
+};
+
+extern array<10>& outer;
+
+struct C {
+    array<10> inner;
+
+    void g() {
+        f<outer.size()>(); // OK
+        f<inner.size()>(); // was error: use of 'this' in a constant expression
+    }
+};
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-reinterpret2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-reinterpret2.C
index 1bc2a8f..52328bc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-reinterpret2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-reinterpret2.C
@@ -17,5 +17,5 @@ bar ()
   return ((void **) &s)[0];	// { dg-error "reinterpret_cast" }
 }
 
-constexpr auto x = foo ();
-constexpr auto y = bar ();
+constexpr auto x = foo (); // { dg-error "called in a constant expression" }
+constexpr auto y = bar (); // { dg-error "called in a constant expression" }
diff --git a/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit12.C b/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit12.C
index 8f003b8..b104b16 100644
--- a/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit12.C
+++ b/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit12.C
@@ -19,6 +19,6 @@ void
 g ()
 {
   constexpr int i = 42;
-  constexpr auto a1 = fn0 (&i);
+  constexpr auto a1 = fn0 (&i); // { dg-error "called in a constant expression" }
   constexpr auto a2 = fn1 (i); // { dg-error "called in a constant expression" }
 }