Merge commit '37eb0d4948da' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 2e8b1bdbdd94 · 2024-04-03T16:39:02.000+08:00
diff --git a/clang/lib/Serialization/GeneratePCH.cpp b/clang/lib/Serialization/GeneratePCH.cpp
@@ -102,7 +102,7 @@ ReducedBMIGenerator::ReducedBMIGenerator(Preprocessor &PP,
 
 Module *ReducedBMIGenerator::getEmittingModule(ASTContext &Ctx) {
   Module *M = Ctx.getCurrentNamedModule();
-  assert(M->isNamedModuleUnit() &&
+  assert(M && M->isNamedModuleUnit() &&
          "ReducedBMIGenerator should only be used with C++20 Named modules.");
   return M;
 }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ ReducedBMIGenerator::ReducedBMIGenerator(Preprocessor &PP,`
`102`	`102`
`103`	`103`	`Module *ReducedBMIGenerator::getEmittingModule(ASTContext &Ctx) {`
`104`	`104`	`Module *M = Ctx.getCurrentNamedModule();`
`105`		`- assert(M->isNamedModuleUnit() &&`
	`105`	`+ assert(M && M->isNamedModuleUnit() &&`
`106`	`106`	`"ReducedBMIGenerator should only be used with C++20 Named modules.");`
`107`	`107`	`return M;`
`108`	`108`	`}`