From ba1e624fc26efb263eb85800efb83103f4e1dd50 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 30 Nov 2016 11:06:05 +0000
Subject: [PATCH] patches/bug-30342.diff removed. Applied upstream (3.9.1)

---
 debian/changelog              |  5 +++--
 debian/patches/bug-30342.diff | 42 -----------------------------------
 debian/patches/series         |  1 -
 3 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 debian/patches/bug-30342.diff

diff --git a/debian/changelog b/debian/changelog
index cfd4c91a..97a7cc6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
diff --git a/debian/patches/bug-30342.diff b/debian/patches/bug-30342.diff
deleted file mode 100644
index a94ecaeb..00000000
--- a/debian/patches/bug-30342.diff
+++ /dev/null
@@ -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;
diff --git a/debian/patches/series b/debian/patches/series
index bdc3eb95..feb40bde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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