Avoid bad assertion

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4918 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/Printer.cpp b/lib/Target/X86/Printer.cpp
index 620605948661edc6a43a2ba984cbb472b5e25d6f..ae14e41d731e4ded4ac2b2579c9423deb1deb8b0 100644 (file)
--- a/lib/Target/X86/Printer.cpp
+++ b/lib/Target/X86/Printer.cpp
@@ -183,7 +183,7 @@ void X86InstrInfo::print(const MachineInstr *MI, std::ostream &O,
     assert(isReg(MI->getOperand(0)) &&
            (MI->getNumOperands() == 1 || 
             (MI->getNumOperands() == 2 &&
-             (MI->getOperand(1).getVRegValue() ||
+             (MI->getOperand(1).getVRegValueOrNull() ||
               isImmediate(MI->getOperand(1))))) &&
            "Illegal form for AddRegFrm instruction!");
 

diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp
index 620605948661edc6a43a2ba984cbb472b5e25d6f..ae14e41d731e4ded4ac2b2579c9423deb1deb8b0 100644 (file)
--- a/lib/Target/X86/X86AsmPrinter.cpp
+++ b/lib/Target/X86/X86AsmPrinter.cpp
@@ -183,7 +183,7 @@ void X86InstrInfo::print(const MachineInstr *MI, std::ostream &O,
     assert(isReg(MI->getOperand(0)) &&
            (MI->getNumOperands() == 1 || 
             (MI->getNumOperands() == 2 &&
-             (MI->getOperand(1).getVRegValue() ||
+             (MI->getOperand(1).getVRegValueOrNull() ||
               isImmediate(MI->getOperand(1))))) &&
            "Illegal form for AddRegFrm instruction!");