mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: temporarily revert broken dump_syms changes in breakpad (#30825)

Browse source
This commit is contained in:
Samuel Attard 2021-09-02 16:34:31 -07:00 committed by GitHub
parent 5554de0237
commit 873872a32b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1251 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/breakpad/.patches Normal file
View file

@ -0,0 +1,2 @@
revert_remove_warning_about_unknown_abstract_origin.patch
revert_add_inline_and_inline_origin_records_to_symbol_file.patch

1199
patches/breakpad/revert_add_inline_and_inline_origin_records_to_symbol_file.patch Normal file
View file

File diff suppressed because it is too large Load diff

47
patches/breakpad/revert_remove_warning_about_unknown_abstract_origin.patch Normal file
View file

@ -0,0 +1,47 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Thu, 2 Sep 2021 22:55:25 +0000
Subject: Revert "Remove warning about unknown abstract origin"
This reverts commit 7933ec0a69bac134b7cee4b60a5dc80743b2b1a9.
diff --git a/src/common/dwarf_cu_to_module.cc b/src/common/dwarf_cu_to_module.cc
index dacc9cbe4b0e13d19b5969fe91ba7a867e64a36c..c51514b7575c2e961aaae3ff883be00d80e3ec15 100644
--- a/src/common/dwarf_cu_to_module.cc
+++ b/src/common/dwarf_cu_to_module.cc
@@ -504,6 +504,8 @@ void DwarfCUToModule::GenericDIEHandler::ProcessAttributeReference(
abstract_origin_ = &(origin->second);
} else if (data > offset_) {
forward_ref_die_offset_ = data;
+ } else {
+ cu_context_->reporter->UnknownAbstractOrigin(offset_, data);
}
specification_offset_ = data;
break;
@@ -748,6 +750,14 @@ void DwarfCUToModule::InlineHandler::Finish() {
}
}
+ // Malformed DWARF may omit the name, but all Module::Functions must
+ // have names.
+ // If we have a forward reference to a DW_AT_specification or
+ // DW_AT_abstract_origin, then don't warn, the name will be fixed up
+ // later
+ if (name_.empty() && forward_ref_die_offset_ == 0)
+ cu_context_->reporter->UnnamedFunction(offset_);
+
// Every DW_TAG_inlined_subroutine should have a DW_AT_abstract_origin.
assert(specification_offset_ != 0);
@@ -919,6 +929,11 @@ void DwarfCUToModule::FuncHandler::Finish() {
if (!name_.empty()) {
name = name_;
} else {
+ // If we have a forward reference to a DW_AT_specification or
+ // DW_AT_abstract_origin, then don't warn, the name will be fixed up
+ // later
+ if (forward_ref_die_offset_ == 0)
+ cu_context_->reporter->UnnamedFunction(offset_);
name = "<name omitted>";
}

4
patches/config.json
View file

@ -13,5 +13,7 @@
"src/electron/patches/Mantle": "src/third_party/squirrel.mac/vendor/Mantle",
"src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC"
"src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC",
"src/electron/patches/breakpad": "src/third_party/breakpad/breakpad"
}