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

llvm-svn: 348032

Author: isanbard

clang/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)

clang/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 },
-};