diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2023-04-02 12:08:24 -0400 |
---|---|---|
committer | Eli Schwartz <eschwartz@archlinux.org> | 2023-04-04 15:06:17 -0400 |
commit | 8fc4649bfe7c0cad389769624e690e4fbf0f186f (patch) | |
tree | d1073bf10e7856e12934814ad5b89aa254ec5630 /test cases/failing/32 exe static shared | |
parent | 5fe7ecb861325dd8e88eedde4769269c6a10ccf0 (diff) | |
download | meson-8fc4649bfe7c0cad389769624e690e4fbf0f186f.zip meson-8fc4649bfe7c0cad389769624e690e4fbf0f186f.tar.gz meson-8fc4649bfe7c0cad389769624e690e4fbf0f186f.tar.bz2 |
propagate the most accurate node to error messages
During evaluation of codeblocks, we start off with an iteration of
nodes, and then while evaluating them we may update the global
self.current_node context. When catching and formatting errors, we
didn't take into account that the node might be updated from the
original top-level iteration.
Switch to formatting errors using self.current_node instead, to ensure
we can point at the likely most-accurate actual cause of an error.
Also update the current node in a few more places, so that function
calls always see the function call as the current node, even if the most
recently parsed node was an argument to the function call.
Fixes #11643
Diffstat (limited to 'test cases/failing/32 exe static shared')
-rw-r--r-- | test cases/failing/32 exe static shared/test.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test cases/failing/32 exe static shared/test.json b/test cases/failing/32 exe static shared/test.json index 51d3804..0b859e3 100644 --- a/test cases/failing/32 exe static shared/test.json +++ b/test cases/failing/32 exe static shared/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/32 exe static shared/meson.build:9:0: ERROR: Can't link non-PIC static library 'stat' into shared library 'shr2'. Use the 'pic' option to static_library to build with PIC." + "line": "test cases/failing/32 exe static shared/meson.build:9:9: ERROR: Can't link non-PIC static library 'stat' into shared library 'shr2'. Use the 'pic' option to static_library to build with PIC." } ] } |