[SystemZ] Fix regression when handling conditional calls

[• zhanjunl]

Summary

A regression showed up in node.js when handling conditional calls.
Fix the regression by recognizing external symbols as a possible operand type in CallJG.

[• koriakin]

Thanks for fixing this! Looks OK, but ISTM the whole thing could be avoided by just doing addOperand instead of the more specific variants?

lib/Target/SystemZ/SystemZInstrInfo.cpp

626 ↗

(On Diff #62900)

nit: MachineInstrBuilder MIB(*MI.getParent()->getParent(), MI); would be shorter

631 ↗

(On Diff #62900)

Shouldn't it be enough to just addOperand(FirstOp)?

[• zhanjunl]

Hmm, you're right, didn't notice there was an addOperand API for the builder. I've updated the diff to use addOperand instead of the specific variants.

[• koriakin]

A testcase would be nice, otherwise LGTM.

llvm/trunk/lib/Target/SystemZ/SystemZInstrInfo.cpp

bool SystemZInstrInfo::PredicateInstruction(
   if (Opcode == SystemZ::Return) {
     MI.setDesc(get(SystemZ::CondReturn));
     MachineInstrBuilder(*MI.getParent()->getParent(), MI)
       .addImm(CCValid).addImm(CCMask)
       .addReg(SystemZ::CC, RegState::Implicit);
     return true;
   }
   if (Opcode == SystemZ::CallJG) {
-    const GlobalValue *Global = MI.getOperand(0).getGlobal();
+    MachineOperand FirstOp = MI.getOperand(0);
     const uint32_t *RegMask = MI.getOperand(1).getRegMask();
     MI.RemoveOperand(1);
     MI.RemoveOperand(0);
     MI.setDesc(get(SystemZ::CallBRCL));
     MachineInstrBuilder(*MI.getParent()->getParent(), MI)
       .addImm(CCValid).addImm(CCMask)
-      .addGlobalAddress(Global)
+      .addOperand(FirstOp)
       .addRegMask(RegMask)
       .addReg(SystemZ::CC, RegState::Implicit);
     return true;
   }
   if (Opcode == SystemZ::CallBR) {
     const uint32_t *RegMask = MI.getOperand(0).getRegMask();
     MI.RemoveOperand(0);
     MI.setDesc(get(SystemZ::CallBCR));