aboutsummaryrefslogtreecommitdiffstats
path: root/lib/CodeGen/DeadMachineInstructionElim.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2015-04-01 22:08:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-01 22:08:43 +0000
commitaa840b12bb733c809e6e05a7f62ba2c24dbe766c (patch)
tree9348fc507292f7e8715d22d64ce5a32131b4f875 /lib/CodeGen/DeadMachineInstructionElim.cpp
parent037f5289474a7ef6c130fa4971973349a0b2ec63 (diff)
parent3fa16bd6062e23bcdb82ed4dd965674792e6b761 (diff)
downloadexternal_llvm-aa840b12bb733c809e6e05a7f62ba2c24dbe766c.zip
external_llvm-aa840b12bb733c809e6e05a7f62ba2c24dbe766c.tar.gz
external_llvm-aa840b12bb733c809e6e05a7f62ba2c24dbe766c.tar.bz2
am 3fa16bd6: Merge "Update aosp/master LLVM for rebase to r230699."
* commit '3fa16bd6062e23bcdb82ed4dd965674792e6b761': Update aosp/master LLVM for rebase to r230699.
Diffstat (limited to 'lib/CodeGen/DeadMachineInstructionElim.cpp')
-rw-r--r--lib/CodeGen/DeadMachineInstructionElim.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/CodeGen/DeadMachineInstructionElim.cpp b/lib/CodeGen/DeadMachineInstructionElim.cpp
index 48213c1..c17a35d 100644
--- a/lib/CodeGen/DeadMachineInstructionElim.cpp
+++ b/lib/CodeGen/DeadMachineInstructionElim.cpp
@@ -59,6 +59,10 @@ bool DeadMachineInstructionElim::isDead(const MachineInstr *MI) const {
if (MI->isInlineAsm())
return false;
+ // Don't delete frame allocation labels.
+ if (MI->getOpcode() == TargetOpcode::FRAME_ALLOC)
+ return false;
+
// Don't delete instructions with side effects.
bool SawStore = false;
if (!MI->isSafeToMove(TII, nullptr, SawStore) && !MI->isPHI())