diff options
| author | Sven van Haastregt <sven.vanhaastregt@arm.com> | 2018-09-06 10:25:59 +0000 |
|---|---|---|
| committer | Sven van Haastregt <sven.vanhaastregt@arm.com> | 2018-09-06 10:25:59 +0000 |
| commit | abe3295cbdf7234c9417003752801b380d2990e1 (patch) | |
| tree | 923de589ae6572919962968880326804311eabfa /llvm/lib/CodeGen/MachineInstr.cpp | |
| parent | ee65d5732164231e750d29a5ce63f04b1daa7eb4 (diff) | |
| download | bcm5719-llvm-abe3295cbdf7234c9417003752801b380d2990e1.tar.gz bcm5719-llvm-abe3295cbdf7234c9417003752801b380d2990e1.zip | |
Fix argument type in MachineInstr::hasPropertyInBundle
The MCID::Flag enumeration now has more than 32 items, this means that
the hasPropertyBundle argument 'Mask' can overflow.
This patch changes the argument to be 64 bits instead.
Patch by Mikael Nilsson.
Differential Revision: https://reviews.llvm.org/D51596
llvm-svn: 341536
Diffstat (limited to 'llvm/lib/CodeGen/MachineInstr.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/MachineInstr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/MachineInstr.cpp b/llvm/lib/CodeGen/MachineInstr.cpp index d004fa9b76a..4c0d53ce9aa 100644 --- a/llvm/lib/CodeGen/MachineInstr.cpp +++ b/llvm/lib/CodeGen/MachineInstr.cpp @@ -517,7 +517,7 @@ uint16_t MachineInstr::mergeFlagsWith(const MachineInstr &Other) const { return getFlags() | Other.getFlags(); } -bool MachineInstr::hasPropertyInBundle(unsigned Mask, QueryType Type) const { +bool MachineInstr::hasPropertyInBundle(uint64_t Mask, QueryType Type) const { assert(!isBundledWithPred() && "Must be called on bundle header"); for (MachineBasicBlock::const_instr_iterator MII = getIterator();; ++MII) { if (MII->getDesc().getFlags() & Mask) { |
