summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Wilson <bob.wilson@apple.com>2014-06-12 01:46:54 +0000
committerBob Wilson <bob.wilson@apple.com>2014-06-12 01:46:54 +0000
commit2f7cc01895ee178215b72d4548bd93a8064351e6 (patch)
tree5e43a556e3d83bd5c56d549a5dab74960d1e0772
parent25188c95de6bd74e15dad873ff5fc7e7c1330191 (diff)
downloadbcm5719-llvm-2f7cc01895ee178215b72d4548bd93a8064351e6.tar.gz
bcm5719-llvm-2f7cc01895ee178215b72d4548bd93a8064351e6.zip
Fix verifier for GlobalAliases to avoid recursing into global initializers.
The verifier follows GlobalAlias operands so that it can detect cycles of alias definitions. It was doing this in a way that caused it to also recurse through initializers for the GlobalValue aliasees, and it would fail when an initializer refers to a global that is a declaration and not a definition. This patch causes it to stop recursing when it hits a global definition. <rdar://problem/17277451> llvm-svn: 210734
-rw-r--r--llvm/lib/IR/Verifier.cpp4
-rw-r--r--llvm/test/Verifier/alias.ll4
2 files changed, 8 insertions, 0 deletions
diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp
index b66bd064018..d1c7f7d25c3 100644
--- a/llvm/lib/IR/Verifier.cpp
+++ b/llvm/lib/IR/Verifier.cpp
@@ -493,6 +493,10 @@ void Verifier::visitAliaseeSubExpr(SmallPtrSet<const GlobalAlias *, 4> &Visited,
Assert1(!GA2->mayBeOverridden(), "Alias cannot point to a weak alias",
&GA);
+ } else {
+ // Only continue verifying subexpressions of GlobalAliases.
+ // Do not recurse into global initializers.
+ return;
}
}
diff --git a/llvm/test/Verifier/alias.ll b/llvm/test/Verifier/alias.ll
index ff02a37bab9..d71a7cb2b6e 100644
--- a/llvm/test/Verifier/alias.ll
+++ b/llvm/test/Verifier/alias.ll
@@ -11,6 +11,10 @@ declare void @f()
; CHECK: Alias must point to a definition
; CHECK-NEXT: @ga
+; References to a global declaration from an initializer are OK.
+@gptr = global i32* @g
+@gptr_a = alias i32** @gptr
+; CHECK-NOT: Alias must point to a definition
@test2_a = alias i32* @test2_b
@test2_b = alias i32* @test2_a
OpenPOWER on IntegriCloud