averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NFC] Refactor InputFile's Accessors

Browse Source
This commit is contained in:
Robert Widmann
2020-09-11 21:21:14 -06:00
parent 0a5a6f17c8
commit a8766cce5b
9 changed files with 69 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Frontend/FrontendInputsAndOutputs.cpp
View File

@@ -54,7 +54,7 @@ operator=(const FrontendInputsAndOutputs &other) {
std::vector<std::string> FrontendInputsAndOutputs::getInputFilenames() const {
std::vector<std::string> filenames;
for (auto &input : AllInputs) {
filenames.push_back(input.file());
filenames.push_back(input.getFileName());
}
return filenames;
}
@@ -66,7 +66,7 @@ bool FrontendInputsAndOutputs::isReadingFromStdin() const {
const std::string &FrontendInputsAndOutputs::getFilenameOfFirstInput() const {
assert(hasInputs());
const InputFile &inp = AllInputs[0];
const std::string &f = inp.file();
const std::string &f = inp.getFileName();
assert(!f.empty());
return f;
}
@@ -135,7 +135,7 @@ FrontendInputsAndOutputs::getRequiredUniquePrimaryInput() const {
std::string FrontendInputsAndOutputs::getStatsFileMangledInputName() const {
// Use the first primary, even if there are multiple primaries.
// That's enough to keep the file names unique.
return isWholeModule() ? "all" : firstPrimaryInput().file();
return isWholeModule() ? "all" : firstPrimaryInput().getFileName();
}
bool FrontendInputsAndOutputs::isInputPrimary(StringRef file) const {
@@ -146,7 +146,7 @@ unsigned FrontendInputsAndOutputs::numberOfPrimaryInputsEndingWith(
StringRef extension) const {
unsigned n = 0;
(void)forEachPrimaryInput([&](const InputFile &input) -> bool {
if (llvm::sys::path::extension(input.file()).endswith(extension))
if (llvm::sys::path::extension(input.getFileName()).endswith(extension))
++n;
return false;
});
@@ -216,7 +216,7 @@ bool FrontendInputsAndOutputs::areAllNonPrimariesSIB() const {
for (const InputFile &input : AllInputs) {
if (input.isPrimary())
continue;
StringRef extension = llvm::sys::path::extension(input.file());
StringRef extension = llvm::sys::path::extension(input.getFileName());
if (file_types::lookupTypeForExtension(extension) != file_types::TY_SIB) {
return false;
}
@@ -269,7 +269,7 @@ void FrontendInputsAndOutputs::addInput(const InputFile &input) {
AllInputs.push_back(input);
if (input.isPrimary()) {
PrimaryInputsInOrder.push_back(index);
PrimaryInputsByName.insert(std::make_pair(AllInputs.back().file(), index));
PrimaryInputsByName.insert({AllInputs.back().getFileName(), index});
}
}
@@ -330,7 +330,7 @@ void FrontendInputsAndOutputs::setMainAndSupplementaryOutputs(
for (auto &input : AllInputs) {
if (input.isPrimary()) {
input.setPrimarySpecificPaths(PrimarySpecificPaths(
outputFiles[i], input.file(), supplementaryOutputs[i]));
outputFiles[i], input.getFileName(), supplementaryOutputs[i]));
++i;
}
}
@@ -340,7 +340,7 @@ void FrontendInputsAndOutputs::setMainAndSupplementaryOutputs(
"WMO only ever produces one set of supplementary outputs");
if (outputFiles.size() == 1) {
AllInputs.front().setPrimarySpecificPaths(PrimarySpecificPaths(
outputFiles.front(), firstInputProducingOutput().file(),
outputFiles.front(), firstInputProducingOutput().getFileName(),
supplementaryOutputs.front()));
return;
}