Modify how textual bitcode is injected into pnacl-sz.

src/IceClFlags.cpp

 //===- subzero/src/IceClFlags.cpp - Command line flags and parsing --------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// This file defines commandline flags parsing.
 /// This currently relies on llvm::cl to parse.  In the future, the minimal
 /// build can have a simpler parser.
 ///
 //===----------------------------------------------------------------------===//
 
 #include "IceClFlags.h"
-

[jvoung (off chromium), 2015/07/22 21:20:45]

keep the newline? I think the new style is Foo.cpp has Foo.h first, on its own
line, then other .h after.

[Karl, 2015/07/22 21:58:16]

Done.

 #include "IceClFlagsExtra.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #include "llvm/Support/CommandLine.h"
 #pragma clang diagnostic pop
 
 namespace cl = llvm::cl;
 
 // Options which are captured in Ice::ClFlags and propagated.
@@ skipping 278 matching lines @@
     "reorder-global-variables",
     cl::desc("Reorder the layout of global variables in NON TEXT section"),
     cl::init(false));
 
 // Command line option for turning on layout reordering in constant pools.
 cl::opt<bool> ReorderPooledConstants(
     "reorder-pooled-constants",
     cl::desc("Reorder the layout of constants in constant pools"),
     cl::init(false));
 
+// Command line option for accepting textual bitcode.
+cl::opt<bool> BitcodeAsText(
+    "bitcode-as-text",
+    cl::desc(
+        "Accept textual form of PNaCl bitcode records (i.e. not .ll assembly)"),
+    cl::init(false));
 } // end of anonymous namespace
 
 namespace Ice {
 
 void ClFlags::parseFlags(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv);
   AppName = IceString(argv[0]);
 }
 
 void ClFlags::resetClFlags(ClFlags &OutFlags) {
@@ skipping 111 matching lines @@
 
   // Set for pooled constant reordering option.
   OutFlags.setShouldReorderPooledConstants(::ReorderPooledConstants);
 }
 
 void ClFlags::getParsedClFlagsExtra(ClFlagsExtra &OutFlagsExtra) {
   OutFlagsExtra.setAlwaysExitSuccess(AlwaysExitSuccess);
   OutFlagsExtra.setBuildOnRead(BuildOnRead);
   OutFlagsExtra.setGenerateBuildAtts(GenerateBuildAtts);
   OutFlagsExtra.setLLVMVerboseErrors(LLVMVerboseErrors);
+  OutFlagsExtra.setBitcodeAsText(BitcodeAsText);

[jvoung (off chromium), 2015/07/22 21:20:44]

Can the bools portion be sorted?

I think it's separated by bool flags and string flags.

[Karl, 2015/07/22 21:58:16]

Done.

   OutFlagsExtra.setAppName(AppName);
   OutFlagsExtra.setInputFileFormat(InputFileFormat);
   OutFlagsExtra.setIRFilename(IRFilename);
   OutFlagsExtra.setLogFilename(LogFilename);
   OutFlagsExtra.setOutputFilename(OutputFilename);
 }
 
 } // end of namespace Ice