caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ELF] Pass ctx to bAlloc/saver/uniqueSaver

Browse Source
This commit is contained in:
Fangrui Song
2024-11-16 15:20:20 -08:00
parent baf59be89b
commit a626eb2a2f
17 changed files with 101 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lld/ELF/ScriptParser.cpp
View File

@@ -317,7 +317,7 @@ void ScriptParser::addFile(StringRef s) {
SmallString<128> pathData;
StringRef path = (ctx.arg.sysroot + s).toStringRef(pathData);
if (sys::fs::exists(path))
ctx.driver.addFile(saver().save(path), /*withLOption=*/false);
ctx.driver.addFile(saver(ctx).save(path), /*withLOption=*/false);
else
setError("cannot find " + s + " inside " + ctx.arg.sysroot);
return;
@@ -331,7 +331,7 @@ void ScriptParser::addFile(StringRef s) {
if (ctx.arg.sysroot.empty())
ctx.driver.addFile(s.substr(1), /*withLOption=*/false);
else
ctx.driver.addFile(saver().save(ctx.arg.sysroot + "/" + s.substr(1)),
ctx.driver.addFile(saver(ctx).save(ctx.arg.sysroot + "/" + s.substr(1)),
/*withLOption=*/false);
} else if (s.starts_with("-l")) {
// Case 3: search in the list of library paths.
@@ -354,7 +354,7 @@ void ScriptParser::addFile(StringRef s) {
} else {
// Finally, search in the list of library paths.
if (std::optional<std::string> path = findFromSearchPaths(ctx, s))
ctx.driver.addFile(saver().save(*path), /*withLOption=*/true);
ctx.driver.addFile(saver(ctx).save(*path), /*withLOption=*/true);
else
setError("unable to find " + s);
}