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

[Chris Lattner]

Author: lattner
Date: Thu Jul 14 15:23:05 2011
New Revision: 135183

URL: http://llvm.org/viewvc/llvm-project?rev=135183&view=rev
Log:
simplify this logic now that GlobalAlias::isDeclaration is fixed.

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=135183&r1=135182&r2=135183&view=diff
==============================================================================
--- llvm/trunk/lib/Linker/LinkModules.cpp (original)
+++ llvm/trunk/lib/Linker/LinkModules.cpp Thu Jul 14 15:23:05 2011
@@ -437,10 +437,8 @@
   assert(!Src->hasLocalLinkage() &&
          "If Src has internal linkage, Dest shouldn't be set!");
   
-  // FIXME: GlobalAlias::isDeclaration is broken, should always be
-  // false.
-  bool SrcIsDeclaration = Src->isDeclaration() && !isa<GlobalAlias>(Src);
-  bool DestIsDeclaration = Dest->isDeclaration() && !isa<GlobalAlias>(Dest);
+  bool SrcIsDeclaration = Src->isDeclaration();
+  bool DestIsDeclaration = Dest->isDeclaration();
   
   if (SrcIsDeclaration) {
     // If Src is external or if both Src & Dest are external..  Just link the