patches/bug-30342.diff removed. Applied upstream (3.9.1)

This commit is contained in:
Sylvestre Ledru 2016-11-30 11:06:05 +00:00
parent 94f1b67427
commit ba1e624fc2
3 changed files with 3 additions and 45 deletions

5
debian/changelog vendored
View File

@ -1,9 +1,10 @@
llvm-toolchain-3.9 (1:3.9-7) UNRELEASED; urgency=medium
llvm-toolchain-3.9 (1:3.9~svn288149-1~exp1) UNRELEASED; urgency=medium
* Disable NEON generation on armhf (Closes: #841474, #842142)
Thanks to Pauli for the fix
* patches/bug-30342.diff removed. Applied upstream (3.9.1)
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 13 Nov 2016 13:40:59 +0100
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 29 Nov 2016 18:07:50 +0100
llvm-toolchain-3.9 (1:3.9-6) unstable; urgency=medium

View File

@ -1,42 +0,0 @@
Index: llvm-toolchain-3.9-3.9/test/Transforms/InstCombine/indexed-gep-compares.ll
===================================================================
--- llvm-toolchain-3.9-3.9.orig/test/Transforms/InstCombine/indexed-gep-compares.ll
+++ llvm-toolchain-3.9-3.9/test/Transforms/InstCombine/indexed-gep-compares.ll
@@ -167,4 +167,24 @@ lpad:
; CHECK: ret i32* %[[PTR]]
}
+
+@pr30402 = constant i64 3
+define i1 @test7() {
+entry:
+ br label %bb7
+
+bb7: ; preds = %bb10, %entry-block
+ %phi = phi i64* [ @pr30402, %entry ], [ getelementptr inbounds (i64, i64* @pr30402, i32 1), %bb7 ]
+ %cmp = icmp eq i64* %phi, getelementptr inbounds (i64, i64* @pr30402, i32 1)
+ br i1 %cmp, label %bb10, label %bb7
+
+bb10:
+ ret i1 %cmp
+}
+; CHECK-LABEL: @test7(
+; CHECK: %[[phi:.*]] = phi i64* [ @pr30402, %entry ], [ getelementptr inbounds (i64, i64* @pr30402, i32 1), %bb7 ]
+; CHECK: %[[cmp:.*]] = icmp eq i64* %[[phi]], getelementptr inbounds (i64, i64* @pr30402, i32 1)
+; CHECK: ret i1 %[[cmp]]
+
+
declare i32 @__gxx_personality_v0(...)
Index: llvm-toolchain-3.9-3.9/lib/Transforms/InstCombine/InstCombineCompares.cpp
===================================================================
--- llvm-toolchain-3.9-3.9.orig/lib/Transforms/InstCombine/InstCombineCompares.cpp
+++ llvm-toolchain-3.9-3.9/lib/Transforms/InstCombine/InstCombineCompares.cpp
@@ -634,7 +634,7 @@ static bool canRewriteGEPAsOffset(Value
}
if (!isa<IntToPtrInst>(V) && !isa<PtrToIntInst>(V) &&
- !isa<GEPOperator>(V) && !isa<PHINode>(V))
+ !isa<GetElementPtrInst>(V) && !isa<PHINode>(V))
// We've found some value that we can't explore which is different from
// the base. Therefore we can't do this transformation.
return false;

View File

@ -36,7 +36,6 @@ disable-llvm-symbolizer-test.diff
kfreebsd-support.diff
clang-tidy-run-bin.diff
drop-wrong-hack-arm64.patch
bug-30342.diff
fix-scan-view-path.diff
0011-SimplifyCFG-Hoisting-invalidates-metadata.patch
clang-fix-cmpxchg8-detection-on-i386.patch