From: Bill Wendling <isanbard@gmail.com>
Date: Fri, 30 Nov 2018 20:44:11 +0000 (+0000)
Subject: Revert r348029. I was git-ing and jumped the gun.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=611da23266a6c87cdf6427d1c529b546d64d26c0;p=clang

Revert r348029. I was git-ing and jumped the gun.


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

diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index ca86e10710..eb5e010968 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -1552,8 +1552,7 @@ llvm::Constant *ConstantEmitter::tryEmitPrivate(const Expr *E,
   if (destType->isReferenceType())
     Success = E->EvaluateAsLValue(Result, CGM.getContext());
   else
-    Success = E->EvaluateAsRValue(Result, CGM.getContext(),
-                                  /* InConstantContext */ true);
+    Success = E->EvaluateAsRValue(Result, CGM.getContext());
 
   llvm::Constant *C;
   if (Success && !Result.HasSideEffects)
diff --git a/test/CodeGen/builtin-constant-p.c b/test/CodeGen/builtin-constant-p.c
index 943d288632..5cdcc72123 100644
--- a/test/CodeGen/builtin-constant-p.c
+++ b/test/CodeGen/builtin-constant-p.c
@@ -157,14 +157,3 @@ static void src_fn(void) {
 void test14() {
   assign(dest_p, src_fn);
 }
-
-struct test15_s {
-  const char *name;
-  int num_args;
-};
-
-extern int test15_v;
-
-struct test15_s tcg_op_defs_org_x86_64[] = {
-    {"tag", __builtin_constant_p(test15_v) && !test15_v ? 0x10 : 0 },
-};