sparse/pre-process: don't update next->pos in collect_arg()
PATCH 1/1 sparse/pre-process: don't update next->pos in collect_arg()
I don't quite understand why the expand() -> collect_arg() path updates ->pos for each token in the input *list, but this breaks dissect and thus semind.
Change collect_arg() to update next->pos only if "preprocess_only" is true, the "if (preprocess_only)" block in sparse_tokenstream() relies on the current behaviour.
Test-case:
$ cat -n PP_POS.c
1 #define READ_ONCE(x) x
2 #define WRITE_ONCE(x, y) x = y
3
4 int R, W;
5
6 void func(void)
7 {
8 WRITE_ONCE(
9 W,
10 READ_ONCE(R)
11 );
12 }$ ./test-dissect PP_POS.c 4:5 def v R int 4:8 def v W int 6:6 def f func void ( ... ) 8:3 func -w- v W int 8:3 func -r- v R int
The reported positions of the usage of R and W are wrong, and thus ./semind doesn't work:
$ ./semind add PP_POS.c $ ./semind search -l PP_POS.c:10:16
With this patch:
$ ./test-dissect PP_POS.c 4:5 def v R int 4:8 def v W int 6:6 def f func void ( ... ) 9:6 func -w- v W int 10:16 func -r- v R int
$ ./semind add PP_POS.c $ ./semind search -l PP_POS.c:10:16 (def) PP_POS.c 4 5 int R, W; (-r-) PP_POS.c 10 16 func READ_ONCE(R)
See also the changes in validation/parsing/attr-cleanup.c and validation/sizeof-void.c, the updated positions look more correct.
Suggested-by Chris Li <[email protected]>
Signed-off-by Oleg Nesterov <[email protected]>
--- pre-process.c | 9 ++++++--- validation/parsing/attr-cleanup.c | 2 +- validation/sizeof-void.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-)
pre-process.c +6 -3
@@ -294,9 +294,12 @@ static struct token *collect_arg(struct token *prev, int vararg, struct position }else if (match_op (next,',' ) && !nesting && !vararg) {break ; } - next->pos.stream = pos->stream; - next->pos.line = pos->line; - next->pos.pos = pos->pos; +/* See "if (preprocess_only)" in sparse_tokenstream() */ +if (preprocess_only) { + next->pos.stream = pos->stream; + next->pos.line = pos->line; + next->pos.pos = pos->pos; + } next->pos.newline =0 ; p = &next->next; }
validation/parsing/attr-cleanup.c +1 -1
@@ -24,7 +24,7 @@ int test(int n)* check-command: sparse -Wunknown-attribute $file * * check-error-start -parsing/attr-cleanup.c:10:17: error: argument is not an identifier +parsing/attr-cleanup.c:10:27: error: argument is not an identifier parsing/attr-cleanup.c:11:39: error: an argument is expected for attribute 'cleanup' parsing/attr-cleanup.c:12:40: error: an argument is expected for attribute 'cleanup' parsing/attr-cleanup.c:13:43: error: Expected ) after attribute's argument'
validation/sizeof-void.c +1 -1
@@ -36,7 +36,7 @@ sizeof-void.c:16:14: warning: expression using sizeof(void) sizeof-void.c:17:14: warning: expression using sizeof(void) sizeof-void.c:18:14: warning: expression using sizeof(void) sizeof-void.c:19:14: warning: expression using sizeof(void) -sizeof-void.c:20:14: warning: expression using sizeof(void) +sizeof-void.c:20:27: warning: expression using sizeof(void) sizeof-void.c:21:14: warning: expression using sizeof(void) sizeof-void.c:22:14: warning: expression using sizeof(void) sizeof-void.c:23:14: warning: expression using sizeof(void)
Signature · 1 line
2.52.0