Resolve a conflict

YexuanXiao · web-flow · commit 895efceecc24 · 2025-06-27T02:43:38.000+08:00
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
@@ -7463,9 +7463,8 @@ void TypeLocReader::VisitPredefinedSugarTypeLoc(PredefinedSugarTypeLoc TL) {
   TL.setNameLoc(readSourceLocation());
 }
 
-void ASTRecordReader::readTypeLoc(TypeLoc TL, LocSeq *ParentSeq) {
-  LocSeq::State Seq(ParentSeq);
-  TypeLocReader TLR(*this, Seq);
+void ASTRecordReader::readTypeLoc(TypeLoc TL) {
+  TypeLocReader TLR(*this);
   for (; !TL.isNull(); TL = TL.getNextTypeLoc())
     TLR.Visit(TL);
 }

Original file line number	Diff line number	Diff line change
`@@ -7463,9 +7463,8 @@ void TypeLocReader::VisitPredefinedSugarTypeLoc(PredefinedSugarTypeLoc TL) {`
`7463`	`7463`	`TL.setNameLoc(readSourceLocation());`
`7464`	`7464`	`}`
`7465`	`7465`
`7466`		`-void ASTRecordReader::readTypeLoc(TypeLoc TL, LocSeq *ParentSeq) {`
`7467`		`- LocSeq::State Seq(ParentSeq);`
`7468`		`- TypeLocReader TLR(*this, Seq);`
	`7466`	`+void ASTRecordReader::readTypeLoc(TypeLoc TL) {`
	`7467`	`+ TypeLocReader TLR(*this);`
`7469`	`7468`	`for (; !TL.isNull(); TL = TL.getNextTypeLoc())`
`7470`	`7469`	`TLR.Visit(TL);`
`7471`	`7470`	`}`