2 files changed, 4 insertions, 57 deletions
diff --git a/llvm/test/Transforms/GlobalOpt/integer-bool.ll b/llvm/test/Transforms/GlobalOpt/integer-bool.ll
index fc45c82935d..abf5fdd2ef3 100644
--- a/llvm/test/Transforms/GlobalOpt/integer-bool.ll
+++ b/llvm/test/Transforms/GlobalOpt/integer-bool.ll
@@ -1,21 +1,20 @@
 ; RUN: opt < %s -S -globalopt -instcombine | FileCheck %s
-;; check that global opt annotates loads from global variales that only hold 0 or 1
-;; such that instcombine can optimize accordingly.
+;; check that global opt turns integers that only hold 0 or 1 into bools.
 
 @G = internal addrspace(1) global i32 0
 ; CHECK: @G
 ; CHECK: addrspace(1)
-; CHECK: global i32 0
+; CHECK: global i1 false
 
 define void @set1() {
   store i32 0, i32 addrspace(1)* @G
-; CHECK: store i32 0
+; CHECK: store i1 false
   ret void
 }
 
 define void @set2() {
   store i32 1, i32 addrspace(1)* @G
-; CHECK: store i32 1
+; CHECK: store i1 true
   ret void
 }
 
diff --git a/llvm/test/Transforms/GlobalOpt/twostore-gv-range.ll b/llvm/test/Transforms/GlobalOpt/twostore-gv-range.ll
deleted file mode 100644
index 84629ddb71a..00000000000
--- a/llvm/test/Transforms/GlobalOpt/twostore-gv-range.ll
+++ /dev/null
@@ -1,52 +0,0 @@
-; RUN: opt < %s -S -globalopt | FileCheck %s
-;; check that global opt annotates loads from global variales that have
-;; constant values stored to them.
-
-@G = internal global i32 5
-@H = internal global i32 7
-@I = internal global i32 17
-@J = internal global i32 29
-@K = internal global i32 31
-
-define void @set() {
-  store i32 6, i32* @G
-  store i32 13, i32* @H
-  store i32 16, i32* @I
-  store i32 29, i32* @J
-  store i32 -37, i32* @K
-  ret void
-}
-
-define i32 @getG() {
-; CHECK: %t = load i32* @G, !range [[G:![0-9]+]]
-  %t = load i32* @G
-  ret i32 %t
-}
-define i32 @getH() {
-; CHECK: %t = load i32* @H, !range [[H:![0-9]+]]
-  %t = load i32* @H
-  ret i32 %t
-}
-
-define i32 @getI() {
-; CHECK: %t = load i32* @I, !range [[I:![0-9]+]]
-  %t = load i32* @I
-  ret i32 %t
-}
-
-define i32 @getJ() {
-; CHECK: ret i32 29
-  %t = load i32* @J
-  ret i32 %t
-}
-
-define i32 @getK() {
-; CHECK: %t = load i32* @K, !range [[K:![0-9]+]]
-  %t = load i32* @K
-  ret i32 %t
-}
-
-; CHECK: [[G]] = metadata !{i32 5, i32 7}
-; CHECK: [[H]] = metadata !{i32 7, i32 8, i32 13, i32 14}
-; CHECK: [[I]] = metadata !{i32 16, i32 18}
-; CHECK: [[K]] = metadata !{i32 -37, i32 -36, i32 31, i32 32}