[Lldb-commits] [lldb] 9d58748 - [lldb][DWARFASTParserClang][NFC] Fix build failure

Michael Buch via lldb-commits lldb-commits at lists.llvm.org
Sun Nov 12 22:14:41 PST 2023


Author: Michael Buch
Date: 2023-11-13T06:14:23Z
New Revision: 9d587480dce30ff2c00dfba3dfdb2812d68ea9e9

URL: https://github.com/llvm/llvm-project/commit/9d587480dce30ff2c00dfba3dfdb2812d68ea9e9
DIFF: https://github.com/llvm/llvm-project/commit/9d587480dce30ff2c00dfba3dfdb2812d68ea9e9.diff

LOG: [lldb][DWARFASTParserClang][NFC] Fix build failure

Caused by a badly resolved merge conflict

Added: 
    

Modified: 
    lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
index 00b66085feabac8..03ee0cc96345e1e 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
@@ -140,6 +140,7 @@ static bool ShouldIgnoreArtificialField(llvm::StringRef FieldName) {
   return FieldName.starts_with("_vptr$")
          // gdb emit vtable pointer as "_vptr.classname"
          || FieldName.starts_with("_vptr.");
+}
 
 std::optional<DWARFFormValue>
 DWARFASTParserClang::FindConstantOnVariableDefinition(DWARFDIE die) {


        


More information about the lldb-commits mailing list