=== Applying patches on top of PostgreSQL commit ID ef5f559b95e2883c32d20d309d316f0572fd84b5 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Dec 14 07:01:23 UTC 2025 On branch cf/6261 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Rename-AssertVariableIsOfType-to-StaticAssertVariabl.patch === Applying: Rename AssertVariableIsOfType to StaticAssertVariableIsOfType Using index info to reconstruct a base tree... M contrib/jsonb_plpython/jsonb_plpython.c M src/backend/executor/execParallel.c M src/include/c.h M src/include/utils/relptr.h Falling back to patching base and 3-way merge... Auto-merging src/include/utils/relptr.h CONFLICT (content): Merge conflict in src/include/utils/relptr.h Auto-merging src/include/c.h Auto-merging src/backend/executor/execParallel.c Auto-merging contrib/jsonb_plpython/jsonb_plpython.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Rename AssertVariableIsOfType to StaticAssertVariableIsOfType When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Unstaged changes after reset: M contrib/hstore_plperl/hstore_plperl.c M contrib/hstore_plpython/hstore_plpython.c M contrib/jsonb_plpython/jsonb_plpython.c M contrib/ltree_plpython/ltree_plpython.c M src/backend/executor/execParallel.c M src/backend/jit/llvm/llvmjit_types.c M src/bin/pg_upgrade/check.c M src/bin/pg_upgrade/function.c M src/bin/pg_upgrade/info.c M src/bin/pg_upgrade/version.c M src/include/access/xlogdefs.h M src/include/c.h M src/include/lib/ilist.h M src/include/lib/pairingheap.h M src/include/postgres.h M src/include/storage/proclist.h M src/include/utils/freepage.h M src/include/utils/relptr.h === using patch(1) to apply patch ./0001-Rename-AssertVariableIsOfType-to-StaticAssertVariabl.patch === patching file contrib/hstore_plperl/hstore_plperl.c patching file contrib/hstore_plpython/hstore_plpython.c patching file contrib/jsonb_plpython/jsonb_plpython.c patching file contrib/ltree_plpython/ltree_plpython.c patching file src/backend/executor/execParallel.c Hunk #1 succeeded at 106 (offset 1 line). patching file src/backend/jit/llvm/llvmjit_types.c patching file src/bin/pg_upgrade/check.c patching file src/bin/pg_upgrade/function.c patching file src/bin/pg_upgrade/info.c patching file src/bin/pg_upgrade/version.c patching file src/include/access/xlogdefs.h patching file src/include/c.h Hunk #1 succeeded at 974 (offset 9 lines). patching file src/include/lib/ilist.h patching file src/include/lib/pairingheap.h patching file src/include/postgres.h patching file src/include/storage/proclist.h patching file src/include/utils/freepage.h patching file src/include/utils/relptr.h Hunk #1 FAILED at 40. Hunk #2 succeeded at 45 with fuzz 2 (offset -4 lines). Hunk #3 FAILED at 74. Hunk #4 succeeded at 75 with fuzz 2 (offset -8 lines). 2 out of 4 hunks FAILED -- saving rejects to file src/include/utils/relptr.h.rej Unstaged changes after reset: M contrib/hstore_plperl/hstore_plperl.c M contrib/hstore_plpython/hstore_plpython.c M contrib/jsonb_plpython/jsonb_plpython.c M contrib/ltree_plpython/ltree_plpython.c M src/backend/executor/execParallel.c M src/backend/jit/llvm/llvmjit_types.c M src/bin/pg_upgrade/check.c M src/bin/pg_upgrade/function.c M src/bin/pg_upgrade/info.c M src/bin/pg_upgrade/version.c M src/include/access/xlogdefs.h M src/include/c.h M src/include/lib/ilist.h M src/include/lib/pairingheap.h M src/include/postgres.h M src/include/storage/proclist.h M src/include/utils/freepage.h M src/include/utils/relptr.h Removing src/include/utils/relptr.h.rej === using 'git apply' to apply patch ./0001-Rename-AssertVariableIsOfType-to-StaticAssertVariabl.patch === Applied patch to 'contrib/hstore_plperl/hstore_plperl.c' cleanly. Applied patch to 'contrib/hstore_plpython/hstore_plpython.c' cleanly. Applied patch to 'contrib/jsonb_plpython/jsonb_plpython.c' cleanly. Applied patch to 'contrib/ltree_plpython/ltree_plpython.c' cleanly. Applied patch to 'src/backend/executor/execParallel.c' cleanly. Applied patch to 'src/backend/jit/llvm/llvmjit_types.c' cleanly. Applied patch to 'src/bin/pg_upgrade/check.c' cleanly. Applied patch to 'src/bin/pg_upgrade/function.c' cleanly. Applied patch to 'src/bin/pg_upgrade/info.c' cleanly. Applied patch to 'src/bin/pg_upgrade/version.c' cleanly. Applied patch to 'src/include/access/xlogdefs.h' cleanly. Applied patch to 'src/include/c.h' cleanly. Applied patch to 'src/include/lib/ilist.h' cleanly. Applied patch to 'src/include/lib/pairingheap.h' cleanly. Applied patch to 'src/include/postgres.h' cleanly. Applied patch to 'src/include/storage/proclist.h' cleanly. Applied patch to 'src/include/utils/freepage.h' cleanly. Applied patch to 'src/include/utils/relptr.h' with conflicts. U src/include/utils/relptr.h diff --cc src/include/utils/relptr.h index 48e394dba71,3e3bdb3227f..00000000000 --- a/src/include/utils/relptr.h +++ b/src/include/utils/relptr.h @@@ -38,14 -38,18 +38,19 @@@ #define relptr_declare(type, relptrtype) \ typedef relptr(type) relptrtype -#ifdef HAVE__BUILTIN_TYPES_COMPATIBLE_P +#ifdef HAVE_TYPEOF #define relptr_access(base, rp) \ ++<<<<<<< ours + (AssertVariableIsOfTypeMacro(base, char *), \ + (typeof((rp).relptr_type)) ((rp).relptr_off == 0 ? NULL : \ ++======= + (StaticAssertVariableIsOfTypeMacro(base, char *), \ + (__typeof__((rp).relptr_type)) ((rp).relptr_off == 0 ? NULL : \ ++>>>>>>> theirs (base) + (rp).relptr_off - 1)) #else -/* - * If we don't have __builtin_types_compatible_p, assume we might not have - * __typeof__ either. - */ #define relptr_access(base, rp) \ - (AssertVariableIsOfTypeMacro(base, char *), \ + (StaticAssertVariableIsOfTypeMacro(base, char *), \ (void *) ((rp).relptr_off == 0 ? NULL : (base) + (rp).relptr_off - 1)) #endif @@@ -68,14 -72,18 +73,19 @@@ relptr_store_eval(char *base, char *val } } -#ifdef HAVE__BUILTIN_TYPES_COMPATIBLE_P +#ifdef HAVE_TYPEOF #define relptr_store(base, rp, val) \ ++<<<<<<< ours + (AssertVariableIsOfTypeMacro(base, char *), \ + AssertVariableIsOfTypeMacro(val, typeof((rp).relptr_type)), \ ++======= + (StaticAssertVariableIsOfTypeMacro(base, char *), \ + StaticAssertVariableIsOfTypeMacro(val, __typeof__((rp).relptr_type)), \ ++>>>>>>> theirs (rp).relptr_off = relptr_store_eval((base), (char *) (val))) #else -/* - * If we don't have __builtin_types_compatible_p, assume we might not have - * __typeof__ either. - */ #define relptr_store(base, rp, val) \ - (AssertVariableIsOfTypeMacro(base, char *), \ + (StaticAssertVariableIsOfTypeMacro(base, char *), \ (rp).relptr_off = relptr_store_eval((base), (char *) (val))) #endif