Modify how textual bitcode is injected into pnacl-sz.

src/IceClFlags.cpp

Index: src/IceClFlags.cpp
diff --git a/src/IceClFlags.cpp b/src/IceClFlags.cpp
index 746cb3e4adc51d7fbd63383577f5c8fc79a89b0d..c889ec72246da937a0a40c8ec93a43594c283b23 100644
--- a/src/IceClFlags.cpp
+++ b/src/IceClFlags.cpp
@@ -15,7 +15,6 @@
 //===----------------------------------------------------------------------===//
 
 #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
@@ -314,6 +313,12 @@ cl::opt<bool> ReorderPooledConstants(
     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 {
@@ -445,6 +450,7 @@ void ClFlags::getParsedClFlagsExtra(ClFlagsExtra &OutFlagsExtra) {
   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);