diff --git a/lib/Transforms/IPO/Inliner.cpp b/lib/Transforms/IPO/Inliner.cpp
index 61772651583..c38cf82a692 100644
--- a/lib/Transforms/IPO/Inliner.cpp
+++ b/lib/Transforms/IPO/Inliner.cpp
@@ -192,6 +192,7 @@ bool Inliner::shouldInline(CallSite CS) {
   Function *Fn = CS.getCaller();
   if (Fn && !Fn->isDeclaration() &&
       Fn->hasFnAttr(Attribute::OptimizeForSize) &&
+      InlineLimit.getNumOccurrences() == 0 &&
       InlineThreshold != 50)
     CurrentThreshold = 50;