Skip to content

Commit 6f66051

Browse files
committed
Remove NoncopyableGenericsMismatch infrastructure
(cherry picked from commit f3fb460)
1 parent 011866c commit 6f66051

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,9 +1069,6 @@ static const char *getImportFailureString(swift::serialization::Status status) {
10691069
case swift::serialization::Status::NotInOSSA:
10701070
return "The module file was not compiled with -enable-ossa-modules when it "
10711071
"was required to do so.";
1072-
case swift::serialization::Status::NoncopyableGenericsMismatch:
1073-
return "The module file was compiled with a mismatching "
1074-
"-enable-experimental-feature NoncopyableGenerics setting.";
10751072
case swift::serialization::Status::SDKMismatch:
10761073
return "The module file was built with a different SDK version.";
10771074
}
@@ -1266,7 +1263,6 @@ static bool DeserializeAllCompilerFlags(swift::CompilerInvocation &invocation,
12661263
auto &langOpts = invocation.getLangOptions();
12671264
info = swift::serialization::validateSerializedAST(
12681265
buf, invocation.getSILOptions().EnableOSSAModules,
1269-
langOpts.hasFeature(swift::Feature::NoncopyableGenerics),
12701266
/*requiredSDK*/ StringRef(), &extended_validation_info,
12711267
/*dependencies*/ nullptr, &searchPaths);
12721268
bool invalid_ast = info.status != swift::serialization::Status::Valid;
@@ -3486,8 +3482,7 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
34863482
std::make_unique<swift::ModuleInterfaceCheckerImpl>(*m_ast_context_ap,
34873483
moduleCachePath, prebuiltModuleCachePath,
34883484
swift::ModuleInterfaceLoaderOptions(),
3489-
swift::RequireOSSAModules_t(GetSILOptions()),
3490-
swift::RequireNoncopyableGenerics_t(GetLanguageOptions())));
3485+
swift::RequireOSSAModules_t(GetSILOptions())));
34913486

34923487
// 2. Create and install the module interface loader.
34933488
//

0 commit comments

Comments
 (0)