Skip to content

Commit f3fb460

Browse files
committed
Remove NoncopyableGenericsMismatch infrastructure
1 parent f5819de commit f3fb460

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
@@ -1065,9 +1065,6 @@ static const char *getImportFailureString(swift::serialization::Status status) {
10651065
case swift::serialization::Status::NotInOSSA:
10661066
return "The module file was not compiled with -enable-ossa-modules when it "
10671067
"was required to do so.";
1068-
case swift::serialization::Status::NoncopyableGenericsMismatch:
1069-
return "The module file was compiled with a mismatching "
1070-
"-enable-experimental-feature NoncopyableGenerics setting.";
10711068
case swift::serialization::Status::SDKMismatch:
10721069
return "The module file was built with a different SDK version.";
10731070
}
@@ -1262,7 +1259,6 @@ static bool DeserializeAllCompilerFlags(swift::CompilerInvocation &invocation,
12621259
auto &langOpts = invocation.getLangOptions();
12631260
info = swift::serialization::validateSerializedAST(
12641261
buf, invocation.getSILOptions().EnableOSSAModules,
1265-
langOpts.hasFeature(swift::Feature::NoncopyableGenerics),
12661262
/*requiredSDK*/ StringRef(), &extended_validation_info,
12671263
/*dependencies*/ nullptr, &searchPaths);
12681264
bool invalid_ast = info.status != swift::serialization::Status::Valid;
@@ -3445,8 +3441,7 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
34453441
std::make_unique<swift::ModuleInterfaceCheckerImpl>(*m_ast_context_ap,
34463442
moduleCachePath, prebuiltModuleCachePath,
34473443
swift::ModuleInterfaceLoaderOptions(),
3448-
swift::RequireOSSAModules_t(GetSILOptions()),
3449-
swift::RequireNoncopyableGenerics_t(GetLanguageOptions())));
3444+
swift::RequireOSSAModules_t(GetSILOptions())));
34503445

34513446
// 2. Create and install the module interface loader.
34523447
//

0 commit comments

Comments
 (0)