[LLDB] [COFF] Fix handling of symbols with more than one aux symbol

[amccarth]

LGTM. That was a nice catch on the other review.

[labath]

Thanks. If you think this is worth cherry-picking to 11.0 (it sounds like it is), please file the appropriate bug.

lldb/test/Shell/ObjectFile/PECOFF/symbol.yaml

107

Maybe a comment that says this checks that the symbol is skipped. (making sure this code is not later removed for being unused).

[mstorsjo]

@hans - I think this one could be a fairly safe backport to the release branch. (Apparently phab lags behind regarding updating the reviews when they are committed at the moment; this was committed as f07ddbc9c4b66e91aa7a106042512ee903b6b3ba.)

[hans]

In D84070#2162932, @mstorsjo wrote:

@hans - I think this one could be a fairly safe backport to the release branch. (Apparently phab lags behind regarding updating the reviews when they are committed at the moment; this was committed as f07ddbc9c4b66e91aa7a106042512ee903b6b3ba.)

Thanks! Pushed to 11.x as bf2f2bffee244318a86fea90a0dfaf9be8a71b8c

lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp

if (m_symtab_up == nullptr) {
               Address symbol_addr(sect_list->FindSectionByID(symbol.sect),
                                   symbol.value);
               symbols[i].GetAddressRef() = symbol_addr;
               symbols[i].SetType(MapSymbolType(symbol.type));
             }
 
             if (symbol.naux > 0) {
               i += symbol.naux;
-              offset += symbol_size;
+              offset += symbol.naux * symbol_size;
             }
           }
         }
       }
 
       // Read export header
       if (coff_data_dir_export_table < m_coff_header_opt.data_dirs.size() &&
           m_coff_header_opt.data_dirs[coff_data_dir_export_table].vmsize > 0 &&

lldb/test/Shell/ObjectFile/PECOFF/symbol.yaml

 # 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
 
 --- !COFF
 OptionalHeader:
   AddressOfEntryPoint: 4096
   ImageBase:       1073741824
- Name:            .data
     ComplexType:     IMAGE_SYM_DTYPE_NULL
     StorageClass:    IMAGE_SYM_CLASS_STATIC
   - Name:            .bss
     Value:           0
     SectionNumber:   2
     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
     SimpleType:      IMAGE_SYM_TYPE_NULL
     ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
     StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
   - Name:            variable
     Value:           0
     SectionNumber:   2
     SimpleType:      IMAGE_SYM_TYPE_NULL
     ComplexType:     IMAGE_SYM_DTYPE_NULL
     StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
 ...