Revert "Simplify the loop in layout"

s-barannikov · s-barannikov · commit ba84a60dc875 · 2024-12-13T03:37:11.000+03:00
This reverts commit a3676ed.
diff --git a/llvm/utils/TableGen/Basic/SequenceToOffsetTable.h b/llvm/utils/TableGen/Basic/SequenceToOffsetTable.h
@@ -116,12 +116,9 @@ class SequenceToOffsetTable {
     for (typename SeqMap::iterator I = Seqs.begin(), E = Seqs.end(); I != E;
          ++I) {
       I->second = Entries;
-      Entries += I->first.size();
+      // Include space for a terminator.
+      Entries += I->first.size() + Terminator.has_value();
     }
-
-    // Include space for terminators.
-    if (Terminator)
-      Entries += Seqs.size();
   }
 
   /// get - Returns the offset of Seq in the final table.

Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,9 @@ class SequenceToOffsetTable {`
`116`	`116`	`for (typename SeqMap::iterator I = Seqs.begin(), E = Seqs.end(); I != E;`
`117`	`117`	`++I) {`
`118`	`118`	`I->second = Entries;`
`119`		`- Entries += I->first.size();`
	`119`	`+ // Include space for a terminator.`
	`120`	`+ Entries += I->first.size() + Terminator.has_value();`
`120`	`121`	`}`
`121`		`-`
`122`		`- // Include space for terminators.`
`123`		`- if (Terminator)`
`124`		`- Entries += Seqs.size();`
`125`	`122`	`}`
`126`	`123`
`127`	`124`	`/// get - Returns the offset of Seq in the final table.`