Merge pull request #70274 from adrian-prantl/117824367

Revert "Don't require a strict revision match in LLDB."
This commit is contained in:
Adrian Prantl
2023-12-08 13:23:44 -08:00
committed by GitHub
7 changed files with 15 additions and 22 deletions

View File

@@ -3234,8 +3234,7 @@ serialization::Status
CompilerInvocation::loadFromSerializedAST(StringRef data) {
serialization::ExtendedValidationInfo extendedInfo;
serialization::ValidationInfo info = serialization::validateSerializedAST(
data, getSILOptions().EnableOSSAModules, LangOpts.SDKName,
!LangOpts.DebuggerSupport, &extendedInfo);
data, getSILOptions().EnableOSSAModules, LangOpts.SDKName, &extendedInfo);
if (info.status != serialization::Status::Valid)
return info.status;
@@ -3271,7 +3270,7 @@ CompilerInvocation::setUpInputForSILTool(
auto result = serialization::validateSerializedAST(
fileBufOrErr.get()->getBuffer(), getSILOptions().EnableOSSAModules,
LangOpts.SDKName, !LangOpts.DebuggerSupport, &extendedInfo);
LangOpts.SDKName, &extendedInfo);
bool hasSerializedAST = result.status == serialization::Status::Valid;
if (hasSerializedAST) {