Subzero: Reduce the amount of #ifdef'd code.

src/IceClFlags.h

 //===- subzero/src/IceClFlags.h - Cl Flags for translation ------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file declares command line flags controlling translation.
@@ skipping 37 matching lines @@
   bool getDataSections() const { return DataSections; }
   void setDataSections(bool NewValue) { DataSections = NewValue; }
 
   bool getDecorateAsm() const { return DecorateAsm; }
   void setDecorateAsm(bool NewValue) { DecorateAsm = NewValue; }
 
   bool getDisableInternal() const { return DisableInternal; }
   void setDisableInternal(bool NewValue) { DisableInternal = NewValue; }
 
   bool getDisableIRGeneration() const {
-    return ALLOW_DISABLE_IR_GEN && DisableIRGeneration;
+    return BuildDefs::disableIrGen() && DisableIRGeneration;
   }
   void setDisableIRGeneration(bool NewValue) { DisableIRGeneration = NewValue; }
 
   bool getDisableTranslation() const { return DisableTranslation; }
   void setDisableTranslation(bool NewValue) { DisableTranslation = NewValue; }
 
-  bool getDumpStats() const { return ALLOW_DUMP && DumpStats; }
+  bool getDumpStats() const { return BuildDefs::dump() && DumpStats; }
   void setDumpStats(bool NewValue) { DumpStats = NewValue; }
 
   bool getEnableBlockProfile() const { return EnableBlockProfile; }
   void setEnableBlockProfile(bool NewValue) { EnableBlockProfile = NewValue; }
 
   bool getFunctionSections() const { return FunctionSections; }
   void setFunctionSections(bool NewValue) { FunctionSections = NewValue; }
 
   bool getGenerateUnitTestMessages() const {
     // Note: If dump routines have been turned off, the error messages
     // will not be readable. Hence, turn off.
-    return !ALLOW_DUMP || GenerateUnitTestMessages;
+    return !BuildDefs::dump() || GenerateUnitTestMessages;
   }
   void setGenerateUnitTestMessages(bool NewValue) {
     GenerateUnitTestMessages = NewValue;
   }
 
   bool getPhiEdgeSplit() const { return PhiEdgeSplit; }
   void setPhiEdgeSplit(bool NewValue) { PhiEdgeSplit = NewValue; }
 
   bool shouldDoNopInsertion() const { return RandomNopInsertion; }
   void setShouldDoNopInsertion(bool NewValue) { RandomNopInsertion = NewValue; }
 
   bool shouldRandomizeRegAlloc() const { return RandomRegAlloc; }
   void setShouldRandomizeRegAlloc(bool NewValue) { RandomRegAlloc = NewValue; }
 
   bool getSkipUnimplemented() const { return SkipUnimplemented; }
   void setSkipUnimplemented(bool NewValue) { SkipUnimplemented = NewValue; }
 
   bool getSubzeroTimingEnabled() const { return SubzeroTimingEnabled; }
   void setSubzeroTimingEnabled(bool NewValue) {
     SubzeroTimingEnabled = NewValue;
   }
 
-  bool getTimeEachFunction() const { return ALLOW_DUMP && TimeEachFunction; }
+  bool getTimeEachFunction() const {
+    return BuildDefs::dump() && TimeEachFunction;
+  }
   void setTimeEachFunction(bool NewValue) { TimeEachFunction = NewValue; }
 
   bool getUseSandboxing() const { return UseSandboxing; }
   void setUseSandboxing(bool NewValue) { UseSandboxing = NewValue; }
 
   // Enum and integer accessors.
   OptLevel getOptLevel() const { return Opt; }
   void setOptLevel(OptLevel NewValue) { Opt = NewValue; }
 
   FileType getOutFileType() const { return OutFileType; }
@@ skipping 13 matching lines @@
 
   TargetArch getTargetArch() const { return TArch; }
   void setTargetArch(TargetArch NewValue) { TArch = NewValue; }
 
   TargetInstructionSet getTargetInstructionSet() const { return TInstrSet; }
   void setTargetInstructionSet(TargetInstructionSet NewValue) {
     TInstrSet = NewValue;
   }
 
   VerboseMask getVerbose() const {
-    return ALLOW_DUMP ? VMask : (VerboseMask)IceV_None;
+    return BuildDefs::dump() ? VMask : (VerboseMask)IceV_None;
   }
   void setVerbose(VerboseMask NewValue) { VMask = NewValue; }
 
   void
   setRandomizeAndPoolImmediatesOption(RandomizeAndPoolImmediatesEnum Option) {
     RandomizeAndPoolImmediatesOption = Option;
   }
 
   RandomizeAndPoolImmediatesEnum getRandomizeAndPoolImmediatesOption() const {
     return RandomizeAndPoolImmediatesOption;
@@ skipping 86 matching lines @@
   RandomizeAndPoolImmediatesEnum RandomizeAndPoolImmediatesOption;
   uint32_t RandomizeAndPoolImmediatesThreshold;
 
   size_t NumTranslationThreads; // 0 means completely sequential
   uint64_t RandomSeed;
 };
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICECLFLAGS_H