diff options
| author | Chris Lattner <sabre@nondot.org> | 2008-07-10 01:09:33 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2008-07-10 01:09:33 +0000 |
| commit | e97603bd8b73cbc4e0b065b40f1dc12017d757fa (patch) | |
| tree | b6793d3b6d57e470532dfd01d2217a8446cdfd19 | |
| parent | 7fe0ff0d3a291e978b7064adf48abbca9aadc2ed (diff) | |
| download | external_llvm-e97603bd8b73cbc4e0b065b40f1dc12017d757fa.zip external_llvm-e97603bd8b73cbc4e0b065b40f1dc12017d757fa.tar.gz external_llvm-e97603bd8b73cbc4e0b065b40f1dc12017d757fa.tar.bz2 | |
The source and dest of an alias are *not* required to have the same type,
though that would be nice and make sense :). Patch by Nathan Keynes!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53387 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index cd18bf4..ea7769a 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -714,9 +714,7 @@ static bool LinkAlias(Module *Dest, const Module *Src, // If types don't agree due to opaque types, try to resolve them. if (DGV && DGV->getType() != SGA->getType()) - if (RecursiveResolveTypes(SGA->getType(), DGV->getType())) - return Error(Err, "Alias Collision on '" + SGA->getName()+ - "': aliases have different types"); + RecursiveResolveTypes(SGA->getType(), DGV->getType()); } if (!DGV && !SGA->hasInternalLinkage()) { @@ -724,9 +722,7 @@ static bool LinkAlias(Module *Dest, const Module *Src, // If types don't agree due to opaque types, try to resolve them. if (DGV && DGV->getType() != SGA->getType()) - if (RecursiveResolveTypes(SGA->getType(), DGV->getType())) - return Error(Err, "Alias Collision on '" + SGA->getName()+ - "': aliases have different types"); + RecursiveResolveTypes(SGA->getType(), DGV->getType()); } if (!DGV && !SGA->hasInternalLinkage()) { @@ -734,9 +730,7 @@ static bool LinkAlias(Module *Dest, const Module *Src, // If types don't agree due to opaque types, try to resolve them. if (DGV && DGV->getType() != SGA->getType()) - if (RecursiveResolveTypes(SGA->getType(), DGV->getType())) - return Error(Err, "Alias Collision on '" + SGA->getName()+ - "': aliases have different types"); + RecursiveResolveTypes(SGA->getType(), DGV->getType()); } // No linking to be performed on internal stuff. |
