The real issue here is that GNU awk's regex implementation assumes a bit too much about the relative sizes of pointers and long integers. What they really want is to use intptr_t. This patch recapitulates what 56a1a3ab449 (Silence GCC's "cast of pointer to integer of a different size" warning, 2015-10-26) did to our previous copy of GNU awk's regex engine. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- Published-As: https://github.com/dscho/git/releases/tag/compat-regex-fixes-v1 Fetch-It-Via: git fetch https://github.com/dscho/git compat-regex-fixes-v1 .../0003-Use-intptr_t-instead-of-long.patch | 22 ++++++++++++++++++++++ compat/regex/regcomp.c | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 compat/regex/patches/0003-Use-intptr_t-instead-of-long.patch diff --git a/compat/regex/patches/0003-Use-intptr_t-instead-of-long.patch b/compat/regex/patches/0003-Use-intptr_t-instead-of-long.patch new file mode 100644 index 00000000000..246ff256fb8 --- /dev/null +++ b/compat/regex/patches/0003-Use-intptr_t-instead-of-long.patch @@ -0,0 +1,22 @@ +diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c +index 5e9ea26cd46..e6469167a80 100644 +--- a/compat/regex/regcomp.c ++++ b/compat/regex/regcomp.c +@@ -2641,7 +2641,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa, + old_tree = NULL; + + if (elem->token.type == SUBEXP) +- postorder (elem, mark_opt_subexp, (void *) (long) elem->token.opr.idx); ++ postorder (elem, mark_opt_subexp, (void *) (intptr_t) elem->token.opr.idx); + + tree = create_tree (dfa, elem, NULL, (end == -1 ? OP_DUP_ASTERISK : OP_ALT)); + if (BE (tree == NULL, 0)) +@@ -3868,7 +3868,7 @@ create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, + static reg_errcode_t + mark_opt_subexp (void *extra, bin_tree_t *node) + { +- int idx = (int) (long) extra; ++ int idx = (int) (intptr_t) extra; + if (node->token.type == SUBEXP && node->token.opr.idx == idx) + node->token.opt_subexp = 1; + diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c index 5e9ea26cd46..e6469167a80 100644 --- a/compat/regex/regcomp.c +++ b/compat/regex/regcomp.c @@ -2641,7 +2641,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa, old_tree = NULL; if (elem->token.type == SUBEXP) - postorder (elem, mark_opt_subexp, (void *) (long) elem->token.opr.idx); + postorder (elem, mark_opt_subexp, (void *) (intptr_t) elem->token.opr.idx); tree = create_tree (dfa, elem, NULL, (end == -1 ? OP_DUP_ASTERISK : OP_ALT)); if (BE (tree == NULL, 0)) @@ -3868,7 +3868,7 @@ create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, static reg_errcode_t mark_opt_subexp (void *extra, bin_tree_t *node) { - int idx = (int) (long) extra; + int idx = (int) (intptr_t) extra; if (node->token.type == SUBEXP && node->token.opr.idx == idx) node->token.opt_subexp = 1; base-commit: 4e23cefb4da69a2d884c2d5a303825f40008ca42 -- 2.12.2.windows.2.800.gede8f145e06