Successfully identified regression in *binutils* in CI configuration
tcwg_cross/gnu-release-aarch64-check_cross. So far, this commit has regressed
CI configurations:
- tcwg_cross/gnu-release-aarch64-check_cross
Culprit:
<cut>
commit abe2a28aaa7a2bfd0f3061c72a98eb898976b721
Author: Nick Clifton <ni...@redhat.com>
Date: Fri Jul 9 16:39:06 2021 +0100
Backportpatch to fix parsing of DWARF fuction and variable tags.
PR 27484
bfd * dwarf2.c (scan_unit_for_symbols): Scan twice, once to accumulate
function and variable tags and a second time to resolve their
attributes.
</cut>
Results regressed to (for first_bad == abe2a28aaa7a2bfd0f3061c72a98eb898976b721)
# reset_artifacts:
-10
# build_abe binutils:
-8
# build_abe stage1:
-7
# build_abe linux:
-6
# build_abe glibc:
-5
# build_abe stage2:
-4
# build_abe qemu:
-3
# build_abe dejagnu:
0
# build_abe check_gcc --:
1
# Getting actual results from build directory
/home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles
#
/home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/libitm.sum
#
/home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/libgomp.sum
#
/home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/libstdc++.sum
#
/home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/g++.sum
#
/home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/gcc.sum
#
/home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/gfortran.sum
#
/home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/libatomic.sum
# Manifest: gcc-compare-results/contrib/testsuite-management/flaky.xfail
# Getting actual results from build directory base-artifacts/sumfiles
# base-artifacts/sumfiles/libitm.sum
# base-artifacts/sumfiles/libgomp.sum
# base-artifacts/sumfiles/libstdc++.sum
# base-artifacts/sumfiles/g++.sum
# base-artifacts/sumfiles/gcc.sum
# base-artifacts/sumfiles/gfortran.sum
# base-artifacts/sumfiles/libatomic.sum
#
# SUCCESS: No unexpected failures.
from (for last_good == 814d9ecf9b08018aa8ae2cd768ad8628945fd6aa)
# reset_artifacts:
-10
# build_abe binutils:
-8
# build_abe stage1:
-7
# build_abe linux:
-6
# build_abe glibc:
-5
# build_abe stage2:
-4
# build_abe qemu:
-3
# build_abe dejagnu:
0
# build_abe check_gcc --:
1
Artifacts of last_good build:
https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross/27/artifact/artifacts/build-814d9ecf9b08018aa8ae2cd768ad8628945fd6aa/
Artifacts of first_bad build:
https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross/27/artifact/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/
Build top page/logs:
https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross/27/
Configuration details:
Reproduce builds:
<cut>
mkdir investigate-binutils-abe2a28aaa7a2bfd0f3061c72a98eb898976b721
cd investigate-binutils-abe2a28aaa7a2bfd0f3061c72a98eb898976b721
git clone https://git.linaro.org/toolchain/jenkins-scripts
mkdir -p artifacts/manifests
curl -o artifacts/manifests/build-baseline.sh
https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross/27/artifact/artifacts/manifests/build-baseline.sh
--fail
curl -o artifacts/manifests/build-parameters.sh
https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross/27/artifact/artifacts/manifests/build-parameters.sh
--fail
curl -o artifacts/test.sh
https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross/27/artifact/artifacts/test.sh
--fail
chmod +x artifacts/test.sh
# Reproduce the baseline build (build all pre-requisites)
./jenkins-scripts/tcwg_gnu-build.sh @@ artifacts/manifests/build-baseline.sh
cd binutils
# Reproduce first_bad build
git checkout --detach abe2a28aaa7a2bfd0f3061c72a98eb898976b721
../artifacts/test.sh
# Reproduce last_good build
git checkout --detach 814d9ecf9b08018aa8ae2cd768ad8628945fd6aa
../artifacts/test.sh
cd ..
</cut>
History of pending regressions and results:
https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/ci/tcwg_cross/gnu-release-aarch64-check_cross
Artifacts:
https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross/27/artifact/artifacts/
Build log:
https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross/27/consoleText
Full commit (up to 1000 lines):
<cut>
commit abe2a28aaa7a2bfd0f3061c72a98eb898976b721
Author: Nick Clifton <ni...@redhat.com>
Date: Fri Jul 9 16:39:06 2021 +0100
Backportpatch to fix parsing of DWARF fuction and variable tags.
PR 27484
bfd * dwarf2.c (scan_unit_for_symbols): Scan twice, once to accumulate
function and variable tags and a second time to resolve their
attributes.
---
bfd/ChangeLog | 10 +++++
bfd/dwarf2.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 117 insertions(+), 27 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a8b7415fadc..cd6f3706fe2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+2021-07-09 Nick Clifton <ni...@redhat.com>
+
+ Backport this patch from the mainline:
+ 2021-03-02 Nick Clifton <ni...@redhat.com>
+
+ PR 27484
+ * dwarf2.c (scan_unit_for_symbols): Scan twice, once to accumulate
+ function and variable tags and a second time to resolve their
+ attributes.
+
2021-05-03 Alan Modra <amo...@gmail.com>
PR 27755
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 5651696c0f7..02618154a21 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -1484,6 +1484,8 @@ struct funcinfo
struct arange arange;
/* Where the symbol is defined. */
asection * sec;
+ /* The offset of the funcinfo from the start of the unit. */
+ bfd_uint64_t unit_offset;
};
struct lookup_funcinfo
@@ -3304,6 +3306,15 @@ read_rangelist (struct comp_unit *unit, struct arange
*arange,
return read_rnglists (unit, arange, offset);
}
+static struct funcinfo *
+lookup_func_by_offset (bfd_uint64_t offset, struct funcinfo * table)
+{
+ for (; table != NULL; table = table->prev_func)
+ if (table->unit_offset == offset)
+ return table;
+ return NULL;
+}
+
static struct varinfo *
lookup_var_by_offset (bfd_uint64_t offset, struct varinfo * table)
{
@@ -3317,7 +3328,6 @@ lookup_var_by_offset (bfd_uint64_t offset, struct varinfo
* table)
return NULL;
}
-
/* DWARF2 Compilation unit functions. */
/* Scan over each die in a comp. unit looking for functions to add
@@ -3330,7 +3340,8 @@ scan_unit_for_symbols (struct comp_unit *unit)
bfd_byte *info_ptr = unit->first_child_die_ptr;
bfd_byte *info_ptr_end = unit->end_ptr;
int nesting_level = 0;
- struct nest_funcinfo {
+ struct nest_funcinfo
+ {
struct funcinfo *func;
} *nested_funcs;
int nested_funcs_size;
@@ -3344,16 +3355,16 @@ scan_unit_for_symbols (struct comp_unit *unit)
return FALSE;
nested_funcs[nesting_level].func = 0;
+ /* PR 27484: We must scan the DIEs twice. The first time we look for
+ function and variable tags and accumulate them into their respective
+ tables. The second time through we process the attributes of the
+ functions/variables and augment the table entries. */
while (nesting_level >= 0)
{
unsigned int abbrev_number, bytes_read, i;
struct abbrev_info *abbrev;
- struct attribute attr;
struct funcinfo *func;
struct varinfo *var;
- bfd_vma low_pc = 0;
- bfd_vma high_pc = 0;
- bfd_boolean high_pc_relative = FALSE;
bfd_uint64_t current_offset;
/* PR 17512: file: 9f405d9d. */
@@ -3365,7 +3376,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
FALSE, info_ptr_end);
info_ptr += bytes_read;
- if (! abbrev_number)
+ if (abbrev_number == 0)
{
nesting_level--;
continue;
@@ -3400,6 +3411,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
goto fail;
func->tag = abbrev->tag;
func->prev_func = unit->function_table;
+ func->unit_offset = current_offset;
unit->function_table = func;
unit->number_of_functions++;
BFD_ASSERT (!unit->cached);
@@ -3420,6 +3432,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
|| abbrev->tag == DW_TAG_member)
{
size_t amt = sizeof (struct varinfo);
+
var = (struct varinfo *) bfd_zalloc (abfd, amt);
if (var == NULL)
goto fail;
@@ -3438,6 +3451,89 @@ scan_unit_for_symbols (struct comp_unit *unit)
nested_funcs[nesting_level].func = 0;
}
+ for (i = 0; i < abbrev->num_attrs; ++i)
+ {
+ struct attribute attr;
+
+ info_ptr = read_attribute (&attr, &abbrev->attrs[i],
+ unit, info_ptr, info_ptr_end);
+ if (info_ptr == NULL)
+ goto fail;
+ }
+
+ if (abbrev->has_children)
+ {
+ nesting_level++;
+
+ if (nesting_level >= nested_funcs_size)
+ {
+ struct nest_funcinfo *tmp;
+
+ nested_funcs_size *= 2;
+ tmp = (struct nest_funcinfo *)
+ bfd_realloc (nested_funcs,
+ nested_funcs_size * sizeof (*nested_funcs));
+ if (tmp == NULL)
+ goto fail;
+ nested_funcs = tmp;
+ }
+ nested_funcs[nesting_level].func = 0;
+ }
+ }
+
+ /* This is the second pass over the abbrevs. */
+ info_ptr = unit->first_child_die_ptr;
+ nesting_level = 0;
+
+ while (nesting_level >= 0)
+ {
+ unsigned int abbrev_number, bytes_read, i;
+ struct abbrev_info *abbrev;
+ struct attribute attr;
+ struct funcinfo *func;
+ struct varinfo *var;
+ bfd_vma low_pc = 0;
+ bfd_vma high_pc = 0;
+ bfd_boolean high_pc_relative = FALSE;
+ bfd_uint64_t current_offset;
+
+ /* PR 17512: file: 9f405d9d. */
+ if (info_ptr >= info_ptr_end)
+ goto fail;
+
+ current_offset = info_ptr - unit->info_ptr_unit;
+ abbrev_number = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
+ FALSE, info_ptr_end);
+ info_ptr += bytes_read;
+
+ if (! abbrev_number)
+ {
+ nesting_level--;
+ continue;
+ }
+
+ abbrev = lookup_abbrev (abbrev_number, unit->abbrevs);
+ /* This should have been handled above. */
+ BFD_ASSERT (abbrev != NULL);
+
+ func = NULL;
+ var = NULL;
+ if (abbrev->tag == DW_TAG_subprogram
+ || abbrev->tag == DW_TAG_entry_point
+ || abbrev->tag == DW_TAG_inlined_subroutine)
+ {
+ func = lookup_func_by_offset (current_offset, unit->function_table);
+ if (func == NULL)
+ goto fail;
+ }
+ else if (abbrev->tag == DW_TAG_variable
+ || abbrev->tag == DW_TAG_member)
+ {
+ var = lookup_var_by_offset (current_offset, unit->variable_table);
+ if (var == NULL)
+ goto fail;
+ }
+
for (i = 0; i < abbrev->num_attrs; ++i)
{
info_ptr = read_attribute (&attr, &abbrev->attrs[i],
@@ -3532,7 +3628,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
{
_bfd_error_handler (_("DWARF error: could not find "
"variable specification "
- "at offset %lx"),
+ "at offset 0x%lx"),
(unsigned long) attr.u.val);
break;
}
@@ -3604,6 +3700,9 @@ scan_unit_for_symbols (struct comp_unit *unit)
}
}
+ if (abbrev->has_children)
+ nesting_level++;
+
if (high_pc_relative)
high_pc += low_pc;
@@ -3612,25 +3711,6 @@ scan_unit_for_symbols (struct comp_unit *unit)
if (!arange_add (unit, &func->arange, low_pc, high_pc))
goto fail;
}
-
- if (abbrev->has_children)
- {
- nesting_level++;
-
- if (nesting_level >= nested_funcs_size)
- {
- struct nest_funcinfo *tmp;
-
- nested_funcs_size *= 2;
- tmp = (struct nest_funcinfo *)
- bfd_realloc (nested_funcs,
- nested_funcs_size * sizeof (*nested_funcs));
- if (tmp == NULL)
- goto fail;
- nested_funcs = tmp;
- }
- nested_funcs[nesting_level].func = 0;
- }
}
free (nested_funcs);
</cut>
_______________________________________________
linaro-toolchain mailing list
linaro-toolchain@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/linaro-toolchain
