Push lpp variable closer to usage in heapgetpage()

Author: Melanie Plageman <melanieplageman@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/CAAKRu_YSOnhKsDyFcqJsKtBSrd32DP-jjXmv7hL0BPD-z0TGXQ@mail.gmail.com

src/backend/access/heap/heapam.c

@@ -383,7 +383,6 @@ heapgetpage(TableScanDesc sscan, BlockNumber block)
 	int			lines;
 	int			ntup;
 	OffsetNumber lineoff;
-	ItemId		lpp;
 	bool		all_visible;
 
 	Assert(block < scan->rs_nblocks);
@@ -452,15 +451,15 @@ heapgetpage(TableScanDesc sscan, BlockNumber block)
 	 */
 	all_visible = PageIsAllVisible(page) && !snapshot->takenDuringRecovery;
 
-	for (lineoff = FirstOffsetNumber, lpp = PageGetItemId(page, lineoff);
-		 lineoff <= lines;
-		 lineoff++, lpp++)
-	{
-		if (ItemIdIsNormal(lpp))
+	for (lineoff = FirstOffsetNumber; lineoff <= lines; lineoff++)
 	{
+		ItemId		lpp = PageGetItemId(page, lineoff);
 		HeapTupleData loctup;
 		bool		valid;
 
+		if (!ItemIdIsNormal(lpp))
+			continue;
+
 		loctup.t_tableOid = RelationGetRelid(scan->rs_base.rs_rd);
 		loctup.t_data = (HeapTupleHeader) PageGetItem(page, lpp);
 		loctup.t_len = ItemIdGetLength(lpp);
@@ -477,7 +476,6 @@ heapgetpage(TableScanDesc sscan, BlockNumber block)
 		if (valid)
 			scan->rs_vistuples[ntup++] = lineoff;
 	}
-	}
 
 	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);