|
87 | 87 | #include <cctype>
|
88 | 88 | #include <cstring>
|
89 | 89 |
|
90 |
| -// #define ENABLE_DEBUG_PRINTF // COMMENT OUT THIS LINE PRIOR TO CHECKIN |
| 90 | +//#define ENABLE_DEBUG_PRINTF // COMMENT OUT THIS LINE PRIOR TO CHECKIN |
91 | 91 |
|
92 | 92 | #ifdef ENABLE_DEBUG_PRINTF
|
93 | 93 | #include <cstdio>
|
@@ -129,11 +129,6 @@ class PluginProperties : public Properties {
|
129 | 129 | bool IgnoreFileIndexes() const {
|
130 | 130 | return GetPropertyAtIndexAs<bool>(ePropertyIgnoreIndexes, false);
|
131 | 131 | }
|
132 |
| - |
133 |
| - bool EmitUnsupportedDWFormValueWarning() const { |
134 |
| - return GetPropertyAtIndexAs<bool>( |
135 |
| - ePropertyEmitUnsupportedDWFormValueWarning, true); |
136 |
| - } |
137 | 132 | };
|
138 | 133 |
|
139 | 134 | } // namespace
|
@@ -629,14 +624,12 @@ uint32_t SymbolFileDWARF::CalculateAbilities() {
|
629 | 624 | llvm::DWARFDebugAbbrev *abbrev = DebugAbbrev();
|
630 | 625 | std::set<dw_form_t> unsupported_forms = GetUnsupportedForms(abbrev);
|
631 | 626 | if (!unsupported_forms.empty()) {
|
632 |
| - if (GetGlobalPluginProperties().EmitUnsupportedDWFormValueWarning()) { |
633 |
| - StreamString error; |
634 |
| - error.Printf("unsupported DW_FORM value%s:", |
635 |
| - unsupported_forms.size() > 1 ? "s" : ""); |
636 |
| - for (auto form : unsupported_forms) |
637 |
| - error.Printf(" %#x", form); |
638 |
| - m_objfile_sp->GetModule()->ReportWarning("{0}", error.GetString()); |
639 |
| - } |
| 627 | + StreamString error; |
| 628 | + error.Printf("unsupported DW_FORM value%s:", |
| 629 | + unsupported_forms.size() > 1 ? "s" : ""); |
| 630 | + for (auto form : unsupported_forms) |
| 631 | + error.Printf(" %#x", form); |
| 632 | + m_objfile_sp->GetModule()->ReportWarning("{0}", error.GetString()); |
640 | 633 | return 0;
|
641 | 634 | }
|
642 | 635 |
|
@@ -1777,17 +1770,16 @@ SymbolFileDWARF *SymbolFileDWARF::GetDIERefSymbolFile(const DIERef &die_ref) {
|
1777 | 1770 | return this;
|
1778 | 1771 |
|
1779 | 1772 | if (file_index) {
|
1780 |
| - // We have a SymbolFileDWARFDebugMap, so let it find the right file |
| 1773 | + // We have a SymbolFileDWARFDebugMap, so let it find the right file |
1781 | 1774 | if (SymbolFileDWARFDebugMap *debug_map = GetDebugMapSymfile())
|
1782 | 1775 | return debug_map->GetSymbolFileByOSOIndex(*file_index);
|
1783 |
| - |
| 1776 | + |
1784 | 1777 | // Handle the .dwp file case correctly
|
1785 | 1778 | if (*file_index == DIERef::k_file_index_mask)
|
1786 | 1779 | return GetDwpSymbolFile().get(); // DWP case
|
1787 | 1780 |
|
1788 | 1781 | // Handle the .dwo file case correctly
|
1789 |
| - return DebugInfo() |
1790 |
| - .GetUnitAtIndex(*die_ref.file_index()) |
| 1782 | + return DebugInfo().GetUnitAtIndex(*die_ref.file_index()) |
1791 | 1783 | ->GetDwoSymbolFile(); // DWO case
|
1792 | 1784 | }
|
1793 | 1785 | return this;
|
@@ -3629,7 +3621,7 @@ VariableSP SymbolFileDWARF::ParseVariableDIE(const SymbolContext &sc,
|
3629 | 3621 | lldb::addr_t location_DW_OP_addr = LLDB_INVALID_ADDRESS;
|
3630 | 3622 | if (!location_is_const_value_data) {
|
3631 | 3623 | bool op_error = false;
|
3632 |
| - const DWARFExpression *location = location_list.GetAlwaysValidExpr(); |
| 3624 | + const DWARFExpression* location = location_list.GetAlwaysValidExpr(); |
3633 | 3625 | if (location)
|
3634 | 3626 | location_DW_OP_addr =
|
3635 | 3627 | location->GetLocation_DW_OP_addr(location_form.GetUnit(), op_error);
|
|
0 commit comments