[lld] r230735 - Temporarily disable FileArchive::preload().
Rui Ueyama
ruiu at google.com
Thu Feb 26 21:26:05 PST 2015
Author: ruiu
Date: Thu Feb 26 23:26:05 2015
New Revision: 230735
URL: http://llvm.org/viewvc/llvm-project?rev=230735&view=rev
Log:
Temporarily disable FileArchive::preload().
It is observed that the function throws std::future_error on a few buildbots.
That cannot be easily reproducible on local machines. Kill the feature
temporarily to see if this is going to fix the buildbot issue.
Modified:
lld/trunk/lib/Core/Resolver.cpp
Modified: lld/trunk/lib/Core/Resolver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/Resolver.cpp?rev=230735&r1=230734&r2=230735&view=diff
==============================================================================
--- lld/trunk/lib/Core/Resolver.cpp (original)
+++ lld/trunk/lib/Core/Resolver.cpp Thu Feb 26 23:26:05 2015
@@ -31,12 +31,9 @@ bool Resolver::handleFile(const File &fi
bool undefAdded = false;
for (const DefinedAtom *atom : file.defined())
doDefinedAtom(*atom);
- for (const UndefinedAtom *atom : file.undefined()) {
- if (doUndefinedAtom(*atom)) {
+ for (const UndefinedAtom *atom : file.undefined())
+ if (doUndefinedAtom(*atom))
undefAdded = true;
- maybePreloadArchiveMember(atom->name());
- }
- }
for (const SharedLibraryAtom *atom : file.sharedLibrary())
doSharedLibraryAtom(*atom);
for (const AbsoluteAtom *atom : file.absolute())
@@ -232,17 +229,6 @@ void Resolver::addAtoms(const std::vecto
doDefinedAtom(*newAtom);
}
-// Instantiate an archive file member if there's a file containing a
-// defined symbol for a given symbol name. Instantiation is done in a
-// different worker thread and has no visible side effect.
-void Resolver::maybePreloadArchiveMember(StringRef sym) {
- auto it = _archiveMap.find(sym);
- if (it == _archiveMap.end())
- return;
- ArchiveLibraryFile *archive = it->second;
- archive->preload(_context.getTaskGroup(), sym);
-}
-
// Returns true if at least one of N previous files has created an
// undefined symbol.
bool Resolver::undefinesAdded(int begin, int end) {
More information about the llvm-commits
mailing list