diff options
| -rw-r--r-- | Driver/Backend.cpp | 8 | ||||
| -rw-r--r-- | Driver/clang.cpp | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Driver/Backend.cpp b/Driver/Backend.cpp index dbe46fcf2f..f16c069497 100644 --- a/Driver/Backend.cpp +++ b/Driver/Backend.cpp @@ -89,9 +89,6 @@ namespace { CodeGenPasses(0), PerModulePasses(0), PerFunctionPasses(0) {} ~BackendConsumer() { - // FIXME: Move out of destructor. - EmitAssembly(); - delete AsmOutStream; delete TheTargetData; delete ModuleProvider; @@ -115,6 +112,11 @@ namespace { virtual void HandleTranslationUnit(TranslationUnit& TU) { Gen->HandleTranslationUnit(TU); + + EmitAssembly(); + // Force a flush here in case we never get released. + if (AsmOutStream) + AsmOutStream->flush(); } virtual void HandleTagDeclDefinition(TagDecl *D) { diff --git a/Driver/clang.cpp b/Driver/clang.cpp index 5fc86a7759..4973a42819 100644 --- a/Driver/clang.cpp +++ b/Driver/clang.cpp @@ -1363,6 +1363,9 @@ static void ProcessInputFile(Preprocessor &PP, PreprocessorFactory &PPF, // files. if (ClearSourceMgr) PP.getSourceManager().clearIDTables(); + + if (DisableFree) + Consumer.take(); } static void ProcessSerializedFile(const std::string& InFile, Diagnostic& Diag, |