[committed] Don't call die_odr_state with unnecessarily defined cu arg
Tom de Vries
tdevries@suse.de
Mon Feb 22 15:39:03 GMT 2021
Hi,
When compiling dwz with this patch:
...
die_odr_state (dw_cu_ref cu, dw_die_ref die)
{
if (die->die_odr_state != ODR_UNKNOWN)
- return die->die_odr_state;
+ {
+ assert (cu == NULL);
+ return die->die_odr_state;
+ }
...
and running f.i. odr-struct.sh, we run into the abort.
The recent commit 3312feb "Fix CK_BAD propagation for --odr" introduced this
code:
...
if (die_odr_state (die_cu (die), die) != ODR_NONE)
die->u.p1.die_ref_hash = die->u.p1.die_hash;
...
and there's no need to pass a CU argument, which makes the abort trigger.
Fix this by passing a NULL CU instead.
Committed to trunk.
Thanks,
- Tom
Don't call die_odr_state with unnecessarily defined cu arg
2021-02-22 Tom de Vries <tdevries@suse.de>
* dwz.c (read_debug_info): Pass NULL CU to die_odr_state call.
---
dwz.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dwz.c b/dwz.c
index 076f39c..86863ce 100644
--- a/dwz.c
+++ b/dwz.c
@@ -7253,7 +7253,7 @@ read_debug_info (DSO *dso, int kind, unsigned int *die_count)
{
if (die->die_ck_state != CK_KNOWN)
continue;
- if (die_odr_state (die_cu (die), die) != ODR_NONE)
+ if (die_odr_state (NULL, die) != ODR_NONE)
die->u.p1.die_ref_hash = die->u.p1.die_hash;
else
die->die_ref_hash_computed = 0;
More information about the Dwz
mailing list