diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 385bfcd72db4103aaaa47f3673a041befb5dde33..2feeb12bcb020783e46921fc332bd108a51c374e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2020-05-23  Patrick Palka  <ppalka@redhat.com>
+
+	PR c++/94038
+	* constexpr.c (cxx_eval_constant_expression)
+	<case TEMPLATE_ID_EXPR>: Don't evaluate the concept when
+	constexpr evaluation is uid-sensitive.
+
 2020-05-21  Patrick Palka  <ppalka@redhat.com>
 
 	PR c++/94038
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 98c974e657f6d36f0fa456f2d7b3d7af5480395a..4e441ac8d2fa0c209a742b7bfb0b38035fb1dac4 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -6486,7 +6486,8 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 	    break;
 	  }
 
-	if (!processing_template_decl)
+	if (!processing_template_decl
+	    && !uid_sensitive_constexpr_evaluation_p ())
 	  r = evaluate_concept_check (t, tf_warning_or_error);
 	else
 	  *non_constant_p = true;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9711a27e29c09d0fb52fb873b10546b739a6fc2b..80fd33dac18dbfdc79d2b0ce365fc4242ecb0fc1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-23  Patrick Palka  <ppalka@redhat.com>
+
+	PR c++/94038
+	* g++.dg/warn/pr94038-3.C: New test.
+
 2020-05-22  Mark Wielaard  <mark@klomp.org>
 
 	* gcc.dg/spellcheck-stdint.c: New test.
diff --git a/gcc/testsuite/g++.dg/warn/pr94038-3.C b/gcc/testsuite/g++.dg/warn/pr94038-3.C
new file mode 100644
index 0000000000000000000000000000000000000000..49b6d133f0854008f82a8fbb5b91c9146c87e2af
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/pr94038-3.C
@@ -0,0 +1,15 @@
+// PR c++/94038
+// { dg-do compile { target c++20 } }
+// { dg-additional-options "-Wall" }
+
+template<typename T>
+constexpr int foo() {
+  return T::x;
+}
+
+constexpr bool bar(bool a) { return a; }
+
+template<typename T>
+concept C = foo<T>() == 0;
+
+static_assert(decltype(bar(C<int>)){} == false);