Index: utils/TableGen/CodeGenDAGPatterns.cpp
===================================================================
--- utils/TableGen/CodeGenDAGPatterns.cpp
+++ utils/TableGen/CodeGenDAGPatterns.cpp
@@ -1748,15 +1748,18 @@
     for (unsigned i = 0, e = Inst.getNumOperands(); i != e; ++i) {
       Record *OperandNode = Inst.getOperand(i);
 
-      // If the instruction expects a predicate or optional def operand, we
-      // codegen this by setting the operand to it's default value if it has a
-      // non-empty DefaultOps field.
-      if (OperandNode->isSubClassOf("OperandWithDefaultOps") &&
-          !CDP.getDefaultOperand(OperandNode).DefaultOps.empty())
-        continue;
-
       // Verify that we didn't run out of provided operands.
       if (ChildNo >= getNumChildren()) {
+        // If we have advanced past the number of provided operands, check if we
+        // have a default operand that will be acceptable instead.
+
+        // If the instruction expects a predicate or optional def operand, we
+        // codegen this by setting the operand to it's default value if it has a
+        // non-empty DefaultOps field.
+        if (OperandNode->isSubClassOf("OperandWithDefaultOps") &&
+            !CDP.getDefaultOperand(OperandNode).DefaultOps.empty())
+          continue;
+
         emitTooFewOperandsError(TP, getOperator()->getName(), getNumChildren());
         return false;
       }