diff -U3 /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/rolenames.out /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/rolenames.out
--- /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/rolenames.out	2024-03-21 16:29:26.441185000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/rolenames.out	2024-03-21 16:48:17.834943000 +0000
@@ -15,6 +15,7 @@
       ON (r.rolname = v.uname)
  ORDER BY 1, 2;
 $$ LANGUAGE SQL;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 CREATE FUNCTION chksetconfig()
  RETURNS TABLE (db name, "role" name, rolkeyword text, setconfig text[])
  AS $$
@@ -31,6 +32,7 @@
    WHERE (r.rolname) IN ('Public', 'current_user', 'regress_testrol1', 'regress_testrol2')
 ORDER BY 1, 2, 3;
 $$ LANGUAGE SQL;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 CREATE FUNCTION chkumapping()
  RETURNS TABLE (umname name, umserver name, umoptions text[])
  AS $$
@@ -40,6 +42,7 @@
  JOIN pg_foreign_server s ON (s.oid = m.umserver)
  ORDER BY 2, 1;
 $$ LANGUAGE SQL;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
 --
 -- We test creation and use of these role names to ensure that the server
 -- correctly distinguishes role keywords from quoted names that look like
@@ -112,6 +115,8 @@
 --  ALTER ROLE
 BEGIN;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -126,6 +131,8 @@
 
 ALTER ROLE CURRENT_ROLE WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -140,6 +147,8 @@
 
 ALTER ROLE "current_role" WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -155,6 +164,8 @@
 ALTER ROLE CURRENT_ROLE WITH NOREPLICATION;
 ALTER ROLE CURRENT_USER WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -169,6 +180,8 @@
 
 ALTER ROLE "current_user" WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -183,6 +196,8 @@
 
 ALTER ROLE SESSION_USER WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -197,6 +212,8 @@
 
 ALTER ROLE "session_user" WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -212,6 +229,8 @@
 ALTER USER "Public" WITH REPLICATION;
 ALTER USER "None" WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | t
@@ -227,6 +246,8 @@
 ALTER USER regress_testrol1 WITH NOREPLICATION;
 ALTER USER regress_testrol2 WITH NOREPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | t
@@ -267,6 +288,8 @@
 --  ALTER USER
 BEGIN;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -281,6 +304,8 @@
 
 ALTER USER CURRENT_ROLE WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -295,6 +320,8 @@
 
 ALTER USER "current_role" WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -310,6 +337,8 @@
 ALTER USER CURRENT_ROLE WITH NOREPLICATION;
 ALTER USER CURRENT_USER WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -324,6 +353,8 @@
 
 ALTER USER "current_user" WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -338,6 +369,8 @@
 
 ALTER USER SESSION_USER WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -352,6 +385,8 @@
 
 ALTER USER "session_user" WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | f
@@ -367,6 +402,8 @@
 ALTER USER "Public" WITH REPLICATION;
 ALTER USER "None" WITH REPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | t
@@ -382,6 +419,8 @@
 ALTER USER regress_testrol1 WITH NOREPLICATION;
 ALTER USER regress_testrol2 WITH NOREPLICATION;
 SELECT * FROM chkrolattr();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
        role       | rolekeyword  | canlogin | replication 
 ------------------+--------------+----------+-------------
  None             | -            | f        | t
@@ -421,6 +460,8 @@
 ERROR:  role "nonexistent" does not exist
 --  ALTER ROLE SET/RESET
 SELECT * FROM chksetconfig();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  db | role | rolkeyword | setconfig 
 ----+------+------------+-----------
 (0 rows)
@@ -432,6 +473,8 @@
 ALTER ROLE "Public" SET application_name to 'BARBAR';
 ALTER ROLE ALL SET application_name to 'SLAP';
 SELECT * FROM chksetconfig();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  db  |       role       |  rolkeyword  |         setconfig         
 -----+------------------+--------------+---------------------------
  ALL | Public           | -            | {application_name=BARBAR}
@@ -443,6 +486,8 @@
 
 ALTER ROLE regress_testrol1 SET application_name to 'SLAM';
 SELECT * FROM chksetconfig();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  db  |       role       |  rolkeyword  |         setconfig         
 -----+------------------+--------------+---------------------------
  ALL | Public           | -            | {application_name=BARBAR}
@@ -459,6 +504,8 @@
 ALTER ROLE "Public" RESET application_name;
 ALTER ROLE ALL RESET application_name;
 SELECT * FROM chksetconfig();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  db | role | rolkeyword | setconfig 
 ----+------+------------+-----------
 (0 rows)
@@ -473,6 +520,8 @@
 ERROR:  role "nonexistent" does not exist
 --  ALTER USER SET/RESET
 SELECT * FROM chksetconfig();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  db | role | rolkeyword | setconfig 
 ----+------+------------+-----------
 (0 rows)
@@ -484,6 +533,8 @@
 ALTER USER "Public" SET application_name to 'BARBAR';
 ALTER USER ALL SET application_name to 'SLAP';
 SELECT * FROM chksetconfig();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  db  |       role       |  rolkeyword  |         setconfig         
 -----+------------------+--------------+---------------------------
  ALL | Public           | -            | {application_name=BARBAR}
@@ -495,6 +546,8 @@
 
 ALTER USER regress_testrol1 SET application_name to 'SLAM';
 SELECT * FROM chksetconfig();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  db  |       role       |  rolkeyword  |         setconfig         
 -----+------------------+--------------+---------------------------
  ALL | Public           | -            | {application_name=BARBAR}
@@ -511,6 +564,8 @@
 ALTER USER "Public" RESET application_name;
 ALTER USER ALL RESET application_name;
 SELECT * FROM chksetconfig();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  db | role | rolkeyword | setconfig 
 ----+------+------------+-----------
 (0 rows)
@@ -551,6 +606,7 @@
 SELECT n.nspname, r.rolname FROM pg_namespace n
  JOIN pg_roles r ON (r.oid = n.nspowner)
  WHERE n.nspname LIKE 'newschema_' ORDER BY 1;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
   nspname   |     rolname      
 ------------+------------------
  newschema1 | regress_testrol2
@@ -590,6 +646,7 @@
 SELECT n.nspname, r.rolname FROM pg_namespace n
  JOIN pg_roles r ON (r.oid = n.nspowner)
  WHERE n.nspname LIKE 'newschema_' ORDER BY 1;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
   nspname   |     rolname      
 ------------+------------------
  newschema1 | regress_testrol2
@@ -633,6 +690,7 @@
  FROM pg_class c JOIN pg_roles r ON (r.oid = c.relowner)
  WHERE relname LIKE 'testtab_'
  ORDER BY 1;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  relname  |     rolname      
 ----------+------------------
  testtab1 | regress_testrol2
@@ -682,6 +740,7 @@
  FROM pg_proc p JOIN pg_roles r ON (r.oid = p.proowner)
  WHERE proname LIKE 'testagg_'
  ORDER BY 1;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  proname  |     rolname      
 ----------+------------------
  testagg1 | regress_testrol2
@@ -720,6 +779,8 @@
 CREATE USER MAPPING FOR nonexistent SERVER sv10 OPTIONS (user 'nonexistent'); -- error;
 ERROR:  role "nonexistent" does not exist
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
       umname      | umserver |         umoptions         
 ------------------+----------+---------------------------
  regress_testrol2 | sv1      | {user=CURRENT_USER}
@@ -756,6 +817,8 @@
  OPTIONS (SET user 'nonexistent_alt'); -- error
 ERROR:  role "nonexistent" does not exist
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
       umname      | umserver |           umoptions           
 ------------------+----------+-------------------------------
  regress_testrol2 | sv1      | {user=CURRENT_USER_alt}
@@ -782,6 +845,8 @@
 DROP USER MAPPING FOR nonexistent SERVER sv10;  -- error
 ERROR:  role "nonexistent" does not exist
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  umname | umserver | umoptions 
 --------+----------+-----------
 (0 rows)
@@ -796,6 +861,8 @@
 CREATE USER MAPPING FOR "Public" SERVER sv8 OPTIONS (user '"Public"');
 CREATE USER MAPPING FOR regress_testrolx SERVER sv9 OPTIONS (user 'regress_testrolx');
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
       umname      | umserver |         umoptions         
 ------------------+----------+---------------------------
  regress_testrol2 | sv1      | {user=CURRENT_USER}
@@ -812,6 +879,8 @@
 -- DROP USER MAPPING IF EXISTS
 DROP USER MAPPING IF EXISTS FOR CURRENT_USER SERVER sv1;
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
       umname      | umserver |         umoptions         
 ------------------+----------+---------------------------
  current_user     | sv2      | {"user=\"current_user\""}
@@ -826,6 +895,8 @@
 
 DROP USER MAPPING IF EXISTS FOR "current_user" SERVER sv2;
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
       umname      | umserver |        umoptions        
 ------------------+----------+-------------------------
  regress_testrol2 | sv3      | {user=CURRENT_ROLE}
@@ -839,6 +910,8 @@
 
 DROP USER MAPPING IF EXISTS FOR CURRENT_USER SERVER sv3;
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
       umname      | umserver |        umoptions        
 ------------------+----------+-------------------------
  regress_testrol2 | sv4      | {user=USER}
@@ -851,6 +924,8 @@
 
 DROP USER MAPPING IF EXISTS FOR USER SERVER sv4;
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
       umname      | umserver |        umoptions        
 ------------------+----------+-------------------------
  user             | sv5      | {"user=\"USER\""}
@@ -862,6 +937,8 @@
 
 DROP USER MAPPING IF EXISTS FOR "user" SERVER sv5;
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
       umname      | umserver |        umoptions        
 ------------------+----------+-------------------------
  regress_testrol1 | sv6      | {user=SESSION_USER}
@@ -872,6 +949,8 @@
 
 DROP USER MAPPING IF EXISTS FOR SESSION_USER SERVER sv6;
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
       umname      | umserver |        umoptions        
 ------------------+----------+-------------------------
                   | sv7      | {user=PUBLIC}
@@ -881,6 +960,8 @@
 
 DROP USER MAPPING IF EXISTS FOR PUBLIC SERVER sv7;
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
       umname      | umserver |        umoptions        
 ------------------+----------+-------------------------
  Public           | sv8      | {"user=\"Public\""}
@@ -889,6 +970,8 @@
 
 DROP USER MAPPING IF EXISTS FOR "Public" SERVER sv8;
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
       umname      | umserver |        umoptions        
 ------------------+----------+-------------------------
  regress_testrolx | sv9      | {user=regress_testrolx}
@@ -896,6 +979,8 @@
 
 DROP USER MAPPING IF EXISTS FOR regress_testrolx SERVER sv9;
 SELECT * FROM chkumapping();
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  umname | umserver | umoptions 
 --------+----------+-----------
 (0 rows)
@@ -1045,6 +1130,7 @@
 -- returns true with role member of pg_read_all_stats
 SELECT COUNT(*) = 0 AS haspriv FROM pg_stat_activity
   WHERE query = '<insufficient privilege>';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  haspriv 
 ---------
  t
@@ -1054,6 +1140,7 @@
 -- returns false with role not member of pg_read_all_stats
 SELECT COUNT(*) = 0 AS haspriv FROM pg_stat_activity
   WHERE query = '<insufficient privilege>';
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
  haspriv 
 ---------
  f
diff -U3 /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/guc_privs.out
--- /tmp/cirrus-ci-build/src/test/modules/unsafe_tests/expected/guc_privs.out	2024-03-21 16:29:26.441162000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/unsafe_tests/regress/results/guc_privs.out	2024-03-21 16:48:17.928302000 +0000
@@ -435,6 +435,7 @@
        (SELECT parname FROM pg_parameter_acl WHERE oid = goa.objid) AS parname,
        objsubid
 FROM pg_get_object_address('parameter ACL', '{work_mem}', '{}') goa;
+WARNING:  outfuncs/readfuncs failed to produce an equal rewritten parse tree
      classid      | parname  | objsubid 
 ------------------+----------+----------
  pg_parameter_acl | work_mem |        0