Merge pull request swiftlang#8340 from rastogishubham/ReplayFixCASIDStable

Fix bug with -fcas-emit-casid-file during replay.

Author: rastogishubham

clang/lib/CodeGen/CodeGenAction.cpp

@@ -1093,8 +1093,11 @@ CodeGenAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) {
         BA == Backend_EmitObj && OutputFile != "-") {
       std::string OutputPathCASIDFile = std::string(OutputFile);
       OutputPathCASIDFile.append(".casid");
-      CasIDOS = CI.createOutputFile(OutputPathCASIDFile, true, true,
-                                    CI.getFrontendOpts().UseTemporary, false);
+      std::error_code EC;
+      CasIDOS = std::make_unique<raw_fd_ostream>(OutputPathCASIDFile, EC);
+      if (EC)
+        CI.getDiagnostics().Report(diag::err_fe_unable_to_open_output)
+            << EC.message();
     }
   }
 

clang/test/CAS/mccas-emit-casid-file.c

@@ -0,0 +1,16 @@
+// REQUIRES: x86-registered-target
+// RUN: rm -rf %t && mkdir %t
+
+// RUN: %clang -cc1depscan -o %t/args.rsp  -cc1-args -cc1 -triple x86_64-apple-darwin10 \
+// RUN:    -debug-info-kind=standalone -dwarf-version=4 -debugger-tuning=lldb \
+// RUN:    -emit-obj -fcas-backend  -fcas-path %t/cas  -fcas-emit-casid-file %s
+
+// RUN: %clang @%t/args.rsp -o %t/output1.o 
+
+// cat %t/output1.o.casid | FileCheck %s
+
+// CHECK: llvmcas://{{[a-z0-9]+}}
+
+int foo(int x) {
+    return x+1;
+}

llvm/lib/MC/MachOCASWriter.cpp

@@ -80,6 +80,10 @@ uint64_t MachOCASWriter::writeObject(MCAssembler &Asm,
 
     return Error::success();
   };
+
+  if (CasIDOS)
+    writeCASIDBuffer(CASObj.getID(), *CasIDOS);
+
   // If there is a callback, then just hand off the result through callback.
   if (ResultCallBack) {
     cantFail((*ResultCallBack)(CASObj.getID()));
@@ -115,9 +119,6 @@ uint64_t MachOCASWriter::writeObject(MCAssembler &Asm,
   }
   }
 
-  if (CasIDOS)
-    writeCASIDBuffer(CASObj.getID(), *CasIDOS);
-
   return OS.tell() - StartOffset;
 }