Merge branch 'PGPRO_pg_trgm' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO_pg_trgm

vbwagner · vbwagner · commit 392073c4406b · 2016-02-10T09:00:21.000+03:00
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
@@ -296,7 +296,12 @@ gtrgm_consistent(PG_FUNCTION_ARGS)
 
 			if (GIST_LEAF(entry))
 			{					/* all leafs contains orig trgm */
-				float4		tmpsml = cnt_sml(qtrg, key, *recheck);
+				/*
+				 * Prevent gcc optimizing the tmpsml variable using volatile
+				 * keyword. Otherwise comparison of nlimit and tmpsml may give
+				 * wrong results.
+				 */
+				float4 volatile tmpsml = cnt_sml(qtrg, key, *recheck);
 
 				/* strange bug at freebsd 5.2.1 and gcc 3.3.3 */
 				res = (*(int *) &tmpsml == *(int *) &nlimit || tmpsml > nlimit);
