Replace modImpKind w/ implicitModuleImportKind

# Conflicts:
#	lib/Frontend/Frontend.cpp
This commit is contained in:
David Ungar
2017-08-28 08:22:29 -07:00
parent 91bb47e068
commit bff485856b
3 changed files with 18 additions and 21 deletions

View File

@@ -1292,14 +1292,14 @@ SourceFile::getCachedVisibleDecls() const {
}
static void performAutoImport(SourceFile &SF,
SourceFile::ImplicitModuleImportKind modImpKind) {
SourceFile::ImplicitModuleImportKind implicitModuleImportKind) {
if (SF.Kind == SourceFileKind::SIL)
assert(modImpKind == SourceFile::ImplicitModuleImportKind::None);
assert(implicitModuleImportKind == SourceFile::ImplicitModuleImportKind::None);
ASTContext &Ctx = SF.getASTContext();
ModuleDecl *M = nullptr;
switch (modImpKind) {
switch (implicitModuleImportKind) {
case SourceFile::ImplicitModuleImportKind::None:
return;
case SourceFile::ImplicitModuleImportKind::Builtin: