[llvm-branch-commits] [llvm-branch] r72553 - /llvm/branches/Apple/Bender/lib/Target/ARM/ARMISelLowering.cpp

[Bill Wendling]

Author: void
Date: Thu May 28 18:22:13 2009
New Revision: 72553

URL: http://llvm.org/viewvc/llvm-project?rev=72553&view=rev
Log:
--- Merging r72037 into '.':
U    lib/Target/ARM/ARMISelLowering.cpp

Fix pr4202: Disable CodePlacementOpt for ARM.  The ARMConstantIslandPass has
to run last because it needs to know the exact size and position of every
basic block.  Currently CodePlacementOpt is set up to run last.  It might be
worthwhile to investigate reordering these passes, but for now, let's just
make it work.

Modified:
    llvm/branches/Apple/Bender/lib/Target/ARM/ARMISelLowering.cpp

Modified: llvm/branches/Apple/Bender/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender/lib/Target/ARM/ARMISelLowering.cpp?rev=72553&r1=72552&r2=72553&view=diff

==============================================================================
--- llvm/branches/Apple/Bender/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/branches/Apple/Bender/lib/Target/ARM/ARMISelLowering.cpp Thu May 28 18:22:13 2009
@@ -288,7 +288,10 @@
   setIfCvtDupBlockSizeLimit(Subtarget->isThumb() ? 0 : 2);
 
   maxStoresPerMemcpy = 1;   //// temporary - rewrite interface to use type
-  benefitFromCodePlacementOpt = true;
+  // Do not enable CodePlacementOpt for now: it currently runs after the
+  // ARMConstantIslandPass and messes up branch relaxation and placement
+  // of constant islands.
+  // benefitFromCodePlacementOpt = true;
 }
 
 const char *ARMTargetLowering::getTargetNodeName(unsigned Opcode) const {