Merge remote-tracking branch 'origin/master' into master-next

2025-12-21 12:14:44 +01:00 · 2018-03-28 11:08:57 -07:00
parent 6043dfd3e5 3901fa8db6
commit 00ecedd1b3
3 changed files with 15 additions and 1 deletions
--- a/lib/Serialization/Serialization.cpp
+++ b/lib/Serialization/Serialization.cpp
@@ -3321,6 +3321,9 @@ void Serializer::writeDecl(const Decl *D) {
      Negative = ILE->isNegative();
    }

+    uint8_t rawResilienceExpansion =
+        getRawStableResilienceExpansion(
+            elem->getDefaultArgumentResilienceExpansion());
    unsigned abbrCode = DeclTypeAbbrCodes[EnumElementLayout::Code];
    EnumElementLayout::emitRecord(Out, ScratchRecord, abbrCode,
                                  contextID,
@@ -3330,6 +3333,7 @@ void Serializer::writeDecl(const Decl *D) {
                                  (unsigned)RawValueKind,
                                  Negative,
                                  addDeclBaseNameRef(RawValueText),
+                                  rawResilienceExpansion,
                                  elem->getFullName().getArgumentNames().size()+1,
                                  nameComponentsAndDependencies);
    if (auto *PL = elem->getParameterList())