diff --git a/llvm/lib/Support/CommandLine.cpp b/llvm/lib/Support/CommandLine.cpp
index 09038d3a5f38..b53706f16844 100644
--- a/llvm/lib/Support/CommandLine.cpp
+++ b/llvm/lib/Support/CommandLine.cpp
@@ -335,11 +335,8 @@ void cl::ParseCommandLineOptions(int &argc, char **argv,
                                    " does not require a value!");
       }
       UnboundedFound |= EatsUnboundedNumberOfValues(Opt);
-      
-      if (Opt->getNumOccurrencesFlag() == cl::ZeroOrMore
-          || Opt->getNumOccurrencesFlag() == cl::OneOrMore)
-          HasUnlimitedPositionals = true;
     }
+    HasUnlimitedPositionals = UnboundedFound || ConsumeAfterOpt;
   }
 
   // PositionalVals - A vector of "positional" arguments we accumulate into