Support/Regex is unaware of LLP64(Win64)

[llvmbot]

Bugzilla Link	8787
Resolution	WONTFIX
Resolved on	Nov 06, 2014 15:11
Version	trunk
OS	Windows XP
Blocks	llvm/llvm-bugzilla-archive#9100
Reporter	LLVM Bugzilla Contributor
CC	@rnk

Extended Description

in regexec.c:

/* macros for manipulating states, small version /
#define states long / i32 */
#define states1 states

#include "regengine.inc"

/* now undo things */
#undef states

/* macros for manipulating states, large version */
#define states char *

if (g->nstates <= (long)(CHAR_BIT*sizeof(states1)) ...

"states1" is expanded as "char *", and the condition becomes true
even if nstates > 32. Then regex might behave buggy.

Workaround:
--- a/lib/Support/regexec.c
+++ b/lib/Support/regexec.c
@@ -54,8 +54,8 @@
#include "regex2.h"

/* macros for manipulating states, small version /
-#define states long
-#define states1 states / for later use in llvm_regexec() decision /
+#define states1 long / for later use in llvm_regexec() decision */
+#define states states1
#define CLEAR(v) ((v) = 0)
#define SET0(v, n) ((v) &= ~((unsigned long)1 << (n)))
#define SET1(v, n) ((v) |= (unsigned long)1 << (n))

[lattner]

Looks fine to me, please apply if there are no testsuite regressions. Please send patches to llvm-commits,

-Chris

[llvmbot]

I have committed above as r121942.
I think it is still workaround.
I added FIXME and I will leave this issue opened.

/* FIXME: 'states' is assumed as 'long' on small version. */

Consider, to 'states, giving 'uint64_t' on i686,
and giving 'short' on any hosts.

Looks fine to me, please apply if there are no testsuite regressions. Please
send patches to llvm-commits,

I see, thank you!

[rnk]

I have committed above as r121942.
I think it is still workaround.
I added FIXME and I will leave this issue opened.

/* FIXME: 'states' is assumed as 'long' on small version. */

Consider, to 'states, giving 'uint64_t' on i686,
and giving 'short' on any hosts.

I don't think we need to do anything here. This workaround has held up fine for four years, and by the time it stops working we can switch to C++11 . This is still marked as blocking a win64 self-host, which already works.

Feel free to reopen if you feel otherwise.

[llvmbot]

Yes, we won't fix this anymore. :)

[llvmbot]

mentioned in issue llvm/llvm-bugzilla-archive#9100