pg_query 4.2.1 → 5.1.0

data/ext/pg_query/include/{pl_gram.h → postgres/pl_gram.h}

@@ -138,36 +138,37 @@
      K_PG_EXCEPTION_CONTEXT = 354,
      K_PG_EXCEPTION_DETAIL = 355,
      K_PG_EXCEPTION_HINT = 356,
-     K_PRINT_STRICT_PARAMS = 357,
-     K_PRIOR = 358,
-     K_QUERY = 359,
-     K_RAISE = 360,
-     K_RELATIVE = 361,
-     K_RETURN = 362,
-     K_RETURNED_SQLSTATE = 363,
-     K_REVERSE = 364,
-     K_ROLLBACK = 365,
-     K_ROW_COUNT = 366,
-     K_ROWTYPE = 367,
-     K_SCHEMA = 368,
-     K_SCHEMA_NAME = 369,
-     K_SCROLL = 370,
-     K_SLICE = 371,
-     K_SQLSTATE = 372,
-     K_STACKED = 373,
-     K_STRICT = 374,
-     K_TABLE = 375,
-     K_TABLE_NAME = 376,
-     K_THEN = 377,
-     K_TO = 378,
-     K_TYPE = 379,
-     K_USE_COLUMN = 380,
-     K_USE_VARIABLE = 381,
-     K_USING = 382,
-     K_VARIABLE_CONFLICT = 383,
-     K_WARNING = 384,
-     K_WHEN = 385,
-     K_WHILE = 386
+     K_PG_ROUTINE_OID = 357,
+     K_PRINT_STRICT_PARAMS = 358,
+     K_PRIOR = 359,
+     K_QUERY = 360,
+     K_RAISE = 361,
+     K_RELATIVE = 362,
+     K_RETURN = 363,
+     K_RETURNED_SQLSTATE = 364,
+     K_REVERSE = 365,
+     K_ROLLBACK = 366,
+     K_ROW_COUNT = 367,
+     K_ROWTYPE = 368,
+     K_SCHEMA = 369,
+     K_SCHEMA_NAME = 370,
+     K_SCROLL = 371,
+     K_SLICE = 372,
+     K_SQLSTATE = 373,
+     K_STACKED = 374,
+     K_STRICT = 375,
+     K_TABLE = 376,
+     K_TABLE_NAME = 377,
+     K_THEN = 378,
+     K_TO = 379,
+     K_TYPE = 380,
+     K_USE_COLUMN = 381,
+     K_USE_VARIABLE = 382,
+     K_USING = 383,
+     K_VARIABLE_CONFLICT = 384,
+     K_WARNING = 385,
+     K_WHEN = 386,
+     K_WHILE = 387
    };
 #endif
 /* Tokens.  */
@@ -270,43 +271,44 @@
 #define K_PG_EXCEPTION_CONTEXT 354
 #define K_PG_EXCEPTION_DETAIL 355
 #define K_PG_EXCEPTION_HINT 356
-#define K_PRINT_STRICT_PARAMS 357
-#define K_PRIOR 358
-#define K_QUERY 359
-#define K_RAISE 360
-#define K_RELATIVE 361
-#define K_RETURN 362
-#define K_RETURNED_SQLSTATE 363
-#define K_REVERSE 364
-#define K_ROLLBACK 365
-#define K_ROW_COUNT 366
-#define K_ROWTYPE 367
-#define K_SCHEMA 368
-#define K_SCHEMA_NAME 369
-#define K_SCROLL 370
-#define K_SLICE 371
-#define K_SQLSTATE 372
-#define K_STACKED 373
-#define K_STRICT 374
-#define K_TABLE 375
-#define K_TABLE_NAME 376
-#define K_THEN 377
-#define K_TO 378
-#define K_TYPE 379
-#define K_USE_COLUMN 380
-#define K_USE_VARIABLE 381
-#define K_USING 382
-#define K_VARIABLE_CONFLICT 383
-#define K_WARNING 384
-#define K_WHEN 385
-#define K_WHILE 386
+#define K_PG_ROUTINE_OID 357
+#define K_PRINT_STRICT_PARAMS 358
+#define K_PRIOR 359
+#define K_QUERY 360
+#define K_RAISE 361
+#define K_RELATIVE 362
+#define K_RETURN 363
+#define K_RETURNED_SQLSTATE 364
+#define K_REVERSE 365
+#define K_ROLLBACK 366
+#define K_ROW_COUNT 367
+#define K_ROWTYPE 368
+#define K_SCHEMA 369
+#define K_SCHEMA_NAME 370
+#define K_SCROLL 371
+#define K_SLICE 372
+#define K_SQLSTATE 373
+#define K_STACKED 374
+#define K_STRICT 375
+#define K_TABLE 376
+#define K_TABLE_NAME 377
+#define K_THEN 378
+#define K_TO 379
+#define K_TYPE 380
+#define K_USE_COLUMN 381
+#define K_USE_VARIABLE 382
+#define K_USING 383
+#define K_VARIABLE_CONFLICT 384
+#define K_WARNING 385
+#define K_WHEN 386
+#define K_WHILE 387
 
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 120 "pl_gram.y"
+#line 117 "pl_gram.y"
 {
 	core_YYSTYPE core_yystype;
 	/* these fields must match core_YYSTYPE: */
@@ -358,14 +360,14 @@ typedef union YYSTYPE
 	PLpgSQL_case_when *casewhen;
 }
 /* Line 1529 of yacc.c.  */
-#line 362 "pl_gram.h"
+#line 364 "pl_gram.h"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 
-extern __thread  YYSTYPE plpgsql_yylval;
+extern __thread YYSTYPE plpgsql_yylval;
 
 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
 typedef struct YYLTYPE
@@ -380,4 +382,4 @@ typedef struct YYLTYPE
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
-extern __thread  YYLTYPE plpgsql_yylloc;
+extern __thread YYLTYPE plpgsql_yylloc;

data/ext/pg_query/include/{pl_reserved_kwlist.h → postgres/pl_reserved_kwlist.h}

@@ -7,7 +7,7 @@
  * by the PG_KEYWORD macro, which is not defined in this file; it can
  * be defined by the caller for special purposes.
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/pl/plpgsql/src/pl_reserved_kwlist.h

data/ext/pg_query/include/{pl_reserved_kwlist_d.h → postgres/pl_reserved_kwlist_d.h}

@@ -3,7 +3,7 @@
  * pl_reserved_kwlist_d.h
  *    List of keywords represented as a ScanKeywordList.
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES

data/ext/pg_query/include/{pl_unreserved_kwlist.h → postgres/pl_unreserved_kwlist.h}

@@ -7,7 +7,7 @@
  * by the PG_KEYWORD macro, which is not defined in this file; it can
  * be defined by the caller for special purposes.
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/pl/plpgsql/src/pl_unreserved_kwlist.h
@@ -85,6 +85,7 @@ PG_KEYWORD("pg_datatype_name", K_PG_DATATYPE_NAME)
 PG_KEYWORD("pg_exception_context", K_PG_EXCEPTION_CONTEXT)
 PG_KEYWORD("pg_exception_detail", K_PG_EXCEPTION_DETAIL)
 PG_KEYWORD("pg_exception_hint", K_PG_EXCEPTION_HINT)
+PG_KEYWORD("pg_routine_oid", K_PG_ROUTINE_OID)
 PG_KEYWORD("print_strict_params", K_PRINT_STRICT_PARAMS)
 PG_KEYWORD("prior", K_PRIOR)
 PG_KEYWORD("query", K_QUERY)

data/ext/pg_query/include/{pl_unreserved_kwlist_d.h → postgres/pl_unreserved_kwlist_d.h}

@@ -3,7 +3,7 @@
  * pl_unreserved_kwlist_d.h
  *    List of keywords represented as a ScanKeywordList.
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -80,6 +80,7 @@ static const char UnreservedPLKeywords_kw_string[] =
 	"pg_exception_context\0"
 	"pg_exception_detail\0"
 	"pg_exception_hint\0"
+	"pg_routine_oid\0"
 	"print_strict_params\0"
 	"prior\0"
 	"query\0"
@@ -165,63 +166,64 @@ static const uint16 UnreservedPLKeywords_kw_offsets[] = {
 	420,
 	440,
 	458,
-	478,
-	484,
-	490,
-	496,
+	473,
+	493,
+	499,
 	505,
-	512,
-	530,
-	538,
-	547,
-	557,
-	565,
+	511,
+	520,
+	527,
+	545,
+	553,
+	562,
 	572,
-	584,
-	591,
-	597,
+	580,
+	587,
+	599,
 	606,
-	614,
-	620,
-	631,
-	636,
-	647,
-	660,
-	678,
+	612,
+	621,
+	629,
+	635,
+	646,
+	651,
+	662,
+	675,
+	693,
 };
 
-#define UNRESERVEDPLKEYWORDS_NUM_KEYWORDS 82
+#define UNRESERVEDPLKEYWORDS_NUM_KEYWORDS 83
 
 static int
 UnreservedPLKeywords_hash_func(const void *key, size_t keylen)
 {
-	static const int16 h[165] = {
-		58,    0,     26,    32767, 0,     0,     9,     32767,
-		0,     32767, 37,    74,    32767, -7,    32767, 39,
-		58,    -5,    32767, 31,    32767, 32767, 75,    -23,
-		32767, 0,     32767, 32767, 32767, -14,   32767, 81,
-		32767, 32767, 32767, -36,   -9,    32767, 32767, 32767,
-		40,    32767, 54,    10,    11,    43,    32767, 0,
-		52,    105,   -22,   15,    32767, -33,   49,    -65,
-		48,    32767, 32767, 32767, 25,    49,    -47,   37,
-		21,    32767, 32767, -15,   70,    32767, 32767, 64,
-		-10,   126,   32767, 51,    0,     36,    32767, -55,
-		-22,   32767, 32767, 32767, 32767, 32767, -26,   -35,
-		32767, 61,    32767, 32767, 32767, -23,   98,    48,
-		23,    19,    32767, 7,     35,    5,     -18,   71,
-		28,    5,     32767, 32767, 32767, 74,    32767, 82,
-		32767, 0,     32767, 32767, 66,    0,     0,     50,
-		32767, 32767, 5,     2,     0,     32767, 55,    32767,
-		32767, 45,    79,    32767, 32767, 73,    22,    0,
-		103,   32767, -20,   72,    32767, 0,     29,    32767,
-		0,     32767, 32767, 0,     50,    28,    32767, -40,
-		32767, 32767, 34,    56,    32767, 32767, 32767, 17,
-		-36,   32767, 67,    32767, 0
+	static const int16 h[167] = {
+		0,     -26,   32767, 0,     74,    -36,   32767, 32767,
+		93,    0,     35,    14,    34,    -65,   -42,   78,
+		-22,   8,     10,    0,     5,     32767, 10,    26,
+		32767, 4,     32767, 32767, -81,   -9,    -25,   32767,
+		-17,   11,    0,     -43,   11,    8,     45,    0,
+		32767, 32767, 32767, 12,    0,     32767, 32,    32767,
+		0,     32767, -18,   64,    32767, -2,    31,    32767,
+		50,    80,    -75,   32767, 32767, 32767, 0,     32767,
+		32767, 0,     54,    82,    32767, 32767, 69,    60,
+		43,    32767, 0,     95,    21,    1,     27,    0,
+		120,   32767, -46,   32767, -57,   32767, 32767, 55,
+		70,    32767, 28,    32767, 0,     -14,   -38,   32767,
+		57,    0,     32767, 19,    98,    0,     32767, 68,
+		32767, 32767, 32767, 32767, -26,   13,    27,    35,
+		37,    32767, 49,    -44,   65,    -35,   0,     32767,
+		32767, 32767, 30,    0,     0,     32767, 26,    42,
+		7,     32767, 72,    -43,   32767, 0,     32767, 89,
+		36,    48,    32767, 32,    38,    3,     32767, 49,
+		32767, 0,     51,    0,     32767, 73,    32767, 32767,
+		79,    32767, 30,    32767, 0,     0,     50,    32767,
+		0,     32767, 32767, 32767, 0,     32767, 32767
 	};
 
 	const unsigned char *k = (const unsigned char *) key;
 	uint32		a = 0;
-	uint32		b = 0;
+	uint32		b = 1;
 
 	while (keylen--)
 	{
@@ -230,7 +232,7 @@ UnreservedPLKeywords_hash_func(const void *key, size_t keylen)
 		a = a * 257 + c;
 		b = b * 8191 + c;
 	}
-	return h[a % 165] + h[b % 165];
+	return h[a % 167] + h[b % 167];
 }
 
 static const ScanKeywordList UnreservedPLKeywords = {

data/ext/pg_query/include/{plpgsql.h → postgres/plpgsql.h}

@@ -3,7 +3,7 @@
  * plpgsql.h		- Definitions for the PL/pgSQL
  *			  procedural language
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -147,6 +147,7 @@ enum
 typedef enum PLpgSQL_getdiag_kind
 {
 	PLPGSQL_GETDIAG_ROW_COUNT,
+	PLPGSQL_GETDIAG_ROUTINE_OID,
 	PLPGSQL_GETDIAG_CONTEXT,
 	PLPGSQL_GETDIAG_ERROR_CONTEXT,
 	PLPGSQL_GETDIAG_ERROR_DETAIL,
@@ -1075,7 +1076,6 @@ typedef struct PLpgSQL_execstate
 
 	/* lookup table to use for executing type casts */
 	HTAB	   *cast_hash;
-	MemoryContext cast_hash_context;
 
 	/* memory context for statement-lifespan temporary values */
 	MemoryContext stmt_mcontext;	/* current stmt context, or NULL if none */
@@ -1191,11 +1191,11 @@ typedef enum
 	IDENTIFIER_LOOKUP_EXPR		/* In SQL expression --- special case */
 } IdentifierLookup;
 
-extern __thread  IdentifierLookup plpgsql_IdentifierLookup;
+extern __thread IdentifierLookup plpgsql_IdentifierLookup;
 
-extern __thread  int plpgsql_variable_conflict;
+extern __thread int plpgsql_variable_conflict;
 
-extern __thread  bool plpgsql_print_strict_params;
+extern __thread bool plpgsql_print_strict_params;
 
 extern bool plpgsql_check_asserts;
 
@@ -1209,18 +1209,18 @@ extern bool plpgsql_check_asserts;
 extern int	plpgsql_extra_warnings;
 extern int	plpgsql_extra_errors;
 
-extern __thread  bool plpgsql_check_syntax;
-extern __thread  bool plpgsql_DumpExecTree;
+extern __thread bool plpgsql_check_syntax;
+extern __thread bool plpgsql_DumpExecTree;
 
-extern __thread  PLpgSQL_stmt_block *plpgsql_parse_result;
+extern __thread PLpgSQL_stmt_block *plpgsql_parse_result;
 
-extern __thread  int plpgsql_nDatums;
-extern __thread  PLpgSQL_datum **plpgsql_Datums;
+extern __thread int plpgsql_nDatums;
+extern __thread PLpgSQL_datum **plpgsql_Datums;
 
-extern __thread  char *plpgsql_error_funcname;
+extern __thread char *plpgsql_error_funcname;
 
-extern __thread  PLpgSQL_function *plpgsql_curr_compile;
-extern __thread  MemoryContext plpgsql_compile_tmp_cxt;
+extern __thread PLpgSQL_function *plpgsql_curr_compile;
+extern __thread MemoryContext plpgsql_compile_tmp_cxt;
 
 extern PLpgSQL_plugin **plpgsql_plugin_ptr;
 
@@ -1231,11 +1231,11 @@ extern PLpgSQL_plugin **plpgsql_plugin_ptr;
 /*
  * Functions in pl_comp.c
  */
-extern PLpgSQL_function *plpgsql_compile(FunctionCallInfo fcinfo,
-										 bool forValidator);
+extern PGDLLEXPORT PLpgSQL_function *plpgsql_compile(FunctionCallInfo fcinfo,
+													 bool forValidator);
 extern PLpgSQL_function *plpgsql_compile_inline(char *proc_source);
-extern void plpgsql_parser_setup(struct ParseState *pstate,
-								 PLpgSQL_expr *expr);
+extern PGDLLEXPORT void plpgsql_parser_setup(struct ParseState *pstate,
+											 PLpgSQL_expr *expr);
 extern bool plpgsql_parse_word(char *word1, const char *yytxt, bool lookup,
 							   PLwdatum *wdatum, PLword *word);
 extern bool plpgsql_parse_dblword(char *word1, char *word2,
@@ -1246,9 +1246,9 @@ extern PLpgSQL_type *plpgsql_parse_wordtype(char *ident);
 extern PLpgSQL_type *plpgsql_parse_cwordtype(List *idents);
 extern PLpgSQL_type *plpgsql_parse_wordrowtype(char *ident);
 extern PLpgSQL_type *plpgsql_parse_cwordrowtype(List *idents);
-extern PLpgSQL_type *plpgsql_build_datatype(Oid typeOid, int32 typmod,
-											Oid collation,
-											TypeName *origtypname);
+extern PGDLLEXPORT PLpgSQL_type *plpgsql_build_datatype(Oid typeOid, int32 typmod,
+														Oid collation,
+														TypeName *origtypname);
 extern PLpgSQL_variable *plpgsql_build_variable(const char *refname, int lineno,
 												PLpgSQL_type *dtype,
 												bool add2namespace);
@@ -1257,8 +1257,8 @@ extern PLpgSQL_rec *plpgsql_build_record(const char *refname, int lineno,
 										 bool add2namespace);
 extern PLpgSQL_recfield *plpgsql_build_recfield(PLpgSQL_rec *rec,
 												const char *fldname);
-extern int	plpgsql_recognize_err_condition(const char *condname,
-											bool allow_sqlstate);
+extern PGDLLEXPORT int plpgsql_recognize_err_condition(const char *condname,
+													   bool allow_sqlstate);
 extern PLpgSQL_condition *plpgsql_parse_err_condition(char *condname);
 extern void plpgsql_start_datums(void);
 extern void plpgsql_finish_datums(PLpgSQL_function *function);
@@ -1266,11 +1266,6 @@ extern void plpgsql_adddatum(PLpgSQL_datum *newdatum);
 extern int	plpgsql_add_initdatums(int **varnos);
 extern void plpgsql_HashTableInit(void);
 
-/*
- * Functions in pl_handler.c
- */
-extern void _PG_init(void);
-
 /*
  * Functions in pl_exec.c
  */
@@ -1287,8 +1282,8 @@ extern void plpgsql_exec_event_trigger(PLpgSQL_function *func,
 extern void plpgsql_xact_cb(XactEvent event, void *arg);
 extern void plpgsql_subxact_cb(SubXactEvent event, SubTransactionId mySubid,
 							   SubTransactionId parentSubid, void *arg);
-extern Oid	plpgsql_exec_get_datum_type(PLpgSQL_execstate *estate,
-										PLpgSQL_datum *datum);
+extern PGDLLEXPORT Oid plpgsql_exec_get_datum_type(PLpgSQL_execstate *estate,
+												   PLpgSQL_datum *datum);
 extern void plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,
 											 PLpgSQL_datum *datum,
 											 Oid *typeId, int32 *typMod,
@@ -1303,9 +1298,9 @@ extern void plpgsql_ns_push(const char *label,
 extern void plpgsql_ns_pop(void);
 extern PLpgSQL_nsitem *plpgsql_ns_top(void);
 extern void plpgsql_ns_additem(PLpgSQL_nsitem_type itemtype, int itemno, const char *name);
-extern PLpgSQL_nsitem *plpgsql_ns_lookup(PLpgSQL_nsitem *ns_cur, bool localmode,
-										 const char *name1, const char *name2,
-										 const char *name3, int *names_used);
+extern PGDLLEXPORT PLpgSQL_nsitem *plpgsql_ns_lookup(PLpgSQL_nsitem *ns_cur, bool localmode,
+													 const char *name1, const char *name2,
+													 const char *name3, int *names_used);
 extern PLpgSQL_nsitem *plpgsql_ns_lookup_label(PLpgSQL_nsitem *ns_cur,
 											   const char *name);
 extern PLpgSQL_nsitem *plpgsql_ns_find_nearest_loop(PLpgSQL_nsitem *ns_cur);
@@ -1313,7 +1308,7 @@ extern PLpgSQL_nsitem *plpgsql_ns_find_nearest_loop(PLpgSQL_nsitem *ns_cur);
 /*
  * Other functions in pl_funcs.c
  */
-extern const char *plpgsql_stmt_typename(PLpgSQL_stmt *stmt);
+extern PGDLLEXPORT const char *plpgsql_stmt_typename(PLpgSQL_stmt *stmt);
 extern const char *plpgsql_getdiag_kindname(PLpgSQL_getdiag_kind kind);
 extern void plpgsql_free_function_memory(PLpgSQL_function *func);
 extern void plpgsql_dumptree(PLpgSQL_function *func);

data/ext/pg_query/include/{port → postgres/port}/atomics/arch-arm.h

@@ -3,7 +3,7 @@
  * arch-arm.h
  *	  Atomic operations considerations specific to ARM
  *
- * Portions Copyright (c) 2013-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2023, PostgreSQL Global Development Group
  *
  * NOTES:
  *
@@ -21,7 +21,7 @@
  * 64 bit atomics on ARM32 are implemented using kernel fallbacks and thus
  * might be slow, so disable entirely. On ARM64 that problem doesn't exist.
  */
-#if !defined(__aarch64__) && !defined(__aarch64)
+#if !defined(__aarch64__)
 #define PG_DISABLE_64_BIT_ATOMICS
 #else
 /*
@@ -29,4 +29,4 @@
  * general purpose register is atomic.
  */
 #define PG_HAVE_8BYTE_SINGLE_COPY_ATOMICITY
-#endif  /* __aarch64__ || __aarch64 */
+#endif  /* __aarch64__ */

data/ext/pg_query/include/postgres/port/atomics/arch-hppa.h

@@ -0,0 +1,17 @@
+/*-------------------------------------------------------------------------
+ *
+ * arch-hppa.h
+ *	  Atomic operations considerations specific to HPPA
+ *
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * NOTES:
+ *
+ * src/include/port/atomics/arch-hppa.h
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/* HPPA doesn't do either read or write reordering */
+#define pg_memory_barrier_impl()		pg_compiler_barrier_impl()

data/ext/pg_query/include/{port → postgres/port}/atomics/arch-ppc.h

@@ -3,7 +3,7 @@
  * arch-ppc.h
  *	  Atomic operations considerations specific to PowerPC
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES:
@@ -90,12 +90,12 @@ pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
 		(int32) *expected >= PG_INT16_MIN)
 		__asm__ __volatile__(
 			"	sync				\n"
-			"	lwarx   %0,0,%5		\n"
+			"	lwarx   %0,0,%5,1	\n"
 			"	cmpwi   %0,%3		\n"
-			"	bne     $+12		\n"		/* branch to isync */
+			"	bne     $+12		\n"		/* branch to lwsync */
 			"	stwcx.  %4,0,%5		\n"
 			"	bne     $-16		\n"		/* branch to lwarx */
-			"	isync				\n"
+			"	lwsync				\n"
 			"	mfcr    %1          \n"
 :			"=&r"(found), "=r"(condition_register), "+m"(ptr->value)
 :			"i"(*expected), "r"(newval), "r"(&ptr->value)
@@ -104,12 +104,12 @@ pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
 #endif
 		__asm__ __volatile__(
 			"	sync				\n"
-			"	lwarx   %0,0,%5		\n"
+			"	lwarx   %0,0,%5,1	\n"
 			"	cmpw    %0,%3		\n"
-			"	bne     $+12		\n"		/* branch to isync */
+			"	bne     $+12		\n"		/* branch to lwsync */
 			"	stwcx.  %4,0,%5		\n"
 			"	bne     $-16		\n"		/* branch to lwarx */
-			"	isync				\n"
+			"	lwsync				\n"
 			"	mfcr    %1          \n"
 :			"=&r"(found), "=r"(condition_register), "+m"(ptr->value)
 :			"r"(*expected), "r"(newval), "r"(&ptr->value)
@@ -138,11 +138,11 @@ pg_atomic_fetch_add_u32_impl(volatile pg_atomic_uint32 *ptr, int32 add_)
 		add_ <= PG_INT16_MAX && add_ >= PG_INT16_MIN)
 		__asm__ __volatile__(
 			"	sync				\n"
-			"	lwarx   %1,0,%4		\n"
+			"	lwarx   %1,0,%4,1	\n"
 			"	addi    %0,%1,%3	\n"
 			"	stwcx.  %0,0,%4		\n"
 			"	bne     $-12		\n"		/* branch to lwarx */
-			"	isync				\n"
+			"	lwsync				\n"
 :			"=&r"(_t), "=&b"(res), "+m"(ptr->value)
 :			"i"(add_), "r"(&ptr->value)
 :			"memory", "cc");
@@ -150,11 +150,11 @@ pg_atomic_fetch_add_u32_impl(volatile pg_atomic_uint32 *ptr, int32 add_)
 #endif
 		__asm__ __volatile__(
 			"	sync				\n"
-			"	lwarx   %1,0,%4		\n"
+			"	lwarx   %1,0,%4,1	\n"
 			"	add     %0,%1,%3	\n"
 			"	stwcx.  %0,0,%4		\n"
 			"	bne     $-12		\n"		/* branch to lwarx */
-			"	isync				\n"
+			"	lwsync				\n"
 :			"=&r"(_t), "=&r"(res), "+m"(ptr->value)
 :			"r"(add_), "r"(&ptr->value)
 :			"memory", "cc");
@@ -180,12 +180,12 @@ pg_atomic_compare_exchange_u64_impl(volatile pg_atomic_uint64 *ptr,
 		(int64) *expected >= PG_INT16_MIN)
 		__asm__ __volatile__(
 			"	sync				\n"
-			"	ldarx   %0,0,%5		\n"
+			"	ldarx   %0,0,%5,1	\n"
 			"	cmpdi   %0,%3		\n"
-			"	bne     $+12		\n"		/* branch to isync */
+			"	bne     $+12		\n"		/* branch to lwsync */
 			"	stdcx.  %4,0,%5		\n"
 			"	bne     $-16		\n"		/* branch to ldarx */
-			"	isync				\n"
+			"	lwsync				\n"
 			"	mfcr    %1          \n"
 :			"=&r"(found), "=r"(condition_register), "+m"(ptr->value)
 :			"i"(*expected), "r"(newval), "r"(&ptr->value)
@@ -194,12 +194,12 @@ pg_atomic_compare_exchange_u64_impl(volatile pg_atomic_uint64 *ptr,
 #endif
 		__asm__ __volatile__(
 			"	sync				\n"
-			"	ldarx   %0,0,%5		\n"
+			"	ldarx   %0,0,%5,1	\n"
 			"	cmpd    %0,%3		\n"
-			"	bne     $+12		\n"		/* branch to isync */
+			"	bne     $+12		\n"		/* branch to lwsync */
 			"	stdcx.  %4,0,%5		\n"
 			"	bne     $-16		\n"		/* branch to ldarx */
-			"	isync				\n"
+			"	lwsync				\n"
 			"	mfcr    %1          \n"
 :			"=&r"(found), "=r"(condition_register), "+m"(ptr->value)
 :			"r"(*expected), "r"(newval), "r"(&ptr->value)
@@ -224,11 +224,11 @@ pg_atomic_fetch_add_u64_impl(volatile pg_atomic_uint64 *ptr, int64 add_)
 		add_ <= PG_INT16_MAX && add_ >= PG_INT16_MIN)
 		__asm__ __volatile__(
 			"	sync				\n"
-			"	ldarx   %1,0,%4		\n"
+			"	ldarx   %1,0,%4,1	\n"
 			"	addi    %0,%1,%3	\n"
 			"	stdcx.  %0,0,%4		\n"
 			"	bne     $-12		\n"		/* branch to ldarx */
-			"	isync				\n"
+			"	lwsync				\n"
 :			"=&r"(_t), "=&b"(res), "+m"(ptr->value)
 :			"i"(add_), "r"(&ptr->value)
 :			"memory", "cc");
@@ -236,11 +236,11 @@ pg_atomic_fetch_add_u64_impl(volatile pg_atomic_uint64 *ptr, int64 add_)
 #endif
 		__asm__ __volatile__(
 			"	sync				\n"
-			"	ldarx   %1,0,%4		\n"
+			"	ldarx   %1,0,%4,1	\n"
 			"	add     %0,%1,%3	\n"
 			"	stdcx.  %0,0,%4		\n"
 			"	bne     $-12		\n"		/* branch to ldarx */
-			"	isync				\n"
+			"	lwsync				\n"
 :			"=&r"(_t), "=&r"(res), "+m"(ptr->value)
 :			"r"(add_), "r"(&ptr->value)
 :			"memory", "cc");