Fix optimization hazard in gram.y's makeOrderedSetArgs(), redux.

tglsfdc · tglsfdc · commit eb48619d01d7 · 2020-10-07T18:42:41.000-04:00
It appears that commit cf63c64, which intended to prevent misoptimization of the result-building step in makeOrderedSetArgs, didn't go far enough: buildfarm member hornet's version of xlc is now optimizing back to the old, broken behavior in which list_length(directargs) is fetched only after list_concat() has changed that value. I'm not entirely convinced whether that's an undeniable compiler bug or whether it can be justified by a sufficiently aggressive interpretation of C sequence points. So let's just change the code to make it harder to misinterpret. Back-patch to all supported versions, just in case. Discussion: https://postgr.es/m/1830491.1601944935@sss.pgh.pa.us
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -14533,7 +14533,7 @@ makeOrderedSetArgs(List *directargs, List *orderedargs,
 				   core_yyscan_t yyscanner)
 {
 	FunctionParameter *lastd = (FunctionParameter *) llast(directargs);
-	int			ndirectargs;
+	Value	   *ndirectargs;
 
 	/* No restriction unless last direct arg is VARIADIC */
 	if (lastd->mode == FUNC_PARAM_VARIADIC)
@@ -14557,10 +14557,10 @@ makeOrderedSetArgs(List *directargs, List *orderedargs,
 	}
 
 	/* don't merge into the next line, as list_concat changes directargs */
-	ndirectargs = list_length(directargs);
+	ndirectargs = makeInteger(list_length(directargs));
 
 	return list_make2(list_concat(directargs, orderedargs),
-					  makeInteger(ndirectargs));
+					  ndirectargs);
 }
 
 /* insertSelectOptions()

Original file line number	Diff line number	Diff line change
`@@ -14533,7 +14533,7 @@ makeOrderedSetArgs(List directargs, List orderedargs,`
`14533`	`14533`	`core_yyscan_t yyscanner)`
`14534`	`14534`	`{`
`14535`	`14535`	`FunctionParameter lastd = (FunctionParameter ) llast(directargs);`
`14536`		`- int ndirectargs;`
	`14536`	`+ Value *ndirectargs;`
`14537`	`14537`
`14538`	`14538`	`/* No restriction unless last direct arg is VARIADIC */`
`14539`	`14539`	`if (lastd->mode == FUNC_PARAM_VARIADIC)`
`@@ -14557,10 +14557,10 @@ makeOrderedSetArgs(List directargs, List orderedargs,`
`14557`	`14557`	`}`
`14558`	`14558`
`14559`	`14559`	`/* don't merge into the next line, as list_concat changes directargs */`
`14560`		`- ndirectargs = list_length(directargs);`
	`14560`	`+ ndirectargs = makeInteger(list_length(directargs));`
`14561`	`14561`
`14562`	`14562`	`return list_make2(list_concat(directargs, orderedargs),`
`14563`		`- makeInteger(ndirectargs));`
	`14563`	`+ ndirectargs);`
`14564`	`14564`	`}`
`14565`	`14565`
`14566`	`14566`	`/* insertSelectOptions()`