projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM Ld/St Optimizer fix.
[oota-llvm.git]
/
lib
/
Linker
/
LinkArchives.cpp
diff --git
a/lib/Linker/LinkArchives.cpp
b/lib/Linker/LinkArchives.cpp
index 6cab77c60106b68f27807c012068e05b6e932a9b..7a5942465237d6456c19e54a51e6009258ee4b27 100644
(file)
--- a/
lib/Linker/LinkArchives.cpp
+++ b/
lib/Linker/LinkArchives.cpp
@@
-14,10
+14,8
@@
#include "llvm/Linker.h"
#include "llvm/Module.h"
#include "llvm/Linker.h"
#include "llvm/Module.h"
-#include "llvm/ModuleProvider.h"
#include "llvm/ADT/SetOperations.h"
#include "llvm/Bitcode/Archive.h"
#include "llvm/ADT/SetOperations.h"
#include "llvm/Bitcode/Archive.h"
-#include "llvm/Config/config.h"
#include <memory>
#include <set>
using namespace llvm;
#include <memory>
#include <set>
using namespace llvm;
@@
-50,7
+48,7
@@
GetAllUndefinedSymbols(Module *M, std::set<std::string> &UndefinedSymbols) {
if (I->hasName()) {
if (I->isDeclaration())
UndefinedSymbols.insert(I->getName());
if (I->hasName()) {
if (I->isDeclaration())
UndefinedSymbols.insert(I->getName());
- else if (!I->has
Intern
alLinkage()) {
+ else if (!I->has
Loc
alLinkage()) {
assert(!I->hasDLLImportLinkage()
&& "Found dllimported non-external symbol!");
DefinedSymbols.insert(I->getName());
assert(!I->hasDLLImportLinkage()
&& "Found dllimported non-external symbol!");
DefinedSymbols.insert(I->getName());
@@
-62,7
+60,7
@@
GetAllUndefinedSymbols(Module *M, std::set<std::string> &UndefinedSymbols) {
if (I->hasName()) {
if (I->isDeclaration())
UndefinedSymbols.insert(I->getName());
if (I->hasName()) {
if (I->isDeclaration())
UndefinedSymbols.insert(I->getName());
- else if (!I->has
Intern
alLinkage()) {
+ else if (!I->has
Loc
alLinkage()) {
assert(!I->hasDLLImportLinkage()
&& "Found dllimported non-external symbol!");
DefinedSymbols.insert(I->getName());
assert(!I->hasDLLImportLinkage()
&& "Found dllimported non-external symbol!");
DefinedSymbols.insert(I->getName());
@@
-96,10
+94,10
@@
bool
Linker::LinkInArchive(const sys::Path &Filename, bool &is_native) {
// Make sure this is an archive file we're dealing with
if (!Filename.isArchive())
Linker::LinkInArchive(const sys::Path &Filename, bool &is_native) {
// Make sure this is an archive file we're dealing with
if (!Filename.isArchive())
- return error("File '" + Filename.
toString
() + "' is not an archive.");
+ return error("File '" + Filename.
str
() + "' is not an archive.");
// Open the archive file
// Open the archive file
- verbose("Linking archive file '" + Filename.
toString
() + "'");
+ verbose("Linking archive file '" + Filename.
str
() + "'");
// Find all of the symbols currently undefined in the bitcode program.
// If all the symbols are defined, the program is complete, and there is
// Find all of the symbols currently undefined in the bitcode program.
// If all the symbols are defined, the program is complete, and there is
@@
-108,19
+106,18
@@
Linker::LinkInArchive(const sys::Path &Filename, bool &is_native) {
GetAllUndefinedSymbols(Composite, UndefinedSymbols);
if (UndefinedSymbols.empty()) {
GetAllUndefinedSymbols(Composite, UndefinedSymbols);
if (UndefinedSymbols.empty()) {
- verbose("No symbols undefined, skipping library '" +
- Filename.toString() + "'");
+ verbose("No symbols undefined, skipping library '" + Filename.str() + "'");
return false; // No need to link anything in!
}
std::string ErrMsg;
std::auto_ptr<Archive> AutoArch (
return false; // No need to link anything in!
}
std::string ErrMsg;
std::auto_ptr<Archive> AutoArch (
- Archive::OpenAndLoadSymbols(Filename,&ErrMsg));
+ Archive::OpenAndLoadSymbols(Filename,
Context,
&ErrMsg));
Archive* arch = AutoArch.get();
if (!arch)
Archive* arch = AutoArch.get();
if (!arch)
- return error("Cannot read archive '" + Filename.
toString
() +
+ return error("Cannot read archive '" + Filename.
str
() +
"': " + ErrMsg);
if (!arch->isBitcodeArchive()) {
is_native = true;
"': " + ErrMsg);
if (!arch->isBitcodeArchive()) {
is_native = true;
@@
-140,10
+137,12
@@
Linker::LinkInArchive(const sys::Path &Filename, bool &is_native) {
do {
CurrentlyUndefinedSymbols = UndefinedSymbols;
do {
CurrentlyUndefinedSymbols = UndefinedSymbols;
- // Find the modules we need to link into the target module
- std::set<ModuleProvider*> Modules;
+ // Find the modules we need to link into the target module. Note that arch
+ // keeps ownership of these modules and may return the same Module* from a
+ // subsequent call.
+ std::set<Module*> Modules;
if (!arch->findModulesDefiningSymbols(UndefinedSymbols, Modules, &ErrMsg))
if (!arch->findModulesDefiningSymbols(UndefinedSymbols, Modules, &ErrMsg))
- return error("Cannot find symbols in '" + Filename.
toString
() +
+ return error("Cannot find symbols in '" + Filename.
str
() +
"': " + ErrMsg);
// If we didn't find any more modules to link this time, we are done
"': " + ErrMsg);
// If we didn't find any more modules to link this time, we are done
@@
-157,26
+156,23
@@
Linker::LinkInArchive(const sys::Path &Filename, bool &is_native) {
NotDefinedByArchive.insert(UndefinedSymbols.begin(),
UndefinedSymbols.end());
NotDefinedByArchive.insert(UndefinedSymbols.begin(),
UndefinedSymbols.end());
- // Loop over all the Module
Provider
s that we got back from the archive
- for (std::set<Module
Provider
*>::iterator I=Modules.begin(), E=Modules.end();
+ // Loop over all the Modules that we got back from the archive
+ for (std::set<Module*>::iterator I=Modules.begin(), E=Modules.end();
I != E; ++I) {
// Get the module we must link in.
std::string moduleErrorMsg;
I != E; ++I) {
// Get the module we must link in.
std::string moduleErrorMsg;
- std::auto_ptr<Module> AutoModule((*I)->releaseModule( &moduleErrorMsg ));
- if (!moduleErrorMsg.empty())
- return error("Could not load a module: " + moduleErrorMsg);
-
- Module* aModule = AutoModule.get();
-
+ Module* aModule = *I;
if (aModule != NULL) {
if (aModule != NULL) {
+ if (aModule->MaterializeAll(&moduleErrorMsg))
+ return error("Could not load a module: " + moduleErrorMsg);
+
verbose(" Linking in module: " + aModule->getModuleIdentifier());
// Link it in
verbose(" Linking in module: " + aModule->getModuleIdentifier());
// Link it in
- if (LinkInModule(aModule, &moduleErrorMsg))
{
+ if (LinkInModule(aModule, &moduleErrorMsg))
return error("Cannot link in module '" +
aModule->getModuleIdentifier() + "': " + moduleErrorMsg);
return error("Cannot link in module '" +
aModule->getModuleIdentifier() + "': " + moduleErrorMsg);
- }
}
}
}
}