- 
                Notifications
    
You must be signed in to change notification settings  - Fork 15.1k
 
          [lldb] Don't create instance of SymbolFileDWARFDebugMap for non-Mach-O files
          #139170
        
          New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Merged
      
      
    
  
     Merged
                    Changes from 4 commits
      Commits
    
    
            Show all changes
          
          
            7 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      c7432d0
              
                [lldb] Do not create SymbolFileDWARFDebugMap for non-Mach-O files
              
              
                royitaqi 6c1ce45
              
                Add test, but failing
              
              
                royitaqi 8bf38e2
              
                Add/fix test
              
              
                royitaqi 57145ec
              
                Use objfile_sp->GetArchitecture().GetTriple().isAppleMachO() instead
              
              
                royitaqi dfe7da5
              
                Update test
              
              
                royitaqi ca7300c
              
                Merge branch 'llvm:main' into dont-create-debug-map-on-linux
              
              
                royitaqi e58aa29
              
                Add assert and fix comment
              
              
                royitaqi File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
        
          
  
    
      
          
            154 changes: 154 additions & 0 deletions
          
          154 
        
  lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFDebugMapTests.cpp
  
  
      
      
   
        
      
      
    
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| //===-- SymbolFileDWARFDebugMapTests.cpp ----------------------------------===// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
| 
     | 
||
| #include "Plugins/ObjectFile/ELF/ObjectFileELF.h" | ||
| #include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h" | ||
| #include "Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h" | ||
| #include "TestingSupport/SubsystemRAII.h" | ||
| #include "TestingSupport/TestUtilities.h" | ||
| 
     | 
||
| #include "lldb/Core/Module.h" | ||
| #include "llvm/Testing/Support/Error.h" | ||
| 
     | 
||
| #include "gtest/gtest.h" | ||
| 
     | 
||
| using namespace lldb; | ||
| using namespace lldb_private; | ||
| using namespace lldb_private::plugin::dwarf; | ||
| 
     | 
||
| class SymbolFileDWARFDebugMapTests : public testing::Test { | ||
| SubsystemRAII<ObjectFileELF, ObjectFileMachO> subsystems; | ||
| }; | ||
| 
     | 
||
| #ifdef __APPLE__ | ||
| TEST_F(SymbolFileDWARFDebugMapTests, CreateInstanceReturnNonNullForMachOFile) { | ||
| // The file header represents an arm64 Mach-O file. | ||
| const char *yamldata = R"( | ||
| --- !mach-o | ||
| FileHeader: | ||
| magic: 0xFEEDFACF | ||
| cputype: 0x0100000C | ||
| cpusubtype: 0x00000000 | ||
| filetype: 0x00000001 | ||
| ncmds: 1 | ||
| sizeofcmds: 152 | ||
| flags: 0x00002000 | ||
| reserved: 0x00000000 | ||
| LoadCommands: | ||
| - cmd: LC_SEGMENT_64 | ||
| cmdsize: 152 | ||
| segname: __TEXT | ||
| vmaddr: 0 | ||
| vmsize: 4 | ||
| fileoff: 184 | ||
| filesize: 4 | ||
| maxprot: 7 | ||
| initprot: 7 | ||
| nsects: 1 | ||
| flags: 0 | ||
| Sections: | ||
| - sectname: __text | ||
| segname: __TEXT | ||
| addr: 0x0000000000000000 | ||
| content: 'AABBCCDD' | ||
| size: 4 | ||
| offset: 184 | ||
| align: 0 | ||
| reloff: 0x00000000 | ||
| nreloc: 0 | ||
| flags: 0x80000400 | ||
| reserved1: 0x00000000 | ||
| reserved2: 0x00000000 | ||
| reserved3: 0x00000000 | ||
| ... | ||
| )"; | ||
| 
     | 
||
| llvm::Expected<TestFile> file = TestFile::fromYaml(yamldata); | ||
| EXPECT_THAT_EXPECTED(file, llvm::Succeeded()); | ||
| 
     | 
||
| // Set the triple explicitly. | ||
| ModuleSpec module_spec = file->moduleSpec(); | ||
| module_spec.GetArchitecture().SetTriple("arm64-apple-macosx15.0.0"); | ||
| 
     | 
||
| // Create module and get object file. | ||
| auto module_sp = std::make_shared<Module>(module_spec); | ||
| ASSERT_NE(module_sp, nullptr); | ||
| auto object_file = module_sp->GetObjectFile(); | ||
| ASSERT_NE(object_file, nullptr); | ||
| 
     | 
||
| // The debug map should be non-null, because the file is Apple Mach-O. | ||
| auto debug_map = | ||
| SymbolFileDWARFDebugMap::CreateInstance(object_file->shared_from_this()); | ||
| ASSERT_NE(debug_map, nullptr); | ||
                
      
                  royitaqi marked this conversation as resolved.
               
          
            Show resolved
            Hide resolved
         | 
||
| } | ||
| #endif | ||
| 
     | 
||
| #ifdef __linux__ | ||
| TEST_F(SymbolFileDWARFDebugMapTests, CreateInstanceReturnNullForNonMachOFile) { | ||
| // Make sure we don't crash parsing a null unit DIE. | ||
| const char *yamldata = R"( | ||
| --- !ELF | ||
| FileHeader: | ||
| Class: ELFCLASS64 | ||
| Data: ELFDATA2LSB | ||
| Type: ET_EXEC | ||
| Machine: EM_386 | ||
| DWARF: | ||
| debug_abbrev: | ||
| - Table: | ||
| - Code: 0x00000001 | ||
| Tag: DW_TAG_compile_unit | ||
| Children: DW_CHILDREN_no | ||
| Attributes: | ||
| - Attribute: DW_AT_addr_base | ||
| Form: DW_FORM_sec_offset | ||
| debug_info: | ||
| - Version: 5 | ||
| AddrSize: 4 | ||
| UnitType: DW_UT_compile | ||
| Entries: | ||
| - AbbrCode: 0x00000001 | ||
| Values: | ||
| - Value: 0x8 # Offset of the first Address past the header | ||
| - AbbrCode: 0x0 | ||
| debug_addr: | ||
| - Version: 5 | ||
| AddressSize: 4 | ||
| Entries: | ||
| - Address: 0x1234 | ||
| - Address: 0x5678 | ||
| debug_line: | ||
| - Length: 42 | ||
| Version: 2 | ||
| PrologueLength: 36 | ||
| MinInstLength: 1 | ||
| DefaultIsStmt: 1 | ||
| LineBase: 251 | ||
| LineRange: 14 | ||
| OpcodeBase: 13 | ||
| StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ] | ||
| IncludeDirs: | ||
| - '/tmp' | ||
| Files: | ||
| - Name: main.cpp | ||
| DirIdx: 1 | ||
| ModTime: 0 | ||
| Length: 0 | ||
| )"; | ||
| 
     | 
||
| llvm::Expected<TestFile> file = TestFile::fromYaml(yamldata); | ||
| EXPECT_THAT_EXPECTED(file, llvm::Succeeded()); | ||
| auto module_sp = std::make_shared<Module>(file->moduleSpec()); | ||
| ASSERT_NE(module_sp, nullptr); | ||
| auto object_file = module_sp->GetObjectFile(); | ||
| ASSERT_NE(object_file, nullptr); | ||
| auto debug_map = | ||
| SymbolFileDWARFDebugMap::CreateInstance(object_file->shared_from_this()); | ||
| ASSERT_EQ(debug_map, nullptr); | ||
| } | ||
| #endif | ||
      
      Oops, something went wrong.
        
    
  
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Uh oh!
There was an error while loading. Please reload this page.