Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: lib/Target/ARM/ARMConstantIslandPass.cpp

Issue 939073008: Rebased PNaCl localmods in LLVM to 223109 (Closed)
Patch Set: undo localmod Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/Target/ARM/ARMCallingConv.td ('k') | lib/Target/ARM/ARMConstantPoolValue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/Target/ARM/ARMConstantIslandPass.cpp
diff --git a/lib/Target/ARM/ARMConstantIslandPass.cpp b/lib/Target/ARM/ARMConstantIslandPass.cpp
index 29405eb65d52757aaa14541ef4adac4d2637e6f3..f1fb9630ad8073a0ce4eb033d6689a2b56b7bae1 100644
--- a/lib/Target/ARM/ARMConstantIslandPass.cpp
+++ b/lib/Target/ARM/ARMConstantIslandPass.cpp
@@ -389,6 +389,8 @@ bool ARMConstantIslands::runOnMachineFunction(MachineFunction &mf) {
AFI = MF->getInfo<ARMFunctionInfo>();
STI = &MF->getTarget().getSubtarget<ARMSubtarget>();
+ if (!STI->useConstIslands()) return false; // @LOCALMOD
+
isThumb = AFI->isThumbFunction();
isThumb1 = AFI->isThumb1OnlyFunction();
isThumb2 = AFI->isThumb2Function();
« no previous file with comments | « lib/Target/ARM/ARMCallingConv.td ('k') | lib/Target/ARM/ARMConstantPoolValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698