diff options
author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2013-01-10 18:42:44 +0000 |
---|---|---|
committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2013-01-10 18:42:44 +0000 |
commit | 4aebce83212d7271454c8767085645fe11054b44 (patch) | |
tree | 2756929b0903b8ed95bbc7e5cde2dc57980a3bb5 /include/llvm/CodeGen/MachineInstr.h | |
parent | 5e1b31bf5588cd9ea0b16e94fcc1d908e40027e2 (diff) | |
download | llvm-4aebce83212d7271454c8767085645fe11054b44.tar.gz llvm-4aebce83212d7271454c8767085645fe11054b44.tar.bz2 llvm-4aebce83212d7271454c8767085645fe11054b44.tar.xz |
Allow hasProperty() to be called on bundle-internal instructions.
When calling hasProperty() on an instruction inside a bundle, it should
always behave as if IgnoreBundle was passed, and just return properties
for the current instruction.
Only attempt to aggregate bundle properties whan asked about the bundle
header.
The assertion fires on existing ARM test cases without this fix.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@172082 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/CodeGen/MachineInstr.h')
-rw-r--r-- | include/llvm/CodeGen/MachineInstr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h index 3d2c61761c..17eeb94e3f 100644 --- a/include/llvm/CodeGen/MachineInstr.h +++ b/include/llvm/CodeGen/MachineInstr.h @@ -313,11 +313,11 @@ public: /// The second argument indicates whether the query should look inside /// instruction bundles. bool hasProperty(unsigned MCFlag, QueryType Type = AnyInBundle) const { - // Inline the fast path. - if (Type == IgnoreBundle || !isBundled()) + // Inline the fast path for unbundled or bundle-internal instructions. + if (Type == IgnoreBundle || !isBundled() || isBundledWithPred()) return getDesc().getFlags() & (1 << MCFlag); - // If we have a bundle, take the slow path. + // If this is the first instruction in a bundle, take the slow path. return hasPropertyInBundle(1 << MCFlag, Type); } |