Bug 1843218 - Partially revert a clang change that relies on something we revert. r=firefox-build-system-reviewers,sergesanspaille

Differential Revision: https://phabricator.services.mozilla.com/D183546
This commit is contained in:
Mike Hommey 2023-07-17 20:41:28 +00:00
parent bf04b0d8de
commit 6761f4ccd7
2 changed files with 34 additions and 0 deletions

View File

@ -5,6 +5,7 @@
"unpoison-thread-stacks_clang_10.patch",
"downgrade-mangling-error_clang_12.patch",
"fuzzing_ccov_build_clang_12.patch",
"partial-revert-llvmorg-17-init-17713-gc8e055d485ea.patch",
"partial-revert-llvmorg-17-init-7686-g244be0b0de19.patch",
"revert-llvmorg-17-init-4120-g02e8eb1a438b.patch",
"partial-revert-llvmorg-16-init-17151-gaa0883b59ae1_clang_17.patch",

View File

@ -0,0 +1,33 @@
Revert the parts of c8e055d485eabf1c8830d77797e3686ced0f7754 that require
cead4eceb01b935fae07bf4a7e91911b344d2fec, which we revert.
diff --git a/llvm/include/llvm/DebugInfo/BTF/BTFContext.h b/llvm/include/llvm/DebugInfo/BTF/BTFContext.h
index c16bee613322..7b0412b91c2e 100644
--- a/llvm/include/llvm/DebugInfo/BTF/BTFContext.h
+++ b/llvm/include/llvm/DebugInfo/BTF/BTFContext.h
@@ -34,9 +34,6 @@ public:
object::SectionedAddress Address,
DILineInfoSpecifier Specifier = DILineInfoSpecifier()) override;
- DILineInfo
- getLineInfoForDataAddress(object::SectionedAddress Address) override;
-
DILineInfoTable getLineInfoForAddressRange(
object::SectionedAddress Address, uint64_t Size,
DILineInfoSpecifier Specifier = DILineInfoSpecifier()) override;
diff --git a/llvm/lib/DebugInfo/BTF/BTFContext.cpp b/llvm/lib/DebugInfo/BTF/BTFContext.cpp
index 24898739b824..da0f9982881f 100644
--- a/llvm/lib/DebugInfo/BTF/BTFContext.cpp
+++ b/llvm/lib/DebugInfo/BTF/BTFContext.cpp
@@ -34,11 +34,6 @@ DILineInfo BTFContext::getLineInfoForAddress(SectionedAddress Address,
return Result;
}
-DILineInfo BTFContext::getLineInfoForDataAddress(SectionedAddress Address) {
- // BTF does not convey such information.
- return {};
-}
-
DILineInfoTable
BTFContext::getLineInfoForAddressRange(SectionedAddress Address, uint64_t Size,
DILineInfoSpecifier Specifier) {