Small fixups

Author: David Ungar

Diff for: lib/Frontend/Frontend.cpp

@@ -196,12 +196,6 @@ bool CompilerInstance::setUpInputs() {
     recordPrimaryInputBuffer(*codeCompletionBufferID);
   }
 
-  // Remove this check when batch mode is (starting to) work.
-  if (PrimaryBufferID != NO_SUCH_BUFFER)
-    Invocation.getFrontendOptions()
-        .InputsAndOutputs
-        .assertMustNotBeMoreThanOnePrimaryInput(); // not impl yet
-
   if (isInputSwift() && MainBufferID == NO_SUCH_BUFFER &&
       InputSourceCodeBufferIDs.size() == 1)
     MainBufferID = InputSourceCodeBufferIDs.front();

Diff for: lib/FrontendTool/FrontendTool.cpp

@@ -1124,11 +1124,10 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
   std::unique_ptr<llvm::Module> IRModule;
   llvm::GlobalVariable *HashGlobal;
   if (MSF.is<SourceFile*>()) {
-    IRModule = performIRGeneration(IRGenOpts,
-                                   *MSF.get<SourceFile*>(),
-                                   std::move(SM),
-                                   opts.InputsAndOutputs.preBatchModeGetSingleOutputFilename()(), LLVMContext,
-                                   0, &HashGlobal);
+    IRModule = performIRGeneration(
+        IRGenOpts, *MSF.get<SourceFile *>(), std::move(SM),
+        opts.InputsAndOutputs.preBatchModeGetSingleOutputFilename(),
+        LLVMContext, 0, &HashGlobal);
   } else {
     IRModule = performIRGeneration(IRGenOpts, MSF.get<ModuleDecl*>(),
                                    std::move(SM),