Remove IceConverter when LLVM IR is not allowed.

src/llvm2ice.cpp

 //===- subzero/src/llvm2ice.cpp - Driver for testing ----------------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines a driver that uses LLVM capabilities to parse a
@@ skipping 130 matching lines @@
                         cl::desc("Define default global prefix for naming "
                                  "unnamed globals"),
                         cl::init("Global"));
 
 static cl::opt<std::string>
     DefaultFunctionPrefix("default-function-prefix",
                           cl::desc("Define default function prefix for naming "
                                    "unnamed functions"),
                           cl::init("Function"));
 
+// Note: While this flag isn't used in the minimal build, we keep this
+// flag so that tests can set this command-line flag without concern
+// to the type of build. We double check that this flag at runtime
+// to make sure the consistency is maintained.
 static cl::opt<bool>
-BuildOnRead("build-on-read",
-            cl::desc("Build ICE instructions when reading bitcode"),
-            cl::init(false));
+    BuildOnRead("build-on-read",
+                cl::desc("Build ICE instructions when reading bitcode"),
+                cl::init(true));
 
 static cl::opt<bool>
     UseIntegratedAssembler("integrated-as",
                            cl::desc("Use integrated assembler (default yes)"),
                            cl::init(true));
 
 static cl::alias UseIas("ias", cl::desc("Alias for -integrated-as"),
                         cl::NotHidden, cl::aliasopt(UseIntegratedAssembler));
 
 static cl::opt<bool> AlwaysExitSuccess(
@@ skipping 95 matching lines @@
   Flags.TimingFocusOn = TimingFocusOn;
   Flags.VerboseFocusOn = VerboseFocusOn;
   Flags.TranslateOnly = TranslateOnly;
 
   Ice::GlobalContext Ctx(Ls, Os, VMask, TargetArch, OptLevel, TestPrefix,
                          Flags);
 
   Ice::TimerMarker T(Ice::TimerStack::TT_szmain, &Ctx);
 
   int ErrorStatus = 0;
+#if ALLOW_LLVM_IR == 1
   if (BuildOnRead) {

[Jim Stichnoth, 2014/10/28 20:45:35]

Could this #if construct be more like this?

if (BuildOnRead) {
  ... Translator ...
} else {
#if ALLOW_LLVM_IR == 1
  ... Converter ...
#else // ALLOW_LLVM_IR != 1
  ... "Error: " ...
#endif // ALLOW_LLVM_IR != 1
}

That way, there is a single #if construct that fits entirely within a nesting
level.  (Also, when there are more than a couple of lines between the #
directives, I prefer to put comments on the #else and #endif.)

[Karl, 2014/10/28 21:43:51]

Done.

+#else
+  if (!BuildOnRead) {
+    *Ls << "Error: Build doesn't allow LLVM IR, "
+        << "--build-on-read=0 not allowed\n";
+    return GetReturnValue(1);
+  }
+#endif
     Ice::PNaClTranslator Translator(&Ctx, Flags);
     Translator.translate(IRFilename);
     ErrorStatus = Translator.getErrorStatus();
+#if ALLOW_LLVM_IR == 1
   } else {
     // Parse the input LLVM IR file into a module.
     SMDiagnostic Err;
     Ice::TimerMarker T1(Ice::TimerStack::TT_parse, &Ctx);
     Module *Mod =
         NaClParseIRFile(IRFilename, InputFileFormat, Err, getGlobalContext());
 
     if (!Mod) {
       Err.print(argv[0], errs());
       return GetReturnValue(1);
     }
 
     Ice::Converter Converter(Mod, &Ctx, Flags);
     Converter.convertToIce();
     ErrorStatus = Converter.getErrorStatus();
   }
+#endif
   if (TimeEachFunction) {
     const bool DumpCumulative = false;
     Ctx.dumpTimers(Ice::GlobalContext::TSK_Funcs, DumpCumulative);
   }
   if (SubzeroTimingEnabled)
     Ctx.dumpTimers();
   const bool FinalStats = true;
   Ctx.dumpStats("_FINAL_", FinalStats);
   return GetReturnValue(ErrorStatus);
 }