diff options
| author | Michael Berg <michael_c_berg@apple.com> | 2018-06-18 18:37:48 +0000 |
|---|---|---|
| committer | Michael Berg <michael_c_berg@apple.com> | 2018-06-18 18:37:48 +0000 |
| commit | cafe947445c2bde7da61ead7ef119b93772e167c (patch) | |
| tree | 6d9926f319419be09bab532a6c69a82c7b232a92 /llvm/lib/CodeGen | |
| parent | 3385caaafd2ca0a85fadc589c0f7b63c9815c911 (diff) | |
| download | bcm5719-llvm-cafe947445c2bde7da61ead7ef119b93772e167c.tar.gz bcm5719-llvm-cafe947445c2bde7da61ead7ef119b93772e167c.zip | |
[NFC] make MIFlag accessor functions consistant with usage model
llvm-svn: 334970
Diffstat (limited to 'llvm/lib/CodeGen')
| -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 e4a3c5b0470..7149903412d 100644 --- a/llvm/lib/CodeGen/MachineInstr.cpp +++ b/llvm/lib/CodeGen/MachineInstr.cpp @@ -382,7 +382,7 @@ MachineInstr::mergeMemRefsWith(const MachineInstr& Other) { return std::make_pair(MemBegin, CombinedNumMemRefs); } -uint8_t MachineInstr::mergeFlagsWith(const MachineInstr &Other) const { +uint16_t MachineInstr::mergeFlagsWith(const MachineInstr &Other) const { // For now, the just return the union of the flags. If the flags get more // complicated over time, we might need more logic here. return getFlags() | Other.getFlags(); |
