Make our back branches build under -fkeep-inline-functions.

tglsfdc · tglsfdc · commit 21c058648ec2 · 2023-01-20T11:58:12.000-05:00
Add "#ifndef FRONTEND" where necessary to make pg_waldump build on compilers that don't elide unused static-inline functions. This back-patches relevant parts of commit 3e9ca52, fixing build breakage from dc7420c and back-patching of f10f0ae. Per recently-resurrected buildfarm member castoroides. We aren't expecting castoroides to build anything newer than v11, but we might as well clean up the intermediate branches while at it.
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
@@ -526,6 +526,7 @@ typedef struct ViewOptions
 	(RELKIND_HAS_STORAGE((relation)->rd_rel->relkind) && \
 	 ((relation)->rd_rel->relfilenode == InvalidOid))
 
+#ifndef FRONTEND
 /*
  * RelationGetSmgr
  *		Returns smgr file handle for a relation, opening it if needed.
@@ -546,6 +547,7 @@ RelationGetSmgr(Relation rel)
 		smgrsetowner(&(rel->rd_smgr), smgropen(rel->rd_node, rel->rd_backend));
 	return rel->rd_smgr;
 }
+#endif							/* !FRONTEND */
 
 /*
  * RelationOpenSmgr
diff --git a/src/include/utils/snapmgr.h b/src/include/utils/snapmgr.h
@@ -97,11 +97,13 @@ extern PGDLLIMPORT SnapshotData CatalogSnapshotData;
 	((snapshot)->snapshot_type == SNAPSHOT_MVCC || \
 	 (snapshot)->snapshot_type == SNAPSHOT_HISTORIC_MVCC)
 
+#ifndef FRONTEND
 static inline bool
 OldSnapshotThresholdActive(void)
 {
 	return old_snapshot_threshold >= 0;
 }
+#endif
 
 extern Snapshot GetTransactionSnapshot(void);
 extern Snapshot GetLatestSnapshot(void);

Original file line number	Diff line number	Diff line change
`@@ -97,11 +97,13 @@ extern PGDLLIMPORT SnapshotData CatalogSnapshotData;`
`97`	`97`	`((snapshot)->snapshot_type == SNAPSHOT_MVCC \|\| \`
`98`	`98`	`(snapshot)->snapshot_type == SNAPSHOT_HISTORIC_MVCC)`
`99`	`99`
	`100`	`+#ifndef FRONTEND`
`100`	`101`	`static inline bool`
`101`	`102`	`OldSnapshotThresholdActive(void)`
`102`	`103`	`{`
`103`	`104`	`return old_snapshot_threshold >= 0;`
`104`	`105`	`}`
	`106`	`+#endif`
`105`	`107`
`106`	`108`	`extern Snapshot GetTransactionSnapshot(void);`
`107`	`109`	`extern Snapshot GetLatestSnapshot(void);`