[PATCH 0/1] MR1439: dbghelp: Function static variables should be found by address.

[eric pouech (＠epo)]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1439

[PATCH 1/1] dbghelp: Function static variables should be found by address.

[Eric Pouech]

From: Eric Pouech <eric.pouech(a)gmail.com>

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
 dlls/dbghelp/symbol.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index c82b5b3d4ef..18699e47984 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -150,11 +150,10 @@ static BOOL symt_grow_sorttab(struct module* module, unsigned sz)
     return TRUE;
 }
 
-static void symt_add_module_ht(struct module* module, struct symt_ht* ht)
+static void symt_add_module_addr(struct module* module, struct symt_ht* ht)
 {
     ULONG64             addr;
 
-    hash_table_add(&module->ht_symbols, &ht->hash_elt);
     /* Don't store in sorttab a symbol without address, they are of
      * no use here (e.g. constant values)
      */
@@ -166,6 +165,12 @@ static void symt_add_module_ht(struct module* module, struct symt_ht* ht)
     }
 }
 
+static void symt_add_module_ht(struct module* module, struct symt_ht* ht)
+{
+    hash_table_add(&module->ht_symbols, &ht->hash_elt);
+    symt_add_module_addr(module, ht);
+}
+
 static WCHAR* file_regex(const char* srcfile)
 {
     WCHAR* mask;
@@ -488,6 +493,8 @@ struct symt_data* symt_add_func_local(struct module* module,
     else
         p = vector_add(&func->vchildren, &module->pool);
     *p = &locsym->symt;
+    if (dt == DataIsStaticLocal)
+        symt_add_module_addr(module, (struct symt_ht*)locsym);
     return locsym;
 }
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1439

[PATCH 1/1] dbghelp: Function static variables should be found by address.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=126365

Your paranoid android.


=== debian11 (32 bit report) ===

d3d8:
stateblock: Timeout
visual: Timeout

d3d9:
d3d9ex: Timeout
device: Timeout
stateblock: Timeout
visual: Timeout

d3dcompiler_43:
asm: Timeout
blob: Timeout
hlsl_d3d11: Timeout
hlsl_d3d9: Timeout
reflection: Timeout

d3dcompiler_46:
asm: Timeout
blob: Timeout
hlsl_d3d11: Timeout
hlsl_d3d9: Timeout
reflection: Timeout

d3dcompiler_47:
asm: Timeout
blob: Timeout
hlsl_d3d11: Timeout
hlsl_d3d9: Timeout
reflection: Timeout

d3drm:
d3drm: Timeout

Report validation errors:
vector: Timeout

=== debian11 (build log) ===

WineRunWineTest.pl:error: The task timed out