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

Remove redundant local variable shadowing instance variable

Browse Source 
# Conflicts:
#	lib/Frontend/Frontend.cpp
This commit is contained in:
David Ungar
2017-08-27 17:39:47 -07:00
parent 0c2dfb511d
commit ae3d15cbd0
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Frontend/Frontend.cpp
View File

@@ -264,9 +264,7 @@ ModuleDecl *CompilerInstance::getMainModule() {
void CompilerInstance::performSema() {
const FrontendOptions &options = Invocation.getFrontendOptions();
const InputFileKind Kind = Invocation.getInputKind();
bool KeepTokens = Invocation.getLangOptions().KeepTokensInSourceFile;
ModuleDecl *MainModule = getMainModule();
Context->LoadedModules[MainModule->getName()] = MainModule;
Context->LoadedModules[MainModule->getName()] = getMainModule();
auto modImpKind = SourceFile::ImplicitModuleImportKind::Stdlib;
@@ -393,7 +391,7 @@ void CompilerInstance::performSema() {
if (Kind == InputFileKind::IFK_Swift_REPL) {
auto *SingleInputFile =
new (*Context) SourceFile(*MainModule, Invocation.getSourceFileKind(),
None, modImpKind, KeepTokens);
None, modImpKind, Invocation.getLangOptions().KeepTokensInSourceFile);
MainModule->addFile(*SingleInputFile);
addAdditionalInitialImports(SingleInputFile);
return;
@@ -422,7 +420,7 @@ void CompilerInstance::performSema() {
auto *MainFile = new (*Context) SourceFile(*MainModule,
Invocation.getSourceFileKind(),
MainBufferID, modImpKind,
KeepTokens);
Invocation.getLangOptions().KeepTokensInSourceFile);
MainModule->addFile(*MainFile);
addAdditionalInitialImports(MainFile);
@@ -449,7 +447,7 @@ void CompilerInstance::performSema() {
SourceFileKind::Library,
BufferID,
modImpKind,
KeepTokens);
Invocation.getLangOptions().KeepTokensInSourceFile);
MainModule->addFile(*NextInput);
addAdditionalInitialImports(NextInput);