diff options
author | Evan Cheng <evan.cheng@apple.com> | 2012-10-11 00:15:48 +0000 |
---|---|---|
committer | Evan Cheng <evan.cheng@apple.com> | 2012-10-11 00:15:48 +0000 |
commit | a395f4df5b6d9c2feb661091ca75be2500d07cb0 (patch) | |
tree | f98d61460f8f4c348f7ddcb744a06feb78716ddf /include | |
parent | 6b61491de3f361a149919936e6264eff3746d80b (diff) | |
download | external_llvm-a395f4df5b6d9c2feb661091ca75be2500d07cb0.zip external_llvm-a395f4df5b6d9c2feb661091ca75be2500d07cb0.tar.gz external_llvm-a395f4df5b6d9c2feb661091ca75be2500d07cb0.tar.bz2 |
Change MachineInstrBuilder::addDisp to copy over target flags by default.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165677 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r-- | include/llvm/CodeGen/MachineInstrBuilder.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/llvm/CodeGen/MachineInstrBuilder.h b/include/llvm/CodeGen/MachineInstrBuilder.h index 654361f..7706853 100644 --- a/include/llvm/CodeGen/MachineInstrBuilder.h +++ b/include/llvm/CodeGen/MachineInstrBuilder.h @@ -176,15 +176,24 @@ public: } // Add a displacement from an existing MachineOperand with an added offset. - const MachineInstrBuilder &addDisp(const MachineOperand &Disp, - int64_t off) const { + const MachineInstrBuilder &addDisp(const MachineOperand &Disp, int64_t off, + unsigned char TargetFlags = 0) const { switch (Disp.getType()) { default: llvm_unreachable("Unhandled operand type in addDisp()"); case MachineOperand::MO_Immediate: return addImm(Disp.getImm() + off); - case MachineOperand::MO_GlobalAddress: - return addGlobalAddress(Disp.getGlobal(), Disp.getOffset() + off); + case MachineOperand::MO_GlobalAddress: { + // If caller specifies new TargetFlags then use it, otherwise the + // default behavior is to copy the target flags from the existing + // MachineOperand. This means if the caller wants to clear the + // target flags it needs to do so explicitly. + if (TargetFlags) + return addGlobalAddress(Disp.getGlobal(), Disp.getOffset() + off, + TargetFlags); + return addGlobalAddress(Disp.getGlobal(), Disp.getOffset() + off, + Disp.getTargetFlags()); + } } } }; |