Merge commit '799ae77993fa' from llvm.org/main into next

Francis Visoiu Mistrih · Francis Visoiu Mistrih · commit 9e231f104d26 · 2024-06-04T08:46:50.000-07:00
Conflicts:
	clang/lib/Serialization/ASTWriter.cpp
diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp
@@ -3919,8 +3919,7 @@ void ASTWriter::WriteIdentifierTable(Preprocessor &PP,
 
       // Write out identifiers if either the ID is local or the identifier has
       // changed since it was loaded.
-      if (ID >= FirstIdentID || !Chain || !II->isFromAST() ||
-          II->hasChangedSinceDeserialization())
+      if (ID >= FirstIdentID || II->hasChangedSinceDeserialization())
         Generator.insert(II, ID, Trait);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3919,8 +3919,7 @@ void ASTWriter::WriteIdentifierTable(Preprocessor &PP,`
`3919`	`3919`
`3920`	`3920`	`// Write out identifiers if either the ID is local or the identifier has`
`3921`	`3921`	`// changed since it was loaded.`
`3922`		`- if (ID >= FirstIdentID \|\| !Chain \|\| !II->isFromAST() \|\|`
`3923`		`- II->hasChangedSinceDeserialization())`
	`3922`	`+ if (ID >= FirstIdentID \|\| II->hasChangedSinceDeserialization())`
`3924`	`3923`	`Generator.insert(II, ID, Trait);`
`3925`	`3924`	`}`
`3926`	`3925`