[llvm-commits] CVS: llvm/lib/VMCore/Linker.cpp
Chris Lattner
lattner at cs.uiuc.edu
Fri Aug 20 17:51:11 PDT 2004
Changes in directory llvm/lib/VMCore:
Linker.cpp updated: 1.83 -> 1.84
---
Log message:
Fix a nasty bug that Nate ran into. In particular, instead of emitting a 2+MB
error message, print out:
llvm-link: error linking in 'g.2.rbc': Global Variable Collision on
' %struct.D_Reduction* %d_reduction_10_gram' - External linkage globals have
different initializers
That's a bit more concise, huh?
---
Diffs of the changes: (+13 -6)
Index: llvm/lib/VMCore/Linker.cpp
diff -u llvm/lib/VMCore/Linker.cpp:1.83 llvm/lib/VMCore/Linker.cpp:1.84
--- llvm/lib/VMCore/Linker.cpp:1.83 Wed Aug 4 17:39:54 2004
+++ llvm/lib/VMCore/Linker.cpp Fri Aug 20 19:50:59 2004
@@ -24,6 +24,7 @@
#include "llvm/Instructions.h"
#include "llvm/Assembly/Writer.h"
#include <iostream>
+#include <sstream>
using namespace llvm;
// Error - Simple wrapper function to conditionally assign to E and return true.
@@ -34,6 +35,12 @@
return true;
}
+static std::string ToStr(const Type *Ty, const Module *M) {
+ std::ostringstream OS;
+ WriteTypeSymbolic(OS, Ty, M);
+ return OS.str();
+}
+
//
// Function: ResolveTypes()
//
@@ -461,7 +468,7 @@
if (SGV->isConstant() != DGV->isConstant())
return Error(Err, "Global Variable Collision on '" +
- SGV->getType()->getDescription() + " %" + SGV->getName() +
+ ToStr(SGV->getType(), Src) + " %" + SGV->getName() +
"' - Global variables differ in const'ness");
// Otherwise, just perform the link.
@@ -480,7 +487,7 @@
if (SGV->isConstant() != DGV->isConstant())
return Error(Err, "Global Variable Collision on '" +
- SGV->getType()->getDescription() + " %" + SGV->getName() +
+ ToStr(SGV->getType(), Src) + " %" + SGV->getName() +
"' - Global variables differ in const'ness");
if (!SGV->hasLinkOnceLinkage())
@@ -494,12 +501,12 @@
// Allow linking two exactly identical external global variables...
if (SGV->isConstant() != DGV->isConstant())
return Error(Err, "Global Variable Collision on '" +
- SGV->getType()->getDescription() + " %" + SGV->getName() +
+ ToStr(SGV->getType(), Src) + " %" + SGV->getName() +
"' - Global variables differ in const'ness");
if (SGV->getInitializer() != DGV->getInitializer())
return Error(Err, "Global Variable Collision on '" +
- SGV->getType()->getDescription() + " %" + SGV->getName() +
+ ToStr(SGV->getType(), Src) + " %" + SGV->getName() +
"' - External linkage globals have different initializers");
ValueMap.insert(std::make_pair(SGV, DGV));
@@ -548,7 +555,7 @@
if (SGV->hasExternalLinkage()) {
if (DGV->getInitializer() != SInit)
return Error(Err, "Global Variable Collision on '" +
- SGV->getType()->getDescription() +"':%"+SGV->getName()+
+ ToStr(SGV->getType(), Src) +"':%"+SGV->getName()+
" - Global variables have different initializers");
} else if (DGV->hasLinkOnceLinkage() || DGV->hasWeakLinkage()) {
// Nothing is required, mapped values will take the new global
@@ -641,7 +648,7 @@
} else if (SF->hasExternalLinkage()) {
// The function is defined in both modules!!
return Error(Err, "Function '" +
- SF->getFunctionType()->getDescription() + "':\"" +
+ ToStr(SF->getFunctionType(), Src) + "':\"" +
SF->getName() + "\" - Function is already defined!");
} else {
assert(0 && "Unknown linkage configuration found!");
More information about the llvm-commits
mailing list