From: Fangrui Song <maskray@google.com>
Date: Thu, 29 Nov 2018 18:26:39 +0000 (+0000)
Subject: Simplify the __builtin_constant_p test that was used to catch rC347417 failure
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3eda68cb72ca6b1636edc9346de4ab57b32ba679;p=clang

Simplify the __builtin_constant_p test that was used to catch rC347417 failure

Reviewers: rsmith, void, shafik

Reviewed By: void

Subscribers: kristina, cfe-commits

Differential Revision: https://reviews.llvm.org/D54964

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@347895 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/SemaCXX/constant-expression-cxx1y.cpp b/test/SemaCXX/constant-expression-cxx1y.cpp
index 3214a2c086..302b6ccb40 100644
--- a/test/SemaCXX/constant-expression-cxx1y.cpp
+++ b/test/SemaCXX/constant-expression-cxx1y.cpp
@@ -1123,10 +1123,7 @@ static_assert(e2.x != e2.y, "");
 
 } // namespace IndirectFields
 
-constexpr bool __constant_string_p(const char *__s) {
-  while (__builtin_constant_p(*__s) && *__s)
-    __s++;
+constexpr bool indirect_builtin_constant_p(const char *__s) {
   return __builtin_constant_p(*__s);
 }
-
-constexpr bool n = __constant_string_p("a");
+constexpr bool n = indirect_builtin_constant_p("a");