Author: Martin Storsjö Date: 2020-07-20T22:42:28+03:00 New Revision: f07ddbc9c4b66e91aa7a106042512ee903b6b3ba
URL: https://github.com/llvm/llvm-project/commit/f07ddbc9c4b66e91aa7a106042512ee903b6b3ba DIFF: https://github.com/llvm/llvm-project/commit/f07ddbc9c4b66e91aa7a106042512ee903b6b3ba.diff LOG: [LLDB] [COFF] Fix handling of symbols with more than one aux symbol Differential Revision: https://reviews.llvm.org/D84070 Added: Modified: lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp lldb/test/Shell/ObjectFile/PECOFF/symbol.yaml Removed: ################################################################################ diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp index 5feec8167186..9073672740e0 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp @@ -686,7 +686,7 @@ Symtab *ObjectFilePECOFF::GetSymtab() { if (symbol.naux > 0) { i += symbol.naux; - offset += symbol_size; + offset += symbol.naux * symbol_size; } } } diff --git a/lldb/test/Shell/ObjectFile/PECOFF/symbol.yaml b/lldb/test/Shell/ObjectFile/PECOFF/symbol.yaml index 1d79e702333b..9dbc93b9b918 100644 --- a/lldb/test/Shell/ObjectFile/PECOFF/symbol.yaml +++ b/lldb/test/Shell/ObjectFile/PECOFF/symbol.yaml @@ -1,6 +1,9 @@ # RUN: yaml2obj %s > %t # RUN: lldb-test symbols %t | FileCheck %s +## The .file symbol isn't checked, but is included to test that the symbol +## table iteration handles cases with a symbol with more than one aux symbol. + # CHECK: Type File Address/Value {{.*}} Size Flags Name # CHECK: Code 0x0000000040001000 0x{{[0-9a-f]+}} 0x{{[0-9a-f]+}} entry # CHECK: 0x0000000040002000 0x{{[0-9a-f]+}} 0x{{[0-9a-f]+}} variable @@ -101,6 +104,13 @@ symbols: SimpleType: IMAGE_SYM_TYPE_NULL ComplexType: IMAGE_SYM_DTYPE_NULL StorageClass: IMAGE_SYM_CLASS_STATIC + - Name: .file + Value: 0 + SectionNumber: -2 + SimpleType: IMAGE_SYM_TYPE_NULL + ComplexType: IMAGE_SYM_DTYPE_NULL + StorageClass: IMAGE_SYM_CLASS_FILE + File: longfilenameusingtwoauxsymbols - Name: entry Value: 0 SectionNumber: 1 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
