[llvm-commits] [llvm] r48181 - /llvm/trunk/lib/Linker/LinkModules.cpp

[Anton Korobeynikov]

Author: asl
Date: Mon Mar 10 17:35:31 2008
New Revision: 48181

URL: http://llvm.org/viewvc/llvm-project?rev=48181&view=rev
Log:
Always run 'make check' :) Fix fallout from prev. commit: query for possible
alias destination only if we don't have anything to link to

Modified:
    llvm/trunk/lib/Linker/LinkModules.cpp

Modified: llvm/trunk/lib/Linker/LinkModules.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=48181&r1=48180&r2=48181&view=diff

==============================================================================
--- llvm/trunk/lib/Linker/LinkModules.cpp (original)
+++ llvm/trunk/lib/Linker/LinkModules.cpp Mon Mar 10 17:35:31 2008
@@ -474,7 +474,7 @@
     }
 
     // Check to see if may have to link the global with the alias
-    if (SGV->hasName() && !SGV->hasInternalLinkage()) {
+    if (!DGV && SGV->hasName() && !SGV->hasInternalLinkage()) {
       DGV = Dest->getNamedAlias(SGV->getName());
       if (DGV && DGV->getType() != SGV->getType())
         // If types don't agree due to opaque types, try to resolve them.