Commitc6a43c2

committed

Fix broken cast on MSVC

Per buildfarm animal drongo, casting a vector type to the same typecauses a compile error. We still need the cast on ARM64, so invent awrapper function that does the casting only where necessary.Discussion:https://www.postgresql.org/message-id/CAFBsxsEouaTwbmpqV%2BEW2%3DwFbhw2vHRe26NQTRcd0%3DNaOFDy7A%40mail.gmail.com

1 parent82739d4 commitc6a43c2Copy full SHA for c6a43c2

File tree

+23

-1

lines changed

+23

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ pg_lfind32(uint32 key, uint32 *base, uint32 nelem)`
`151`	`151`	`result=vector32_or(tmp1,tmp2);`
`152`	`152`
`153`	`153`	`/* see if there was a match */`
`154`		`-if (vector8_is_highbit_set((Vector8)result))`
	`154`	`+if (vector32_is_highbit_set(result))`
`155`	`155`	`{`
`156`	`156`	`Assert(assert_result== true);`
`157`	`157`	`return true;`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -274,6 +274,28 @@ vector8_is_highbit_set(const Vector8 v)`
`274`	`274`	`#endif`
`275`	`275`	`}`
`276`	`276`
	`277`	`+/*`
	`278`	`+ * Exactly like vector32_is_highbit_set except for the input type, so it`
	`279`	`+ * looks at each byte separately.`
	`280`	`+ *`
	`281`	`+ * XXX x86 uses the same underlying type for 8-bit, 16-bit, and 32-bit`
	`282`	`+ * integer elements, but Arm does not, hence the need for a separate`
	`283`	`+ * function. We could instead adopt the behavior of Arm's vmaxvq_u32(), i.e.`
	`284`	`+ * check each 32-bit element, but that would require an additional mask`
	`285`	`+ * operation on x86.`
	`286`	`+ */`
	`287`	`+#ifndefUSE_NO_SIMD`
	`288`	`+staticinlinebool`
	`289`	`+vector32_is_highbit_set(constVector32v)`
	`290`	`+{`
	`291`	`+#if defined(USE_NEON)`
	`292`	`+returnvector8_is_highbit_set((Vector8)v);`
	`293`	`+#else`
	`294`	`+returnvector8_is_highbit_set(v);`
	`295`	`+#endif`
	`296`	`+}`
	`297`	`+#endif/* ! USE_NO_SIMD */`
	`298`	`+`
`277`	`299`	`/*`
`278`	`300`	`* Return the bitwise OR of the inputs`
`279`	`301`	`*/`

Comments

(0)