Commit889ec4b

committed

Fix Intel compiler bug. Per discussion

'GIN FailedAssertions on Itanium2 with Intel compiler' in pgsql-hackers,http://archives.postgresql.org/pgsql-hackers/2006-08/msg01914.php

1 parent642194b commit889ec4bCopy full SHA for 889ec4b

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 17 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.5 2006/07/14 14:52:16 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.6 2006/09/05 18:25:10 teodor Exp $`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
`@@ -122,7 +122,22 @@ compareEntries(GinState *ginstate, Datum a, Datum b) {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`staticFmgrInfo*cmpDatumPtr=NULL;`
`125`		`-staticboolneedUnique= FALSE;`
	`125`	`+`
	`126`	`+#if defined(__INTEL_COMPILER)&& (defined(__ia64__)\|\| defined(__ia64))`
	`127`	`+/*`
	`128`	`+ * Intel Compiler on Intel Itanium with -O2 has a bug around`
	`129`	`+ * change static variable by user function called from`
	`130`	`+ * libc func: it doesn't change. So mark it as volatile.`
	`131`	`+ *`
	`132`	`+ * It's a pity, but it's impossible to define optimization`
	`133`	`+ * level here.`
	`134`	`+ */`
	`135`	`+#defineVOLATILEvolatile`
	`136`	`+#else`
	`137`	`+#defineVOLATILE`
	`138`	`+#endif`
	`139`	`+`
	`140`	`+staticboolVOLATILEneedUnique= FALSE;`
`126`	`141`
`127`	`142`	`staticint`
`128`	`143`	`cmpEntries(constvoida,constvoidb) {`

Comments

(0)