Speed up isBytecodeLPath from 20s to .01s in common cases. This makes -native
not completely painful to use. Once we decide a directory has a bytecode
library, we know it this function returns true, no need to scan entire directories.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23405 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/gccld/GenerateCode.cpp b/tools/gccld/GenerateCode.cpp
index 432fa9d..72a159a 100644
--- a/tools/gccld/GenerateCode.cpp
+++ b/tools/gccld/GenerateCode.cpp
@@ -148,49 +148,43 @@
}
static bool isBytecodeLPath(const std::string &LibPath) {
- bool isBytecodeLPath = false;
-
sys::Path LPath(LibPath);
- // Make sure it exists
- if (!LPath.exists())
- return isBytecodeLPath;
-
- // Make sure its a directory
+ // Make sure it exists and is a directory
try {
- if (!LPath.isDirectory())
- return isBytecodeLPath;
+ if (!LPath.exists() || !LPath.isDirectory())
+ return false;
} catch (std::string& xcptn) {
- return isBytecodeLPath;
+ return false;
}
-
+
// Grab the contents of the -L path
std::set<sys::Path> Files;
LPath.getDirectoryContents(Files);
-
+
// Iterate over the contents one by one to determine
// if this -L path has any bytecode shared libraries
// or archives
std::set<sys::Path>::iterator File = Files.begin();
+ std::string dllsuffix = sys::Path::GetDLLSuffix();
for (; File != Files.end(); ++File) {
if ( File->isDirectory() )
continue;
std::string path = File->toString();
- std::string dllsuffix = sys::Path::GetDLLSuffix();
// Check for an ending '.dll,.so' or '.a' suffix as all
// other files are not of interest to us here
- if ( path.find(dllsuffix, path.size()-dllsuffix.size()) == std::string::npos
- && path.find(".a", path.size()-2) == std::string::npos )
+ if (path.find(dllsuffix, path.size()-dllsuffix.size()) == std::string::npos
+ && path.find(".a", path.size()-2) == std::string::npos)
continue;
// Finally, check to see if the file is a true bytecode file
if (isBytecodeLibrary(*File))
- isBytecodeLPath = true;
+ return true;
}
- return isBytecodeLPath;
+ return false;
}
/// GenerateBytecode - generates a bytecode file from the specified module.