optimize out some ifdefs.

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

diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index ed55df3a6267cae8ccc64cf06b5ac1ff631fa72d..b408a3f61583f59e2ac206fcfab560d189abb888 100644 (file)
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -58,12 +58,8 @@ struct EvalInfo {
 static bool EvaluateLValue(const Expr *E, APValue &Result, EvalInfo &Info);
 static bool EvaluatePointer(const Expr *E, APValue &Result, EvalInfo &Info);
 static bool EvaluateInteger(const Expr *E, APSInt  &Result, EvalInfo &Info);
-#ifndef USEINDIRECTBRANCH
-static bool EvaluateIntegerOrLValue(const Expr *E, APValue  &Result, EvalInfo &Info);
-#else
 static bool EvaluateIntegerOrLValue(const Expr *E, APValue  &Result,
                                     EvalInfo &Info);
-#endif
 static bool EvaluateFloat(const Expr *E, APFloat &Result, EvalInfo &Info);
 static bool EvaluateComplex(const Expr *E, APValue &Result, EvalInfo &Info);
 

diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h
index 1fba3f971e79fa5f14ba7fd52ea9eff6ea2bf45d..e4ae77e35bc4f6104960cac361d834d23e9aef28 100644 (file)
--- a/lib/CodeGen/CodeGenFunction.h
+++ b/lib/CodeGen/CodeGenFunction.h
@@ -183,11 +183,7 @@ public:
   void PopConditionalTempDestruction();
 
 private:
-#ifndef USEINDIRECTBRANCH
-  CGDebugInfo* DebugInfo;
-#else
   CGDebugInfo *DebugInfo;
-#endif
 
 #ifndef USEINDIRECTBRANCH
   /// LabelIDs - Track arbitrary ids assigned to labels for use in implementing