[llvm-commits] [llvm] r48509 - in /llvm/trunk: lib/Analysis/IPA/Andersens.cpp test/Analysis/Andersens/modreftest2.ll

[Daniel Berlin]

Author: dannyb
Date: Tue Mar 18 17:22:53 2008
New Revision: 48509

URL: http://llvm.org/viewvc/llvm-project?rev=48509&view=rev
Log:
Fix PR 2160 by making sure arguments to external functions get marked as pointing to anything

Added:
    llvm/trunk/test/Analysis/Andersens/modreftest2.ll
Modified:
    llvm/trunk/lib/Analysis/IPA/Andersens.cpp

Modified: llvm/trunk/lib/Analysis/IPA/Andersens.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/Andersens.cpp?rev=48509&r1=48508&r2=48509&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/IPA/Andersens.cpp (original)
+++ llvm/trunk/lib/Analysis/IPA/Andersens.cpp Tue Mar 18 17:22:53 2008
@@ -647,9 +647,13 @@
 
       if (N1->PointsTo->empty())
         return NoModRef;
-
+#if FULL_UNIVERSAL
+      if (!UniversalSet->PointsTo->test(FindNode(getNode(P))))
+        return NoModRef;  // Universal set does not contain P
+#else
       if (!N1->PointsTo->test(UniversalSet))
         return NoModRef;  // P doesn't point to the universal set.
+#endif
     }
 
   return AliasAnalysis::getModRefInfo(CS, P, Size);
@@ -1266,29 +1270,43 @@
   }
 
   CallSite::arg_iterator ArgI = CS.arg_begin(), ArgE = CS.arg_end();
+  bool external = !F ||  F->isDeclaration();
   if (F) {
     // Direct Call
     Function::arg_iterator AI = F->arg_begin(), AE = F->arg_end();
-    for (; AI != AE && ArgI != ArgE; ++AI, ++ArgI)
-      if (isa<PointerType>(AI->getType())) {
-        if (isa<PointerType>((*ArgI)->getType())) {
-          // Copy the actual argument into the formal argument.
-          Constraints.push_back(Constraint(Constraint::Copy, getNode(AI),
-                                           getNode(*ArgI)));
-        } else {
-          Constraints.push_back(Constraint(Constraint::Copy, getNode(AI),
-                                           UniversalSet));
-        }
-      } else if (isa<PointerType>((*ArgI)->getType())) {
+    for (; AI != AE && ArgI != ArgE; ++AI, ++ArgI) 
+      {
+#if !FULL_UNIVERSAL
+        if (external && isa<PointerType>((*ArgI)->getType())) 
+          {
+            // Add constraint that ArgI can now point to anything due to
+            // escaping, as can everything it points to. The second portion of
+            // this should be taken care of by universal = *universal
+            Constraints.push_back(Constraint(Constraint::Copy,
+                                             getNode(*ArgI),
+                                             UniversalSet));
+          }
+#endif
+        if (isa<PointerType>(AI->getType())) {
+          if (isa<PointerType>((*ArgI)->getType())) {
+            // Copy the actual argument into the formal argument.
+            Constraints.push_back(Constraint(Constraint::Copy, getNode(AI),
+                                             getNode(*ArgI)));
+          } else {
+            Constraints.push_back(Constraint(Constraint::Copy, getNode(AI),
+                                             UniversalSet));
+          }
+        } else if (isa<PointerType>((*ArgI)->getType())) {
 #if FULL_UNIVERSAL
-        Constraints.push_back(Constraint(Constraint::Copy,
-                                         UniversalSet,
-                                         getNode(*ArgI)));
+          Constraints.push_back(Constraint(Constraint::Copy,
+                                           UniversalSet,
+                                           getNode(*ArgI)));
 #else
-        Constraints.push_back(Constraint(Constraint::Copy,
-                                         getNode(*ArgI),
-                                         UniversalSet));
+          Constraints.push_back(Constraint(Constraint::Copy,
+                                           getNode(*ArgI),
+                                           UniversalSet));
 #endif
+        }
       }
   } else {
     //Indirect Call

Added: llvm/trunk/test/Analysis/Andersens/modreftest2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/Andersens/modreftest2.ll?rev=48509&view=auto

==============================================================================
--- llvm/trunk/test/Analysis/Andersens/modreftest2.ll (added)
+++ llvm/trunk/test/Analysis/Andersens/modreftest2.ll Tue Mar 18 17:22:53 2008
@@ -0,0 +1,14 @@
+; RUN: llvm-as < %s | opt -anders-aa -gvn | llvm-dis \  
+; RUN: | not grep {ret i32 undef}
+
+;; From PR 2160
+declare void @f(i32*)
+
+define i32 @g() {
+entry:
+      %tmp = alloca i32               ; <i32*> [#uses=2]
+	call void @f( i32* %tmp )
+	%tmp2 = load i32* %tmp          ; <i32> [#uses=1]
+	ret i32 %tmp2
+}
+