diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-11-14 16:47:45 -0800 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-11-15 10:12:39 -0800 |
| commit | 923f52fb3f6670e843ffe0b8da2f2bad898d752c (patch) | |
| tree | a279587ac525162817217dbbe0f01a91893a9d0b /utils/TableGen/CodeEmitterGen.cpp | |
| parent | f4099a3c92570a80cd9a3850cda598c5ea446b96 (diff) | |
| parent | 08e9cb46feb0c8e08e3d309a0f9fd75a04ca54fb (diff) | |
Merge commit '08e9cb46feb0c8e08e3d309a0f9fd75a04ca54fb'
(svn r167699, also the 3.2 branch point)
Conflicts:
lib/Target/X86/X86Subtarget.cpp
Diffstat (limited to 'utils/TableGen/CodeEmitterGen.cpp')
| -rw-r--r-- | utils/TableGen/CodeEmitterGen.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/utils/TableGen/CodeEmitterGen.cpp b/utils/TableGen/CodeEmitterGen.cpp index e60aec9568..3e4f626d48 100644 --- a/utils/TableGen/CodeEmitterGen.cpp +++ b/utils/TableGen/CodeEmitterGen.cpp @@ -134,10 +134,13 @@ AddCodeToMergeInOperand(Record *R, BitsInit *BI, const std::string &VarName, assert(!CGI.Operands.isFlatOperandNotEmitted(OpIdx) && "Explicitly used operand also marked as not emitted!"); } else { + unsigned NumberOps = CGI.Operands.size(); /// If this operand is not supposed to be emitted by the /// generated emitter, skip it. - while (CGI.Operands.isFlatOperandNotEmitted(NumberedOp)) + while (NumberedOp < NumberOps && + CGI.Operands.isFlatOperandNotEmitted(NumberedOp)) ++NumberedOp; + OpIdx = NumberedOp++; } |