diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2012-12-18 21:36:05 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2012-12-18 21:36:05 +0000 |
| commit | a33f504b3e8a1ad3548e5eb9262774a7587bde69 (patch) | |
| tree | d228d25929853f0af5f365e3eb32a398bcf87aa5 /llvm/lib/CodeGen/MachineInstr.cpp | |
| parent | f1c31911880c32ae99b38906d20c5033d60df009 (diff) | |
| download | bcm5719-llvm-a33f504b3e8a1ad3548e5eb9262774a7587bde69.tar.gz bcm5719-llvm-a33f504b3e8a1ad3548e5eb9262774a7587bde69.zip | |
Don't allow the automatically updated MI flags to be set directly.
The bundle-related MI flags need to be kept in sync with the neighboring
instructions. Don't allow the bulk flag-setting setFlags() function to
change them.
Also don't copy MI flags when cloning an instruction. The clone's bundle
flags will be set when it is explicitly inserted into a bundle.
llvm-svn: 170459
Diffstat (limited to 'llvm/lib/CodeGen/MachineInstr.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/MachineInstr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/MachineInstr.cpp b/llvm/lib/CodeGen/MachineInstr.cpp index f545a9ce56d..2d4392c47db 100644 --- a/llvm/lib/CodeGen/MachineInstr.cpp +++ b/llvm/lib/CodeGen/MachineInstr.cpp @@ -556,8 +556,8 @@ MachineInstr::MachineInstr(MachineFunction &MF, const MachineInstr &MI) for (unsigned i = 0; i != MI.getNumOperands(); ++i) addOperand(MI.getOperand(i)); - // Copy all the flags. - Flags = MI.Flags; + // Copy all the sensible flags. + setFlags(MI.Flags); // Set parent to null. Parent = 0; |
