fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: isolate object macro replacments

Browse source 
Here we use a leading space to isolate them from
the code they will be inserted into. For example:

    #define VALUE -1.0
    int a = -VALUE;

Should be evaluated to int a = - -1.0; not int a = --1.0;

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7932

Cc: mesa-stable
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21352>
This commit is contained in:
Timothy Arceri 2023-02-15 23:14:13 +11:00 • committed by Marge Bot
parent 6e29dce291
commit 3a9edfc494
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/compiler/glsl/glcpp/glcpp-parse.y
View file

@ -1969,8 +1969,8 @@ _glcpp_parser_expand_function(glcpp_parser_t *parser, token_node_t *node,
*/
static token_list_t *
_glcpp_parser_expand_node(glcpp_parser_t *parser, token_node_t *node,
token_node_t **last, expansion_mode_t mode,
int line)
token_node_t *node_prev, token_node_t **last,
expansion_mode_t mode, int line)
{
token_t *token = node->token;
const char *identifier;
@ -2033,6 +2033,22 @@ _glcpp_parser_expand_node(glcpp_parser_t *parser, token_node_t *node,
return _token_list_create_with_one_space(parser);
replacement = _token_list_copy(parser, macro->replacements);
/* If needed insert space in front of replacements to isolate them from
* the code they will be inserted into. For example:
*
* #define VALUE -1.0
* int a = -VALUE;
*
* Should be evaluated to int a = - -1.0; not int a = --1.0;
*/
if (node_prev &&
(node_prev->token->type == '-' || node_prev->token->type == '+') &&
node_prev->token->type == replacement->head->token->type) {
token_t *new_token = _token_create_ival(parser, SPACE, SPACE);
_token_list_prepend(parser, replacement, new_token);
}
_glcpp_parser_apply_pastes(parser, replacement);
return replacement;
}
@ -2139,7 +2155,8 @@ _glcpp_parser_expand_token_list(glcpp_parser_t *parser, token_list_t *list,
while (parser->active && parser->active->marker == node)
_parser_active_list_pop (parser);
expansion = _glcpp_parser_expand_node (parser, node, &last, mode, line);
expansion =
_glcpp_parser_expand_node(parser, node, node_prev, &last, mode, line);
if (expansion) {
token_node_t *n;