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

Revert "Revert "Merge pull request #41831 from hyp/unify-header""

Browse Source 
This reverts commit 4c9582c295.
This commit is contained in:
Alex Lorenz
2022-03-19 13:36:28 -07:00
parent 36b41d4940
commit 2e3aa87737
29 changed files with 163 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Frontend/FrontendInputsAndOutputs.cpp
View File

@@ -213,7 +213,7 @@ bool FrontendInputsAndOutputs::shouldTreatAsObjCHeader() const {
if (hasSingleInput()) {
StringRef InputExt = llvm::sys::path::extension(getFilenameOfFirstInput());
switch (file_types::lookupTypeForExtension(InputExt)) {
case file_types::TY_ObjCHeader:
case file_types::TY_ClangHeader:
return true;
default:
return false;
@@ -461,16 +461,10 @@ bool FrontendInputsAndOutputs::hasReferenceDependenciesPath() const {
return outs.ReferenceDependenciesFilePath;
});
}
bool FrontendInputsAndOutputs::hasObjCHeaderOutputPath() const {
bool FrontendInputsAndOutputs::hasClangHeaderOutputPath() const {
return hasSupplementaryOutputPath(
[](const SupplementaryOutputPaths &outs) -> const std::string & {
return outs.ObjCHeaderOutputPath;
});
}
bool FrontendInputsAndOutputs::hasCxxHeaderOutputPath() const {
return hasSupplementaryOutputPath(
[](const SupplementaryOutputPaths &outs) -> const std::string & {
return outs.CxxHeaderOutputPath;
return outs.ClangHeaderOutputPath;
});
}
bool FrontendInputsAndOutputs::hasLoadedModuleTracePath() const {