Merge pull request #30614 from xymus/fix-deser-indexing

[Serialization] Recover from more failures when reading private declarations
This commit is contained in:
Alexis Laferrière
2020-03-24 13:45:00 -07:00
committed by GitHub
3 changed files with 75 additions and 21 deletions

View File

@@ -978,13 +978,14 @@ public:
llvm::Expected<ProtocolConformanceRef>
readConformanceChecked(llvm::BitstreamCursor &Cursor,
GenericEnvironment *genericEnv = nullptr);
/// Read a SILLayout from the given cursor.
SILLayout *readSILLayout(llvm::BitstreamCursor &Cursor);
/// Read the given normal conformance from the current module file.
NormalProtocolConformance *
readNormalConformance(serialization::NormalConformanceID id);
/// Read the given normal conformance from the current module file,
/// returns the conformance or the first error.
llvm::Expected<NormalProtocolConformance *>
readNormalConformanceChecked(serialization::NormalConformanceID id);
/// Reads a foreign error conformance from \c DeclTypeCursor, if present.
Optional<ForeignErrorConvention> maybeReadForeignErrorConvention();