=== Applying patches on top of PostgreSQL commit ID 1c4b1de888559a47df599dcef356ea7fbf96fd0c === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Jul 12 22:54:31 UTC 2026 === expanding ./patches.tgz x v3-0001-Shorten-pg_attribute_always_inline-to-pg_always_i-14.patch x v3-0001-Shorten-pg_attribute_always_inline-to-pg_always_i-15.patch x v3-0001-Shorten-pg_attribute_always_inline-to-pg_always_i-16.patch x v3-0001-Shorten-pg_attribute_always_inline-to-pg_always_i-17.patch x v3-0001-Shorten-pg_attribute_always_inline-to-pg_always_i-18.patch x v3-0001-Shorten-pg_attribute_always_inline-to-pg_always_i-19.patch x v3-0001-Shorten-pg_attribute_always_inline-to-pg_always_i-master.patch On branch cf/6661 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Shorten-pg_attribute_always_inline-to-pg_always_i-14.patch === Applying: Shorten pg_attribute_always_inline to pg_always_inline Using index info to reconstruct a base tree... M src/backend/executor/execExprInterp.c M src/backend/executor/execTuples.c M src/backend/executor/nodeHashjoin.c M src/backend/utils/cache/catcache.c M src/include/c.h Falling back to patching base and 3-way merge... Auto-merging src/include/c.h CONFLICT (content): Merge conflict in src/include/c.h Auto-merging src/backend/utils/cache/catcache.c Auto-merging src/backend/executor/nodeHashjoin.c Auto-merging src/backend/executor/execTuples.c CONFLICT (content): Merge conflict in src/backend/executor/execTuples.c Auto-merging src/backend/executor/execExprInterp.c CONFLICT (content): Merge conflict in src/backend/executor/execExprInterp.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 Shorten pg_attribute_always_inline to pg_always_inline 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". === using patch(1) to apply patch ./v3-0001-Shorten-pg_attribute_always_inline-to-pg_always_i-14.patch === patching file src/backend/executor/execExprInterp.c Hunk #1 FAILED at 167. Hunk #2 FAILED at 2063. Hunk #3 FAILED at 2101. Hunk #4 FAILED at 2196. Hunk #5 FAILED at 2239. Hunk #6 FAILED at 3393. Hunk #7 FAILED at 4376. Hunk #8 FAILED at 4408. 8 out of 8 hunks FAILED -- saving rejects to file src/backend/executor/execExprInterp.c.rej patching file src/backend/executor/execTuples.c Hunk #1 FAILED at 71. Hunk #2 FAILED at 921. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/executor/execTuples.c.rej patching file src/backend/executor/nodeHashjoin.c Hunk #1 FAILED at 167. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/executor/nodeHashjoin.c.rej patching file src/backend/utils/cache/catcache.c Hunk #1 FAILED at 947. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/cache/catcache.c.rej patching file src/include/c.h Hunk #1 FAILED at 190. 1 out of 1 hunk FAILED -- saving rejects to file src/include/c.h.rej Removing src/backend/executor/execExprInterp.c.rej Removing src/backend/executor/execTuples.c.rej Removing src/backend/executor/nodeHashjoin.c.rej Removing src/backend/utils/cache/catcache.c.rej Removing src/include/c.h.rej === using 'git apply' to apply patch ./v3-0001-Shorten-pg_attribute_always_inline-to-pg_always_i-14.patch === Applied patch to 'src/backend/executor/execExprInterp.c' with conflicts. Applied patch to 'src/backend/executor/execTuples.c' with conflicts. Applied patch to 'src/backend/executor/nodeHashjoin.c' cleanly. Applied patch to 'src/backend/utils/cache/catcache.c' cleanly. Applied patch to 'src/include/c.h' with conflicts. U src/backend/executor/execExprInterp.c U src/backend/executor/execTuples.c U src/include/c.h diff --cc src/backend/executor/execExprInterp.c index d45812c23aa,24eb53a0b26..00000000000 --- a/src/backend/executor/execExprInterp.c +++ b/src/backend/executor/execExprInterp.c @@@ -196,7 -185,6 +196,10 @@@ static pg_always_inline void ExecAggPla AggStatePerGroup pergroup, ExprContext *aggcontext, int setno); ++<<<<<<< ours +static char *ExecGetJsonValueItemString(JsonbValue *item, bool *resnull); ++======= ++>>>>>>> theirs /* * ScalarArrayOpExprHashEntry diff --cc src/backend/executor/execTuples.c index 97ae019d10a,5f6d92e242c..00000000000 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@@ -73,7 -72,7 +73,11 @@@ static TupleDesc ExecTypeFromTLInternal(List *targetList, bool skipjunk); static pg_always_inline void slot_deform_heap_tuple(TupleTableSlot *slot, HeapTuple tuple, uint32 *offp, ++<<<<<<< ours + int reqnatts, bool support_cstring); ++======= + int natts); ++>>>>>>> theirs static inline void tts_buffer_heap_store_tuple(TupleTableSlot *slot, HeapTuple tuple, Buffer buffer, diff --cc src/include/c.h index 0e8053d1fe3,596c2425b88..00000000000 --- a/src/include/c.h +++ b/src/include/c.h @@@ -352,16 -194,23 +352,35 @@@ extern "C++ * we wish to force inlining of, even when the compiler's heuristics would * choose not to. But, if possible, don't force inlining in unoptimized * debug builds. + * + * XXX The "pg_attribute_always_inline" variant is kept for backwards + * compatibility with existing code. All new code should use the shorter + * variant "pg_always_inline." */ ++<<<<<<< ours +#if defined(__GNUC__) && defined(__OPTIMIZE__) +/* GCC supports always_inline via __attribute__ */ +#define pg_always_inline __attribute__((always_inline)) inline +#elif defined(_MSC_VER) +/* MSVC has a special keyword for this */ +#define pg_always_inline __forceinline +#else +/* Otherwise, the best we can do is to say "inline" */ +#define pg_always_inline inline ++======= + #if (defined(__GNUC__) && __GNUC__ > 3 && defined(__OPTIMIZE__)) || defined(__SUNPRO_C) || defined(__IBMC__) + /* GCC > 3, Sunpro and XLC support always_inline via __attribute__ */ + #define pg_always_inline __attribute__((always_inline)) inline + #define pg_attribute_always_inline __attribute__((always_inline)) inline + #elif defined(_MSC_VER) + /* MSVC has a special keyword for this */ + #define pg_always_inline __forceinline + #define pg_attribute_always_inline __forceinline + #else + /* Otherwise, the best we can do is to say "inline" */ + #define pg_always_inline inline + #define pg_attribute_always_inline inline ++>>>>>>> theirs #endif /*