From ec17920da1dacd4a6ee373f2bc3918b8cb63b28e Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Tue, 8 May 2018 22:58:35 +0000 Subject: [globalisel] Correct r331816 to check the opcode before calling getOperand(). Fix a silly mistake in my pre-commit changes for r331816. It should check what opcode the insn is before extracting the operands. NFC at the moment since the caller already checked the opcode. llvm-svn: 331820 --- llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp') diff --git a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp index 25b40da..da797ee 100644 --- a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp +++ b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp @@ -37,14 +37,14 @@ bool CombinerHelper::tryCombineCopy(MachineInstr &MI) { } bool CombinerHelper::tryCombineExtendingLoads(MachineInstr &MI) { - unsigned DstReg = MI.getOperand(0).getReg(); - unsigned SrcReg = MI.getOperand(1).getReg(); - if (MI.getOpcode() != TargetOpcode::G_ANYEXT && MI.getOpcode() != TargetOpcode::G_SEXT && MI.getOpcode() != TargetOpcode::G_ZEXT) return false; + unsigned DstReg = MI.getOperand(0).getReg(); + unsigned SrcReg = MI.getOperand(1).getReg(); + LLT DstTy = MRI.getType(DstReg); if (!DstTy.isScalar()) return false; @@ -69,5 +69,5 @@ bool CombinerHelper::tryCombineExtendingLoads(MachineInstr &MI) { bool CombinerHelper::tryCombine(MachineInstr &MI) { if (tryCombineCopy(MI)) return true; - return tryCombineExtendingLoads(MI);; + return tryCombineExtendingLoads(MI); } -- cgit v1.1