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

2025-12-14 20:36:38 +01:00 · 2020-04-16 15:57:40 -07:00
parent 2c69e7be93 4458a18357
commit 999d033f4f
20 changed files with 189 additions and 162 deletions
--- a/lib/Serialization/ModuleFile.cpp
+++ b/lib/Serialization/ModuleFile.cpp
@@ -274,6 +274,7 @@ validateControlBlock(llvm::BitstreamCursor &cursor,
        break;
      }

+      result.miscVersion = blobData;
      versionSeen = true;
      break;
    }
@@ -1673,6 +1674,7 @@ ModuleFile::ModuleFile(
      TargetTriple = info.targetTriple;
      CompatibilityVersion = info.compatibilityVersion;
      IsSIB = extInfo->isSIB();
+      MiscVersion = info.miscVersion;

      hasValidControlBlock = true;
      break;