commit e8c263a1c5df81594cf302ecadd813909c894487
author Zonr Chang <zonr@google.com> Tue Oct 12 00:35:29 2010 +0800
committer Zonr Chang <zonr@google.com> Tue Oct 12 00:35:29 2010 +0800
tree 36e7cb52b56ff613522c6e9222da3c8645851b5c
parent a02010cd90184a9c1be7b451fe32e114ffb1810f

Refactor a bit & -M bug fixed.

1. Use llvm::tool_output_file instead of llvm::raw_stream. The former
can automatically deleted itself from filesystem once the compilation failed.
2. Fix -M bug which causes segfault previously.

llvm-rs-cc.cpp

diff --git a/llvm-rs-cc.cpp b/llvm-rs-cc.cpp
index 03fdd45..ec6362e 100644
--- a/llvm-rs-cc.cpp
+++ b/llvm-rs-cc.cpp
@@ -205,7 +205,9 @@
       }
     }
 
-    if (Opts.mOutputType != Slang::OT_Bitcode)
+    if (Opts.mOutputDep &&
+        ((Opts.mOutputType != Slang::OT_Bitcode) &&
+         (Opts.mOutputType != Slang::OT_Dependency)))
       Diags.Report(clang::diag::err_drv_argument_not_allowed_with)
           << Args->getLastArg(OPT_M_Group)->getAsString(*Args)
           << Args->getLastArg(OPT_Output_Type_Group)->getAsString(*Args);
@@ -318,6 +320,7 @@
 static bool ExecuteCompilation(SlangRS &Compiler,
                                const char *InputFile,
                                const char *OutputFile,
+                               const char *BCOutputFile,
                                const char *DepOutputFile,
                                const RSCCOptions &Opts) {
   std::string RealPackageName;
@@ -338,8 +341,7 @@
     if (!Compiler.setDepOutput(DepOutputFile))
       return false;
 
-    if (Opts.mOutputType != Slang::OT_Dependency)
-      Compiler.setDepTargetBC(OutputFile);
+    Compiler.setDepTargetBC(BCOutputFile);
     Compiler.setAdditionalDepTargets(Opts.mAdditionalDepTargets);
 
     if (Compiler.generateDepFile() > 0)
@@ -412,7 +414,8 @@
     return 1;
   }
 
-  const char *InputFile, *OutputFile, *DepOutputFile = NULL;
+  const char *InputFile, *OutputFile, *BCOutputFile = NULL,
+             *DepOutputFile = NULL;
   llvm::OwningPtr<SlangRS> Compiler(new SlangRS(Opts.mTriple, Opts.mCPU,
                                                 Opts.mFeatures));
 
@@ -426,10 +429,17 @@
       else
         DepOutputFile = DetermineOutputFile(Opts.mOutputDepDir, InputFile,
                                             Slang::OT_Dependency, SavedStrings);
+
+      if (Opts.mOutputType == Slang::OT_Bitcode)
+        BCOutputFile = OutputFile;
+      else
+        BCOutputFile = DetermineOutputFile(Opts.mOutputDepDir, InputFile,
+                                           Slang::OT_Bitcode, SavedStrings);
     }
     if (!ExecuteCompilation(*Compiler,
                             InputFile,
                             OutputFile,
+                            BCOutputFile,
                             DepOutputFile,
                             Opts)) {
       llvm::errs() << Compiler->getErrorMessage();