summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Voss <matthew.voss@sony.com>2018-06-21 21:43:20 +0000
committerMatthew Voss <matthew.voss@sony.com>2018-06-21 21:43:20 +0000
commit30648ab2333f24e720e9eb5f05f64a8648cd8c16 (patch)
tree16c355e6a95636673982bf3a6c059f8678f2a117
parent0bad3f625e18d1369f180ef7d3d19678a8aa7b17 (diff)
downloadbcm5719-llvm-30648ab2333f24e720e9eb5f05f64a8648cd8c16.tar.gz
bcm5719-llvm-30648ab2333f24e720e9eb5f05f64a8648cd8c16.zip
[GVN] Avoid casting a vector of size less than 8 bits to i8
Summary: A reprise of D25849. This crash was found through fuzzing some time ago and was documented in PR28879. No check for load size has been added due to the following tests: - Transforms/GVN/invariant.group.ll - Transforms/GVN/pr10820.ll These tests expect load sizes that are not a multiple of eight. Thanks to @davide for the original patch. Reviewers: nlopes, davide, RKSimon, reames, efriedma Reviewed By: efriedma Subscribers: davide, llvm-commits, Prazek Differential Revision: https://reviews.llvm.org/D48330 llvm-svn: 335294
-rw-r--r--llvm/lib/Transforms/Utils/VNCoercion.cpp8
-rw-r--r--llvm/test/Transforms/GVN/pr28879.ll34
2 files changed, 41 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Utils/VNCoercion.cpp b/llvm/lib/Transforms/Utils/VNCoercion.cpp
index 5f71bdcf597..948d9bd5baa 100644
--- a/llvm/lib/Transforms/Utils/VNCoercion.cpp
+++ b/llvm/lib/Transforms/Utils/VNCoercion.cpp
@@ -20,8 +20,14 @@ bool canCoerceMustAliasedValueToLoad(Value *StoredVal, Type *LoadTy,
StoredVal->getType()->isStructTy() || StoredVal->getType()->isArrayTy())
return false;
+ uint64_t StoreSize = DL.getTypeSizeInBits(StoredVal->getType());
+
+ // The store size must be byte-aligned to support future type casts.
+ if (llvm::alignTo(StoreSize, 8) != StoreSize)
+ return false;
+
// The store has to be at least as big as the load.
- if (DL.getTypeSizeInBits(StoredVal->getType()) < DL.getTypeSizeInBits(LoadTy))
+ if (StoreSize < DL.getTypeSizeInBits(LoadTy))
return false;
// Don't coerce non-integral pointers to integers or vice versa.
diff --git a/llvm/test/Transforms/GVN/pr28879.ll b/llvm/test/Transforms/GVN/pr28879.ll
new file mode 100644
index 00000000000..ec09080d980
--- /dev/null
+++ b/llvm/test/Transforms/GVN/pr28879.ll
@@ -0,0 +1,34 @@
+; RUN: opt -gvn <%s -S -o - | FileCheck %s
+
+define void @f() {
+entry:
+ %a = alloca <7 x i1>, align 2
+ store <7 x i1> undef, <7 x i1>* %a, align 2
+; CHECK: store <7 x i1> undef, <7 x i1>*
+ %0 = getelementptr inbounds <7 x i1>, <7 x i1>* %a, i64 0, i64 0
+ %val = load i1, i1* %0, align 2
+; CHECK: load i1, i1*
+ br i1 %val, label %cond.true, label %cond.false
+
+cond.true:
+ ret void
+
+cond.false:
+ ret void
+}
+
+define <7 x i1> @g(<7 x i1>* %a) {
+entry:
+ %vec = load <7 x i1>, <7 x i1>* %a
+; CHECK: load <7 x i1>, <7 x i1>*
+ %0 = getelementptr inbounds <7 x i1>, <7 x i1>* %a, i64 0, i64 0
+ %val = load i1, i1* %0, align 2
+; CHECK: load i1, i1*
+ br i1 %val, label %cond.true, label %cond.false
+
+cond.true:
+ ret <7 x i1> %vec
+
+cond.false:
+ ret <7 x i1> <i1 false, i1 false, i1 false, i1 false, i1 false, i1 false, i1 false>
+}
OpenPOWER on IntegriCloud