Skip to content

Commit 031166e

Browse files
authored
Revert "[ParseableInterface] Fix failing to build a module when the importing file has errors."
1 parent 75b5824 commit 031166e

File tree

6 files changed

+1
-80
lines changed

6 files changed

+1
-80
lines changed

lib/Frontend/ParseableInterfaceSupport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ bool ParseableInterfaceModuleLoader::buildSwiftModuleFromSwiftInterface(
452452
return;
453453
}
454454

455-
SubError = SubInstance.getDiags().hadAnyError();
455+
SubError = Diags.hadAnyError();
456456
});
457457
return !RunSuccess || SubError;
458458
}

test/ParseableInterface/ModuleCache/module-cache-errors-in-importing-file.swift

Lines changed: 0 additions & 23 deletions
This file was deleted.

test/SourceKit/CodeComplete/Inputs/parseable-interface/MyPoint.swift

Lines changed: 0 additions & 13 deletions
This file was deleted.

test/SourceKit/CodeComplete/Inputs/parseable-interface/MyPointExtensions.swift

Lines changed: 0 additions & 7 deletions
This file was deleted.

test/SourceKit/CodeComplete/complete_swiftinterface.swift

Lines changed: 0 additions & 28 deletions
This file was deleted.

tools/swift-ide-test/swift-ide-test.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,6 @@ static llvm::cl::opt<std::string>
259259
ModuleCachePath("module-cache-path", llvm::cl::desc("Clang module cache path"),
260260
llvm::cl::cat(Category));
261261

262-
static llvm::cl::opt<bool>
263-
EnableParseableModuleInterface("enable-parseable-module-interface",
264-
llvm::cl::desc("Enable loading .swiftinterface files when available"),
265-
llvm::cl::cat(Category),
266-
llvm::cl::init(true));
267-
268262
static llvm::cl::opt<std::string>
269263
PCHOutputDir("pch-output-dir",
270264
llvm::cl::desc("place autogenerated PCH files in this directory"),
@@ -3131,8 +3125,6 @@ int main(int argc, char *argv[]) {
31313125
InitInvok.getLangOptions().EffectiveLanguageVersion = actual.getValue();
31323126
}
31333127
}
3134-
InitInvok.getFrontendOptions().EnableParseableModuleInterface =
3135-
options::EnableParseableModuleInterface;
31363128
InitInvok.getClangImporterOptions().ModuleCachePath =
31373129
options::ModuleCachePath;
31383130
InitInvok.getClangImporterOptions().PrecompiledHeaderOutputDir =

0 commit comments

Comments
 (0)