Import Clang r73340.

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/Frontend/Backend.cpp b/lib/Frontend/Backend.cpp
index 9560b61..d8f8625 100644
--- a/lib/Frontend/Backend.cpp
+++ b/lib/Frontend/Backend.cpp
@@ -272,9 +272,13 @@ void BackendConsumer::CreatePasses() {
   llvm::Pass *InliningPass = 0;
   switch (CompileOpts.Inlining) {
   case CompileOptions::NoInlining: break;
-  case CompileOptions::NormalInlining:
-    InliningPass = createFunctionInliningPass();      // Inline small functions
+  case CompileOptions::NormalInlining: {
+    // Inline small functions
+    unsigned Threshold = (CompileOpts.OptimizeSize ||
+                          CompileOpts.OptimizationLevel < 3) ? 50 : 200;
+    InliningPass = createFunctionInliningPass(Threshold);
     break;
+  }
   case CompileOptions::OnlyAlwaysInlining:
     InliningPass = createAlwaysInlinerPass();         // Respect always_inline
     break;