!fixup fix i32 index width tests, bail out

Author: fhahn

llvm/lib/Analysis/ScalarEvolution.cpp

@@ -1161,10 +1161,7 @@ const SCEV *ScalarEvolution::getLosslessPtrToIntExpr(const SCEV *Op) {
 }
 
 const SCEV *ScalarEvolution::getPtrToAddrExpr(const SCEV *Op) {
-  const SCEV *IntOp = getLosslessPtrToAddrExpr(Op);
-  assert(!isa<SCEVCouldNotCompute>(IntOp) &&
-         "Must be able to losslessly convert PtrToAddr");
-  return IntOp;
+  return getLosslessPtrToAddrExpr(Op);
 }
 
 const SCEV *ScalarEvolution::getPtrToIntExpr(const SCEV *Op, Type *Ty) {

llvm/test/Analysis/ScalarEvolution/ptrtoaddr-i32-index-width.ll

@@ -1,13 +1,13 @@
 ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py
 ; RUN: opt -passes='print<scalar-evolution>' -disable-output %s 2>&1 | FileCheck %s
 
-target datalayout="p64:64:64:32"
+target datalayout="p:64:64:64:32"
 
 define void @ptrtoaddr(ptr %in, ptr %out0) {
 ; CHECK-LABEL: 'ptrtoaddr'
 ; CHECK-NEXT:  Classifying expressions for: @ptrtoaddr
 ; CHECK-NEXT:    %p0 = ptrtoaddr ptr %in to i32
-; CHECK-NEXT:    --> (ptrtoaddr ptr %in to i32) U: full-set S: full-set
+; CHECK-NEXT:    --> %p0 U: full-set S: full-set
 ; CHECK-NEXT:  Determining loop execution counts for: @ptrtoaddr
 ;
   %p0 = ptrtoaddr ptr %in to i32
@@ -19,7 +19,7 @@ define void @ptrtoaddr_as1(ptr addrspace(1) %in, ptr %out0) {
 ; CHECK-LABEL: 'ptrtoaddr_as1'
 ; CHECK-NEXT:  Classifying expressions for: @ptrtoaddr_as1
 ; CHECK-NEXT:    %p0 = ptrtoaddr ptr addrspace(1) %in to i32
-; CHECK-NEXT:    --> (ptrtoaddr ptr addrspace(1) %in to i32) U: full-set S: full-set
+; CHECK-NEXT:    --> %p0 U: full-set S: full-set
 ; CHECK-NEXT:  Determining loop execution counts for: @ptrtoaddr_as1
 ;
   %p0 = ptrtoaddr ptr addrspace(1) %in to i32
@@ -33,7 +33,7 @@ define void @ptrtoaddr_of_bitcast(ptr %in, ptr %out0) {
 ; CHECK-NEXT:    %in_casted = bitcast ptr %in to ptr
 ; CHECK-NEXT:    --> %in U: full-set S: full-set
 ; CHECK-NEXT:    %p0 = ptrtoaddr ptr %in_casted to i32
-; CHECK-NEXT:    --> (ptrtoaddr ptr %in to i32) U: full-set S: full-set
+; CHECK-NEXT:    --> %p0 U: full-set S: full-set
 ; CHECK-NEXT:  Determining loop execution counts for: @ptrtoaddr_of_bitcast
 ;
   %in_casted = bitcast ptr %in to ptr
@@ -46,7 +46,7 @@ define void @ptrtoaddr_of_nullptr(ptr %out0) {
 ; CHECK-LABEL: 'ptrtoaddr_of_nullptr'
 ; CHECK-NEXT:  Classifying expressions for: @ptrtoaddr_of_nullptr
 ; CHECK-NEXT:    %p0 = ptrtoaddr ptr null to i32
-; CHECK-NEXT:    --> 0 U: [0,1) S: [0,1)
+; CHECK-NEXT:    --> %p0 U: full-set S: full-set
 ; CHECK-NEXT:  Determining loop execution counts for: @ptrtoaddr_of_nullptr
 ;
   %p0 = ptrtoaddr ptr null to i32
@@ -60,7 +60,7 @@ define void @ptrtoaddr_of_gep(ptr %in, ptr %out0) {
 ; CHECK-NEXT:    %in_adj = getelementptr inbounds i8, ptr %in, i64 42
 ; CHECK-NEXT:    --> (42 + %in) U: full-set S: full-set
 ; CHECK-NEXT:    %p0 = ptrtoaddr ptr %in_adj to i32
-; CHECK-NEXT:    --> (42 + (ptrtoaddr ptr %in to i32)) U: full-set S: full-set
+; CHECK-NEXT:    --> %p0 U: full-set S: full-set
 ; CHECK-NEXT:  Determining loop execution counts for: @ptrtoaddr_of_gep
 ;
   %in_adj = getelementptr inbounds i8, ptr %in, i64 42