summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorSjoerd Meijer <sjoerd.meijer@arm.com>2018-02-22 08:41:55 +0000
committerSjoerd Meijer <sjoerd.meijer@arm.com>2018-02-22 08:41:55 +0000
commit9a25247f8059ec2f4ffdb774d5bfb2fe698cfa79 (patch)
tree51b04e83337166e0922083e86b5792a00d1df43c /llvm/lib
parentf98e32cf533b91d4584ddd706adc3e006f3e9e50 (diff)
downloadbcm5719-llvm-9a25247f8059ec2f4ffdb774d5bfb2fe698cfa79.tar.gz
bcm5719-llvm-9a25247f8059ec2f4ffdb774d5bfb2fe698cfa79.zip
Revert r325754 and r325755 (f16 literal pool) because buildbots were unhappy.
llvm-svn: 325756
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Target/ARM/ARMConstantIslandPass.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp b/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
index 46e804ded28..32c88bca186 100644
--- a/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
+++ b/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
@@ -1425,6 +1425,10 @@ void ARMConstantIslands::createNewWater(unsigned CPUserIndex,
assert(!isThumb || getITInstrPredicate(*MI, PredReg) == ARMCC::AL));
NewMBB = splitBlockBeforeInstr(&*MI);
+
+ // 4 byte align the next block after the constant pool when the CPE is a
+ // 16-bit value in ARM mode, and 2 byte for Thumb.
+ NewMBB->setAlignment(isThumb ? 1 : 2);
}
/// handleConstantPoolUser - Analyze the specified user, checking to see if it
@@ -1485,8 +1489,6 @@ bool ARMConstantIslands::handleConstantPoolUser(unsigned CPUserIndex,
// We are adding new water. Update NewWaterList.
NewWaterList.insert(NewIsland);
}
- // Always align the new block because CP entries can be smaller than 4 bytes.
- NewMBB->setAlignment(isThumb ? 1 : 2);
// Remove the original WaterList entry; we want subsequent insertions in
// this vicinity to go after the one we're about to insert. This
OpenPOWER on IntegriCloud