From 23475569d5d6f3ca7cc745dddb86c16f126e3efc Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Thu, 12 Jun 2014 01:46:54 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210734 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/IR/Verifier.cpp | 4 ++++ test/Verifier/alias.ll | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp index b66bd0640186..d1c7f7d25c39 100644 --- a/lib/IR/Verifier.cpp +++ b/lib/IR/Verifier.cpp @@ -493,6 +493,10 @@ void Verifier::visitAliaseeSubExpr(SmallPtrSet &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/test/Verifier/alias.ll b/test/Verifier/alias.ll index ff02a37bab95..d71a7cb2b6ea 100644 --- a/test/Verifier/alias.ll +++ b/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