diff options
| -rw-r--r-- | lib/Transforms/InstCombine/InstCombineCompares.cpp | 10 | ||||
| -rw-r--r-- | test/Transforms/InstCombine/load-cmp.ll | 66 |
2 files changed, 74 insertions, 2 deletions
diff --git a/lib/Transforms/InstCombine/InstCombineCompares.cpp b/lib/Transforms/InstCombine/InstCombineCompares.cpp index 4ac4753b05..93466ead42 100644 --- a/lib/Transforms/InstCombine/InstCombineCompares.cpp +++ b/lib/Transforms/InstCombine/InstCombineCompares.cpp @@ -226,7 +226,8 @@ static void ComputeUnsignedMinMaxValuesFromKnownBits(const APInt &KnownZero, Instruction *InstCombiner:: FoldCmpLoadFromIndexedGlobal(GetElementPtrInst *GEP, GlobalVariable *GV, CmpInst &ICI, ConstantInt *AndCst) { - if (!GEP->isInBounds()) + // We need TD information to know the pointer size unless this is inbounds. + if (!GEP->isInBounds() && TD == 0) return 0; Constant *Init = GV->getInitializer(); @@ -390,6 +391,13 @@ FoldCmpLoadFromIndexedGlobal(GetElementPtrInst *GEP, GlobalVariable *GV, // order the state machines in complexity of the generated code. Value *Idx = GEP->getOperand(2); + // If the index is larger than the pointer size of the target, truncate the + // index down like the GEP would do implicitly. We don't have to do this for + // an inbounds GEP because the index can't be out of range. + if (!GEP->isInBounds() && + Idx->getType()->getPrimitiveSizeInBits() > TD->getPointerSizeInBits()) + Idx = Builder->CreateTrunc(Idx, TD->getIntPtrType(Idx->getContext())); + // If the comparison is only true for one or two elements, emit direct // comparisons. if (SecondTrueElement != Overdefined) { diff --git a/test/Transforms/InstCombine/load-cmp.ll b/test/Transforms/InstCombine/load-cmp.ll index a69283cc14..27ee2e3881 100644 --- a/test/Transforms/InstCombine/load-cmp.ll +++ b/test/Transforms/InstCombine/load-cmp.ll @@ -39,7 +39,21 @@ define i1 @test1_noinbounds(i32 %X) { ; NODL-NEXT: %P = getelementptr [10 x i16]* @G16, i32 0, i32 %X ; P32-LABEL: @test1_noinbounds( -; P32-NEXT: %P = getelementptr [10 x i16]* @G16, i32 0, i32 %X +; P32-NEXT: %R = icmp eq i32 %X, 9 +; P32-NEXT: ret i1 %R +} + +define i1 @test1_noinbounds_i64(i64 %X) { + %P = getelementptr [10 x i16]* @G16, i64 0, i64 %X + %Q = load i16* %P + %R = icmp eq i16 %Q, 0 + ret i1 %R +; NODL-LABEL: @test1_noinbounds_i64( +; NODL-NEXT: %P = getelementptr [10 x i16]* @G16, i64 0, i64 %X + +; P32-LABEL: @test1_noinbounds_i64( +; P32: %R = icmp eq i32 %1, 9 +; P32-NEXT: ret i1 %R } define i1 @test2(i32 %X) { @@ -249,6 +263,19 @@ define i1 @test10_struct_i64(i64 %x){ ret i1 %r } +define i1 @test10_struct_noinbounds_i16(i16 %x) { +; NODL-LABEL: @test10_struct_noinbounds_i16( +; NODL: getelementptr %Foo* @GS, i16 %x, i32 0 + +; P32-LABEL: @test10_struct_noinbounds_i16( +; P32: %1 = sext i16 %x to i32 +; P32: getelementptr %Foo* @GS, i32 %1, i32 0 + %p = getelementptr %Foo* @GS, i16 %x, i32 0 + %q = load i32* %p + %r = icmp eq i32 %q, 0 + ret i1 %r +} + define i1 @test10_struct_arr(i32 %x) { ; NODL-LABEL: @test10_struct_arr( ; NODL-NEXT: %r = icmp ne i32 %x, 1 @@ -263,6 +290,18 @@ define i1 @test10_struct_arr(i32 %x) { ret i1 %r } +define i1 @test10_struct_arr_noinbounds(i32 %x) { +; NODL-LABEL: @test10_struct_arr_noinbounds( +; NODL-NEXT %p = getelementptr [4 x %Foo]* @GStructArr, i32 0, i32 %x, i32 2 + +; P32-LABEL: @test10_struct_arr_noinbounds( +; P32-NEXT %p = getelementptr [4 x %Foo]* @GStructArr, i32 0, i32 %x, i32 2 + %p = getelementptr [4 x %Foo]* @GStructArr, i32 0, i32 %x, i32 2 + %q = load i32* %p + %r = icmp eq i32 %q, 9 + ret i1 %r +} + define i1 @test10_struct_arr_i16(i16 %x) { ; NODL-LABEL: @test10_struct_arr_i16( ; NODL-NEXT: %r = icmp ne i16 %x, 1 @@ -292,3 +331,28 @@ define i1 @test10_struct_arr_i64(i64 %x) { ret i1 %r } +define i1 @test10_struct_arr_noinbounds_i16(i16 %x) { +; NODL-LABEL: @test10_struct_arr_noinbounds_i16( +; NODL-NEXT: %p = getelementptr [4 x %Foo]* @GStructArr, i32 0, i16 %x, i32 2 + +; P32-LABEL: @test10_struct_arr_noinbounds_i16( +; P32-NEXT: %r = icmp ne i16 %x, 1 + %p = getelementptr [4 x %Foo]* @GStructArr, i32 0, i16 %x, i32 2 + %q = load i32* %p + %r = icmp eq i32 %q, 9 + ret i1 %r +} + +define i1 @test10_struct_arr_noinbounds_i64(i64 %x) { +; FIXME: Should be no trunc? +; NODL-LABEL: @test10_struct_arr_noinbounds_i64( +; NODL-NEXT: %p = getelementptr [4 x %Foo]* @GStructArr, i32 0, i64 %x, i32 2 + +; P32-LABEL: @test10_struct_arr_noinbounds_i64( +; P32: %r = icmp ne i32 %1, 1 +; P32-NEXT: ret i1 %r + %p = getelementptr [4 x %Foo]* @GStructArr, i32 0, i64 %x, i32 2 + %q = load i32* %p + %r = icmp eq i32 %q, 9 + ret i1 %r +} |