File tree Expand file tree Collapse file tree 3 files changed +2
-17
lines changed Expand file tree Collapse file tree 3 files changed +2
-17
lines changed Original file line number Diff line number Diff line change @@ -892,10 +892,6 @@ class ASTContext final {
892
892
return getIdentifier (getSwiftName (kind));
893
893
}
894
894
895
- // / Collect visible clang modules from the ClangModuleLoader. These modules are
896
- // / not necessarily loaded.
897
- void getVisibleTopLevelClangModules (SmallVectorImpl<clang::Module*> &Modules) const ;
898
-
899
895
// / Populate \p names with visible top level module names.
900
896
// / This guarantees that resulted \p names doesn't have duplicated names.
901
897
void getVisibleTopLevelModuleNames (SmallVectorImpl<Identifier> &names) const ;
Original file line number Diff line number Diff line change 46
46
#include " swift/Syntax/SyntaxArena.h"
47
47
#include " swift/Strings.h"
48
48
#include " swift/Subsystems.h"
49
- #include " clang/AST/Attr.h"
50
- #include " clang/AST/DeclObjC.h"
51
- #include " clang/Lex/HeaderSearch.h"
52
- #include " clang/Lex/Preprocessor.h"
53
49
#include " llvm/ADT/DenseMap.h"
54
50
#include " llvm/ADT/Statistic.h"
55
51
#include " llvm/ADT/StringMap.h"
@@ -1502,12 +1498,6 @@ ModuleDecl *ASTContext::getLoadedModule(Identifier ModuleName) const {
1502
1498
return LoadedModules.lookup (ModuleName);
1503
1499
}
1504
1500
1505
- void ASTContext::getVisibleTopLevelClangModules (
1506
- SmallVectorImpl<clang::Module*> &Modules) const {
1507
- getClangModuleLoader ()->getClangPreprocessor ().getHeaderSearchInfo ().
1508
- collectAllModules (Modules);
1509
- }
1510
-
1511
1501
static AllocationArena getArena (GenericSignature *genericSig) {
1512
1502
if (!genericSig)
1513
1503
return AllocationArena::Permanent;
Original file line number Diff line number Diff line change @@ -72,8 +72,7 @@ Optional<bool> forEachModuleSearchPath(
72
72
return result;
73
73
74
74
// Apple platforms have extra implicit framework search paths:
75
- // $SDKROOT/System/Library/Frameworks/ ; and
76
- // $SDKROOT/Library/Frameworks/
75
+ // $SDKROOT/System/Library/Frameworks/ and $SDKROOT/Library/Frameworks/.
77
76
if (Ctx.LangOpts .Target .isOSDarwin ()) {
78
77
SmallString<128 > scratch;
79
78
scratch = Ctx.SearchPathOpts .SDKPath ;
@@ -154,7 +153,7 @@ void SerializedModuleLoaderBase::collectVisibleTopLevelModuleNamesImpl(
154
153
switch (Kind) {
155
154
case SearchPathKind::Import: {
156
155
// Look for:
157
- // $PATH/{name}.swiftmodule/{arch}.{extension} ; Or
156
+ // $PATH/{name}.swiftmodule/{arch}.{extension} or
158
157
// $PATH/{name}.{extension}
159
158
forEachDirectoryEntryPath (searchPath, [&](StringRef path) {
160
159
auto pathExt = llvm::sys::path::extension (path);
You can’t perform that action at this time.
0 commit comments