From 57ebc553828bf696b4bde30789e609ba96e94d6d Mon Sep 17 00:00:00 2001 From: Wu Yingcong Date: Fri, 22 Aug 2025 15:16:47 +0800 Subject: [PATCH 01/14] fix missing by one bug --- libunwind/src/DwarfParser.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libunwind/src/DwarfParser.hpp b/libunwind/src/DwarfParser.hpp index 7e85025dd054d..25250e0810987 100644 --- a/libunwind/src/DwarfParser.hpp +++ b/libunwind/src/DwarfParser.hpp @@ -273,7 +273,7 @@ bool CFI_Parser::findFDE(A &addressSpace, pint_t pc, pint_t ehSectionStart, pint_t pcRange = addressSpace.getEncodedP( p, nextCFI, cieInfo->pointerEncoding & 0x0F); // Test if pc is within the function this FDE covers. - if ((pcStart < pc) && (pc <= pcStart + pcRange)) { + if ((pcStart <= pc) && (pc < pcStart + pcRange)) { // parse rest of info fdeInfo->lsda = 0; // check for augmentation length From 3b1e1f76fc66fbcc549280fd9a60eeeb6eab52ca Mon Sep 17 00:00:00 2001 From: Wu Yingcong Date: Mon, 25 Aug 2025 09:52:18 +0800 Subject: [PATCH 02/14] empty commit trigger ci From fbf9b3f03b1d2ee0bad1df58ca05be50139da378 Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Thu, 28 Aug 2025 14:11:12 +0800 Subject: [PATCH 03/14] add test --- libunwind/test/eh_frame_fde_pc_range.pass.cpp | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 libunwind/test/eh_frame_fde_pc_range.pass.cpp diff --git a/libunwind/test/eh_frame_fde_pc_range.pass.cpp b/libunwind/test/eh_frame_fde_pc_range.pass.cpp new file mode 100644 index 0000000000000..b77287cc3c243 --- /dev/null +++ b/libunwind/test/eh_frame_fde_pc_range.pass.cpp @@ -0,0 +1,47 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// Manually marking the .eh_frame_hdr as DW_EH_PE_omit to make libunwind to do +// the linear search. + +// clang-format off +// REQUIRES: target={{x86_64-.+-linux-gnu}} +// RUN: %{build} +// RUN: objcopy --dump-section .eh_frame_hdr=%t_ehf_hdr.bin %t.exe +// RUN: echo -ne '\xFF' | dd of=%t_ehf_hdr.bin bs=1 seek=2 count=2 conv=notrunc status=none +// RUN: objcopy --update-section .eh_frame_hdr=%t_ehf_hdr.bin %t.exe +// RUN: %{exec} %t.exe +// clang-format on + +#include +#include +#include +#include +#include + +void f() { + printf("123\n"); + void *pc = __builtin_return_address(0); + void *fpc = (void *)&f; + void *fpc1 = (void *)((uintptr_t)fpc + 1); + + struct dwarf_eh_bases bases; + const void *fde_pc = _Unwind_Find_FDE(pc, &bases); + const void *fde_fpc = _Unwind_Find_FDE(fpc, &bases); + const void *fde_fpc1 = _Unwind_Find_FDE(fpc1, &bases); + assert(fde_pc != NULL); + assert(fde_fpc != NULL); + assert(fde_fpc1 != NULL); + assert(fde_fpc == fde_fpc1); +} + +int main() { + f(); + return 0; +} From ad2f48124deadea8f271fd58aa5286da0966d7fb Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Thu, 28 Aug 2025 14:21:41 +0800 Subject: [PATCH 04/14] update test --- libunwind/test/eh_frame_fde_pc_range.pass.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libunwind/test/eh_frame_fde_pc_range.pass.cpp b/libunwind/test/eh_frame_fde_pc_range.pass.cpp index b77287cc3c243..01d73bff6ffb7 100644 --- a/libunwind/test/eh_frame_fde_pc_range.pass.cpp +++ b/libunwind/test/eh_frame_fde_pc_range.pass.cpp @@ -9,6 +9,7 @@ // Manually marking the .eh_frame_hdr as DW_EH_PE_omit to make libunwind to do // the linear search. +// Assuming the begining of the function is at the start of the FDE range. // clang-format off // REQUIRES: target={{x86_64-.+-linux-gnu}} @@ -35,6 +36,9 @@ void f() { const void *fde_pc = _Unwind_Find_FDE(pc, &bases); const void *fde_fpc = _Unwind_Find_FDE(fpc, &bases); const void *fde_fpc1 = _Unwind_Find_FDE(fpc1, &bases); + printf("fde_pc = %p\n", fde_pc); + printf("fde_fpc = %p\n", fde_fpc); + printf("fde_fpc1 = %p\n", fde_fpc1); assert(fde_pc != NULL); assert(fde_fpc != NULL); assert(fde_fpc1 != NULL); From 9fd7b57d16932e056c6c40c71fe90fc3f5ed25e9 Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Thu, 28 Aug 2025 14:23:51 +0800 Subject: [PATCH 05/14] update test --- libunwind/test/eh_frame_fde_pc_range.pass.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libunwind/test/eh_frame_fde_pc_range.pass.cpp b/libunwind/test/eh_frame_fde_pc_range.pass.cpp index 01d73bff6ffb7..46ab7f2dabe06 100644 --- a/libunwind/test/eh_frame_fde_pc_range.pass.cpp +++ b/libunwind/test/eh_frame_fde_pc_range.pass.cpp @@ -39,6 +39,7 @@ void f() { printf("fde_pc = %p\n", fde_pc); printf("fde_fpc = %p\n", fde_fpc); printf("fde_fpc1 = %p\n", fde_fpc1); + fflush(stdout); assert(fde_pc != NULL); assert(fde_fpc != NULL); assert(fde_fpc1 != NULL); From 1284cb7a0edda35c50adf07f74f0b5a2348e22ce Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Thu, 28 Aug 2025 16:31:38 +0800 Subject: [PATCH 06/14] skip msan --- libunwind/test/eh_frame_fde_pc_range.pass.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libunwind/test/eh_frame_fde_pc_range.pass.cpp b/libunwind/test/eh_frame_fde_pc_range.pass.cpp index 46ab7f2dabe06..ee1ab688359c3 100644 --- a/libunwind/test/eh_frame_fde_pc_range.pass.cpp +++ b/libunwind/test/eh_frame_fde_pc_range.pass.cpp @@ -13,6 +13,10 @@ // clang-format off // REQUIRES: target={{x86_64-.+-linux-gnu}} + +// TODO: Figure out why this fails with Memory Sanitizer. +// XFAIL: msan + // RUN: %{build} // RUN: objcopy --dump-section .eh_frame_hdr=%t_ehf_hdr.bin %t.exe // RUN: echo -ne '\xFF' | dd of=%t_ehf_hdr.bin bs=1 seek=2 count=2 conv=notrunc status=none From 1114e5c55157a6dc45f075a640421f1cc9d914ca Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Fri, 29 Aug 2025 10:09:41 +0800 Subject: [PATCH 07/14] test for CI --- libunwind/src/DwarfParser.hpp | 2 +- libunwind/test/eh_frame_fde_pc_range.pass.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libunwind/src/DwarfParser.hpp b/libunwind/src/DwarfParser.hpp index 25250e0810987..7e85025dd054d 100644 --- a/libunwind/src/DwarfParser.hpp +++ b/libunwind/src/DwarfParser.hpp @@ -273,7 +273,7 @@ bool CFI_Parser::findFDE(A &addressSpace, pint_t pc, pint_t ehSectionStart, pint_t pcRange = addressSpace.getEncodedP( p, nextCFI, cieInfo->pointerEncoding & 0x0F); // Test if pc is within the function this FDE covers. - if ((pcStart <= pc) && (pc < pcStart + pcRange)) { + if ((pcStart < pc) && (pc <= pcStart + pcRange)) { // parse rest of info fdeInfo->lsda = 0; // check for augmentation length diff --git a/libunwind/test/eh_frame_fde_pc_range.pass.cpp b/libunwind/test/eh_frame_fde_pc_range.pass.cpp index ee1ab688359c3..3100082c0c270 100644 --- a/libunwind/test/eh_frame_fde_pc_range.pass.cpp +++ b/libunwind/test/eh_frame_fde_pc_range.pass.cpp @@ -14,8 +14,6 @@ // clang-format off // REQUIRES: target={{x86_64-.+-linux-gnu}} -// TODO: Figure out why this fails with Memory Sanitizer. -// XFAIL: msan // RUN: %{build} // RUN: objcopy --dump-section .eh_frame_hdr=%t_ehf_hdr.bin %t.exe From 9e9dda6e57a2562b723e2263e25260c3e6ec8097 Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Fri, 29 Aug 2025 10:10:20 +0800 Subject: [PATCH 08/14] test for CI --- libunwind/test/eh_frame_fde_pc_range.pass.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/libunwind/test/eh_frame_fde_pc_range.pass.cpp b/libunwind/test/eh_frame_fde_pc_range.pass.cpp index 3100082c0c270..6ed82de870562 100644 --- a/libunwind/test/eh_frame_fde_pc_range.pass.cpp +++ b/libunwind/test/eh_frame_fde_pc_range.pass.cpp @@ -12,8 +12,6 @@ // Assuming the begining of the function is at the start of the FDE range. // clang-format off -// REQUIRES: target={{x86_64-.+-linux-gnu}} - // RUN: %{build} // RUN: objcopy --dump-section .eh_frame_hdr=%t_ehf_hdr.bin %t.exe From 0b6b02c9fdf53f8849b7699293eb1bde79d5242b Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Fri, 29 Aug 2025 10:19:00 +0800 Subject: [PATCH 09/14] test for CI(need a change in libunwind) --- libunwind/src/DwarfParser.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libunwind/src/DwarfParser.hpp b/libunwind/src/DwarfParser.hpp index 7e85025dd054d..823e44ce04558 100644 --- a/libunwind/src/DwarfParser.hpp +++ b/libunwind/src/DwarfParser.hpp @@ -273,7 +273,7 @@ bool CFI_Parser::findFDE(A &addressSpace, pint_t pc, pint_t ehSectionStart, pint_t pcRange = addressSpace.getEncodedP( p, nextCFI, cieInfo->pointerEncoding & 0x0F); // Test if pc is within the function this FDE covers. - if ((pcStart < pc) && (pc <= pcStart + pcRange)) { + if ((pcStart < pc) && (pc <= pcStart + pcRange)) { // parse rest of info fdeInfo->lsda = 0; // check for augmentation length From fccfb5a581eeb2a3db083fbf443d6eb83b892c2a Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Fri, 29 Aug 2025 10:19:42 +0800 Subject: [PATCH 10/14] test for CI(need a change in libunwind) --- libunwind/src/DwarfParser.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libunwind/src/DwarfParser.hpp b/libunwind/src/DwarfParser.hpp index 823e44ce04558..1a6500f7d0ed1 100644 --- a/libunwind/src/DwarfParser.hpp +++ b/libunwind/src/DwarfParser.hpp @@ -273,7 +273,8 @@ bool CFI_Parser::findFDE(A &addressSpace, pint_t pc, pint_t ehSectionStart, pint_t pcRange = addressSpace.getEncodedP( p, nextCFI, cieInfo->pointerEncoding & 0x0F); // Test if pc is within the function this FDE covers. - if ((pcStart < pc) && (pc <= pcStart + pcRange)) { + if ((pcStart < pc) && (pc <= pcStart + pcRange)) { + ; // parse rest of info fdeInfo->lsda = 0; // check for augmentation length From 0fc017afb0ce66dc7eced30a9a740f5dc814539a Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Fri, 29 Aug 2025 10:30:44 +0800 Subject: [PATCH 11/14] test for CI(need to make the test pass to continue) --- libunwind/test/eh_frame_fde_pc_range.pass.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libunwind/test/eh_frame_fde_pc_range.pass.cpp b/libunwind/test/eh_frame_fde_pc_range.pass.cpp index 6ed82de870562..995e746b10079 100644 --- a/libunwind/test/eh_frame_fde_pc_range.pass.cpp +++ b/libunwind/test/eh_frame_fde_pc_range.pass.cpp @@ -18,6 +18,7 @@ // RUN: echo -ne '\xFF' | dd of=%t_ehf_hdr.bin bs=1 seek=2 count=2 conv=notrunc status=none // RUN: objcopy --update-section .eh_frame_hdr=%t_ehf_hdr.bin %t.exe // RUN: %{exec} %t.exe + // clang-format on #include @@ -40,10 +41,10 @@ void f() { printf("fde_fpc = %p\n", fde_fpc); printf("fde_fpc1 = %p\n", fde_fpc1); fflush(stdout); - assert(fde_pc != NULL); - assert(fde_fpc != NULL); - assert(fde_fpc1 != NULL); - assert(fde_fpc == fde_fpc1); +// assert(fde_pc != NULL); +// assert(fde_fpc != NULL); +// assert(fde_fpc1 != NULL); +// assert(fde_fpc == fde_fpc1); } int main() { From be13b4da0d3b3ea638dfd9718e47d08fbb6fb87e Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Fri, 29 Aug 2025 10:38:33 +0800 Subject: [PATCH 12/14] format --- libunwind/test/eh_frame_fde_pc_range.pass.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libunwind/test/eh_frame_fde_pc_range.pass.cpp b/libunwind/test/eh_frame_fde_pc_range.pass.cpp index 995e746b10079..8bf31ea628826 100644 --- a/libunwind/test/eh_frame_fde_pc_range.pass.cpp +++ b/libunwind/test/eh_frame_fde_pc_range.pass.cpp @@ -41,10 +41,10 @@ void f() { printf("fde_fpc = %p\n", fde_fpc); printf("fde_fpc1 = %p\n", fde_fpc1); fflush(stdout); -// assert(fde_pc != NULL); -// assert(fde_fpc != NULL); -// assert(fde_fpc1 != NULL); -// assert(fde_fpc == fde_fpc1); + // assert(fde_pc != NULL); + // assert(fde_fpc != NULL); + // assert(fde_fpc1 != NULL); + // assert(fde_fpc == fde_fpc1); } int main() { From c927075920cc66479c66d10cfa93592349d014c0 Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Fri, 29 Aug 2025 13:04:55 +0800 Subject: [PATCH 13/14] restore PR --- libunwind/src/DwarfParser.hpp | 3 +-- libunwind/test/eh_frame_fde_pc_range.pass.cpp | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libunwind/src/DwarfParser.hpp b/libunwind/src/DwarfParser.hpp index 1a6500f7d0ed1..25250e0810987 100644 --- a/libunwind/src/DwarfParser.hpp +++ b/libunwind/src/DwarfParser.hpp @@ -273,8 +273,7 @@ bool CFI_Parser::findFDE(A &addressSpace, pint_t pc, pint_t ehSectionStart, pint_t pcRange = addressSpace.getEncodedP( p, nextCFI, cieInfo->pointerEncoding & 0x0F); // Test if pc is within the function this FDE covers. - if ((pcStart < pc) && (pc <= pcStart + pcRange)) { - ; + if ((pcStart <= pc) && (pc < pcStart + pcRange)) { // parse rest of info fdeInfo->lsda = 0; // check for augmentation length diff --git a/libunwind/test/eh_frame_fde_pc_range.pass.cpp b/libunwind/test/eh_frame_fde_pc_range.pass.cpp index 8bf31ea628826..9ef2f65c529ae 100644 --- a/libunwind/test/eh_frame_fde_pc_range.pass.cpp +++ b/libunwind/test/eh_frame_fde_pc_range.pass.cpp @@ -13,6 +13,11 @@ // clang-format off +// REQUIRES: linux + +// TODO: Figure out why this fails with Memory Sanitizer. +// XFAIL: msan + // RUN: %{build} // RUN: objcopy --dump-section .eh_frame_hdr=%t_ehf_hdr.bin %t.exe // RUN: echo -ne '\xFF' | dd of=%t_ehf_hdr.bin bs=1 seek=2 count=2 conv=notrunc status=none From 6f6b06424d02283580e40f9a00fd461abeff864e Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Fri, 29 Aug 2025 14:45:20 +0800 Subject: [PATCH 14/14] fix test --- libunwind/test/eh_frame_fde_pc_range.pass.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libunwind/test/eh_frame_fde_pc_range.pass.cpp b/libunwind/test/eh_frame_fde_pc_range.pass.cpp index 9ef2f65c529ae..d8bcb3939913c 100644 --- a/libunwind/test/eh_frame_fde_pc_range.pass.cpp +++ b/libunwind/test/eh_frame_fde_pc_range.pass.cpp @@ -46,10 +46,10 @@ void f() { printf("fde_fpc = %p\n", fde_fpc); printf("fde_fpc1 = %p\n", fde_fpc1); fflush(stdout); - // assert(fde_pc != NULL); - // assert(fde_fpc != NULL); - // assert(fde_fpc1 != NULL); - // assert(fde_fpc == fde_fpc1); + assert(fde_pc != NULL); + assert(fde_fpc != NULL); + assert(fde_fpc1 != NULL); + assert(fde_fpc == fde_fpc1); } int main() {