Obey the FIXMES!

 - Resume running the always inliner pass always now that LLVM has
   been improved and functions with debug info can be inlined.
 - Remove unused header.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59223 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 1 insertions, 5 deletions

diff --git a/Driver/Backend.cpp b/Driver/Backend.cpp
index aad2d04714..51613994ca 100644
--- a/Driver/Backend.cpp
+++ b/Driver/Backend.cpp
@@ -35,7 +35,6 @@
 #include "llvm/Target/TargetMachineRegistry.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/IPO.h"
-#include <fstream> // FIXME: Remove
 
 using namespace clang;
 using namespace llvm;
@@ -308,10 +307,7 @@ void BackendConsumer::CreatePasses() {
     if (CompileOpts.OptimizationLevel > 1 && CompileOpts.UnitAtATime)
       PM->add(createConstantMergePass());         // Merge dup global constants 
   } else {
-    // FIXME: Remove this once LLVM doesn't break when inlining
-    // functions with debug info.
-    if (!GenerateDebugInfo)
-      PM->add(createAlwaysInlinerPass());  
+    PM->add(createAlwaysInlinerPass());  
   }
 }