Fix for PR1741.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@43326 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 17 insertions, 2 deletions

diff --git a/lib/Analysis/BasicAliasAnalysis.cpp b/lib/Analysis/BasicAliasAnalysis.cpp
index 0181021..d986ade 100644
--- a/lib/Analysis/BasicAliasAnalysis.cpp
+++ b/lib/Analysis/BasicAliasAnalysis.cpp
@@ -339,8 +339,9 @@ BasicAliasAnalysis::alias(const Value *V1, unsigned V1Size,
           
         // Otherwise, nothing is known...
       } else if (O1 != O2) {
-        // If they are two different objects, we know that we have no alias...
-        return NoAlias;
+        if (!isa<Argument>(O1))
+          // If they are two different objects, we know that we have no alias...
+          return NoAlias;
       }
 
       // If they are the same object, they we can look at the indexes.  If they
diff --git a/test/Analysis/BasicAA/2007-10-24-ArgumentsGlobals.ll b/test/Analysis/BasicAA/2007-10-24-ArgumentsGlobals.ll
new file mode 100644
index 0000000..61ab80d
--- /dev/null
+++ b/test/Analysis/BasicAA/2007-10-24-ArgumentsGlobals.ll
@@ -0,0 +1,14 @@
+; RUN: llvm-as < %s | opt -basicaa -gvn -dce | llvm-dis | grep tmp7
+
+        %struct.A = type { i32 }
+        %struct.B = type { %struct.A }
+@a = global %struct.B zeroinitializer           ; <%struct.B*> [#uses=2]
+
+define i32 @_Z3fooP1A(%struct.A* %b) {
+entry:
+        store i32 1, i32* getelementptr (%struct.B* @a, i32 0, i32 0, i32 0), align 8
+        %tmp4 = getelementptr %struct.A* %b, i32 0, i32 0               ;<i32*> [#uses=1]
+        store i32 0, i32* %tmp4, align 4
+        %tmp7 = load i32* getelementptr (%struct.B* @a, i32 0, i32 0, i32 0), align 8           ; <i32> [#uses=1]
+        ret i32 %tmp7
+}