Fix recursive type

Author: wsmoses

enzyme/Enzyme/TypeAnalysis/TypeAnalysis.cpp

@@ -186,7 +186,9 @@ TypeAnalyzer::TypeAnalyzer(
 }
 
 /// Given a constant value, deduce any type information applicable
-TypeTree getConstantAnalysis(Constant *Val, TypeAnalyzer &TA) {
+TypeTree
+getConstantAnalysis(Constant *Val, TypeAnalyzer &TA,
+                    SmallPtrSetImpl<GlobalVariable *> *seen = nullptr) {
   auto &DL = TA.fntypeinfo.Function->getParent()->getDataLayout();
   // Undefined value is an anything everywhere
   if (isa<UndefValue>(Val) || isa<ConstantAggregateZero>(Val)) {
@@ -238,9 +240,10 @@ TypeTree getConstantAnalysis(Constant *Val, TypeAnalyzer &TA) {
 
       int Off = (int)ai.getLimitedValue();
 
-      Result |= getConstantAnalysis(Op, TA).ShiftIndices(DL, /*init offset*/ 0,
-                                                         /*maxSize*/ ObjSize,
-                                                         /*addOffset*/ Off);
+      Result |= getConstantAnalysis(Op, TA, seen)
+                    .ShiftIndices(DL, /*init offset*/ 0,
+                                  /*maxSize*/ ObjSize,
+                                  /*addOffset*/ Off);
       Off += ObjSize;
     }
     if (TA.fntypeinfo.Function->getParent()->getDataLayout().getTypeSizeInBits(
@@ -284,9 +287,10 @@ TypeTree getConstantAnalysis(Constant *Val, TypeAnalyzer &TA) {
 
       int Off = (int)ai.getLimitedValue();
 
-      Result |= getConstantAnalysis(Op, TA).ShiftIndices(DL, /*init offset*/ 0,
-                                                         /*maxSize*/ ObjSize,
-                                                         /*addOffset*/ Off);
+      Result |= getConstantAnalysis(Op, TA, seen)
+                    .ShiftIndices(DL, /*init offset*/ 0,
+                                  /*maxSize*/ ObjSize,
+                                  /*addOffset*/ Off);
     }
     if (TA.fntypeinfo.Function->getParent()->getDataLayout().getTypeSizeInBits(
             CD->getType()) >= 16) {
@@ -334,10 +338,10 @@ TypeTree getConstantAnalysis(Constant *Val, TypeAnalyzer &TA) {
     if (CE->isCast()) {
       if (CE->getType()->isPointerTy() && isa<ConstantInt>(CE->getOperand(0)))
         return TypeTree(BaseType::Anything).Only(-1);
-      return getConstantAnalysis(CE->getOperand(0), TA);
+      return getConstantAnalysis(CE->getOperand(0), TA, seen);
     }
     if (CE->isGEPWithNoNotionalOverIndexing()) {
-      auto gepData0 = getConstantAnalysis(CE->getOperand(0), TA).Data0();
+      auto gepData0 = getConstantAnalysis(CE->getOperand(0), TA, seen).Data0();
 
       auto g2 = cast<GetElementPtrInst>(CE->getAsInstruction());
 #if LLVM_VERSION_MAJOR > 6
@@ -380,10 +384,16 @@ TypeTree getConstantAnalysis(Constant *Val, TypeAnalyzer &TA) {
   }
 
   if (auto GV = dyn_cast<GlobalVariable>(Val)) {
+    if (seen && seen->count(GV))
+      return TypeTree();
     // A fixed constant global is a pointer to its initializer
     if (GV->isConstant() && GV->hasInitializer()) {
+      SmallPtrSet<GlobalVariable *, 2> seen2;
+      if (seen)
+        seen2.insert(seen->begin(), seen->end());
+      seen2.insert(GV);
       TypeTree Result = ConcreteType(BaseType::Pointer);
-      Result |= getConstantAnalysis(GV->getInitializer(), TA);
+      Result |= getConstantAnalysis(GV->getInitializer(), TA, &seen2);
       return Result.Only(-1);
     }
     if (GV->getName() == "__cxa_thread_atexit_impl") {
@@ -998,8 +1008,6 @@ void TypeAnalyzer::visitConstantExpr(ConstantExpr &CE) {
           pointerData0.ShiftIndices(DL, /*init offset*/ 0, /*max size*/ -1,
                                     /*new offset*/ off);
       result.insert({}, BaseType::Pointer);
-      llvm::errs() << "CE: " << CE << " pdata0: " << pointerData0.str()
-                   << " off: " << off << " res: " << result.str() << "\n";
       updateAnalysis(CE.getOperand(0), result.Only(-1), &CE);
     }
     return;

enzyme/test/TypeAnalysis/recurglobal.ll

@@ -0,0 +1,46 @@
+; RUN: %opt < %s %loadEnzyme -print-type-analysis -type-analysis-func=callee -o /dev/null | FileCheck %s
+
+
+source_filename = "Awesome.bc"
+target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx11.0.0"
+
+%TSf = type <{ float }>
+%TSi = type <{ i64 }>
+%swift.type_descriptor = type opaque
+%swift.type = type { i64 }
+%swift.protocol_conformance_descriptor = type { i32, i32, i32, i32 }
+%Ts26DefaultStringInterpolationV = type <{ %TSS }>
+%TSS = type <{ %Ts11_StringGutsV }>
+%Ts11_StringGutsV = type <{ %Ts13_StringObjectV }>
+%Ts13_StringObjectV = type <{ %Ts6UInt64V, %swift.bridge* }>
+%Ts6UInt64V = type <{ i64 }>
+%swift.bridge = type opaque
+%swift.refcounted = type { %swift.type*, i64 }
+%swift.opaque = type opaque
+
+@"$s7Awesome5valueSfvp" = hidden global %TSf zeroinitializer, align 4
+@"$s7Awesome11derivativesSf_Sftvp" = hidden global <{ %TSf, %TSf }> zeroinitializer, align 4
+@"$s7Awesome3sumSfvp" = hidden global %TSf zeroinitializer, align 4
+@"$s7Awesome10iterationsSivp" = hidden local_unnamed_addr global %TSi zeroinitializer, align 8
+@"$ss23_ContiguousArrayStorageCMn" = external global %swift.type_descriptor, align 4
+@"got.$ss23_ContiguousArrayStorageCMn" = private unnamed_addr constant %swift.type_descriptor* @"$ss23_ContiguousArrayStorageCMn"
+@"symbolic _____yypG s23_ContiguousArrayStorageC" = linkonce_odr hidden constant <{ i8, i32, [4 x i8], i8 }> <{ i8 2, i32 trunc (i64 sub (i64 ptrtoint (%swift.type_descriptor** @"got.$ss23_ContiguousArrayStorageCMn" to i64), i64 ptrtoint (i32* getelementptr inbounds (<{ i8, i32, [4 x i8], i8 }>, <{ i8, i32, [4 x i8], i8 }>* @"symbolic _____yypG s23_ContiguousArrayStorageC", i32 0, i32 1) to i64)) to i32), [4 x i8] c"yypG", i8 0 }>, section "__TEXT,__swift5_typeref, regular, no_dead_strip", align 2
+@ptr = linkonce_odr hidden global { i32, i32 } { i32 ptrtoint (<{ i8, i32, [4 x i8], i8 }>* @"symbolic _____yypG s23_ContiguousArrayStorageC" to i32), i32 17 }
+
+define void @callee() {
+entry:
+  %loadnotype = load i32, i32* getelementptr inbounds ({ i32, i32 }, { i32, i32 }* @ptr, i64 0, i32 1), align 4
+  ret void
+}
+
+!5 = !{!"omnipotent char", !6, i64 0}
+!6 = !{!"Simple C++ TBAA"}
+!7 = !{!"double", !5, i64 0}
+!8 = !{!7, !7, i64 0}
+
+
+; CHECK: callee - {} |
+; CHECK-NEXT: entry
+; CHECK-NEXT:   %loadnotype = load i32, i32* getelementptr inbounds ({ i32, i32 }, { i32, i32 }* @ptr, i64 0, i32 1), align 4: {}
+; CHECK-NEXT:   ret void: {}