[lld] r305371 - Revert "[codeview] Make obj2yaml/yaml2obj support .debug$S..."

Zachary Turner via llvm-commits llvm-commits at lists.llvm.org
Tue Jun 13 23:24:24 PDT 2017


Author: zturner
Date: Wed Jun 14 01:24:24 2017
New Revision: 305371

URL: http://llvm.org/viewvc/llvm-project?rev=305371&view=rev
Log:
Revert "[codeview] Make obj2yaml/yaml2obj support .debug$S..."

This is causing failures on linux bots with an invalid stream
read.  It doesn't repro in any configuration on Windows, so
reverting until I have a chance to investigate on Linux.

Modified:
    lld/trunk/test/COFF/Inputs/pdb1.yaml
    lld/trunk/test/COFF/Inputs/pdb2.yaml
    lld/trunk/test/COFF/sort-debug.test

Modified: lld/trunk/test/COFF/Inputs/pdb1.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/Inputs/pdb1.yaml?rev=305371&r1=305370&r2=305371&view=diff
==============================================================================
--- lld/trunk/test/COFF/Inputs/pdb1.yaml (original)
+++ lld/trunk/test/COFF/Inputs/pdb1.yaml Wed Jun 14 01:24:24 2017
@@ -10,77 +10,7 @@ sections:
   - Name:            '.debug$S'
     Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
     Alignment:       1
-    Subsections:
-      - !Symbols
-        Records:
-          - Kind:            S_OBJNAME
-            ObjNameSym:
-              Signature:       0
-              ObjectName:      'D:\b\ret42-main.obj'
-          - Kind:            S_COMPILE3
-            Compile3Sym:
-              Flags:           [ SecurityChecks, HotPatch ]
-              Machine:         X64
-              FrontendMajor:   19
-              FrontendMinor:   0
-              FrontendBuild:   23026
-              FrontendQFE:     0
-              BackendMajor:    19
-              BackendMinor:    0
-              BackendBuild:    23026
-              BackendQFE:      0
-              Version:         'Microsoft (R) Optimizing Compiler'
-      - !Symbols
-        Records:
-          - Kind:            S_GPROC32_ID
-            ProcSym:
-              PtrParent:       0
-              PtrEnd:          0
-              PtrNext:         0
-              CodeSize:        14
-              DbgStart:        4
-              DbgEnd:          9
-              FunctionType:    4101
-              Segment:         0
-              Flags:           [  ]
-              DisplayName:     main
-          - Kind:            S_FRAMEPROC
-            FrameProcSym:
-              TotalFrameBytes: 40
-              PaddingFrameBytes: 0
-              OffsetToPadding: 0
-              BytesOfCalleeSavedRegisters: 0
-              OffsetOfExceptionHandler: 0
-              SectionIdOfExceptionHandler: 0
-              Flags:           [ AsynchronousExceptionHandling, OptimizedForSpeed ]
-          - Kind:            S_PROC_ID_END
-            ScopeEndSym:
-      - !Lines
-        CodeSize:        14
-        Flags:           [  ]
-        RelocOffset:     0
-        RelocSegment:    0
-        Blocks:
-          - FileName:        'd:\b\ret42-main.c'
-            Lines:
-              - Offset:          0
-                LineStart:       2
-                IsStatement:     true
-                EndDelta:        0
-            Columns:
-      - !FileChecksums
-        Checksums:
-          - FileName:        'd:\b\ret42-main.c'
-            Kind:            MD5
-            Checksum:        C538722F63570DF6705DDE06FE96E5D1
-      - !StringTable
-        Strings:
-          - 'd:\b\ret42-main.c'
-      - !Symbols
-        Records:
-          - Kind:            S_BUILDINFO
-            BuildInfoSym:
-              BuildId:         4110
+    SectionData:     04000000F1000000580000001A00011100000000443A5C625C72657434322D6D61696E2E6F626A003A003C1100600000D00013000000F259000013000000F25900004D6963726F736F667420285229204F7074696D697A696E6720436F6D70696C657200F10000004E0000002A0047110000000000000000000000000E000000040000000900000005100000000000000000006D61696E001C001210280000000000000000000000000000000000000000000042110002004F110000F20000002000000000000000000000000E0000000000000001000000140000000000000002000080F400000018000000010000001001C538722F63570DF6705DDE06FE96E5D10000F30000001300000000643A5C625C72657434322D6D61696E2E630000F10000000800000006004C110E100000
     Relocations:
       - VirtualAddress:  140
         SymbolName:      main
@@ -97,71 +27,7 @@ sections:
   - Name:            '.debug$T'
     Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
     Alignment:       1
-    Types:
-      - Kind:            LF_ARGLIST
-        ArgList:
-          ArgIndices:      [  ]
-      - Kind:            LF_PROCEDURE
-        Procedure:
-          ReturnType:      116
-          CallConv:        NearC
-          Options:         [ None ]
-          ParameterCount:  0
-          ArgumentList:    4096
-      - Kind:            LF_POINTER
-        Pointer:
-          ReferentType:    4097
-          Attrs:           65548
-      - Kind:            LF_ARGLIST
-        ArgList:
-          ArgIndices:      [ 0 ]
-      - Kind:            LF_PROCEDURE
-        Procedure:
-          ReturnType:      116
-          CallConv:        NearC
-          Options:         [ None ]
-          ParameterCount:  0
-          ArgumentList:    4099
-      - Kind:            LF_FUNC_ID
-        FuncId:
-          ParentScope:     0
-          FunctionType:    4100
-          Name:            main
-      - Kind:            LF_FUNC_ID
-        FuncId:
-          ParentScope:     0
-          FunctionType:    4097
-          Name:            foo
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              0
-          String:          'D:\b'
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              0
-          String:          'C:\vs14\VC\BIN\amd64\cl.exe'
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              0
-          String:          '-Z7 -c -MT -IC:\vs14\VC\INCLUDE -IC:\vs14\VC\ATLMFC\INCLUDE -I"C:\Program Files (x86)\Windows Kits\10\include\10.0.10150.0\ucrt" -I"C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um" -I"C:\Program Files (x86)\Windows Kits\8.1\include\shared"'
-      - Kind:            LF_SUBSTR_LIST
-        StringList:
-          StringIndices:   [ 4105 ]
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              4106
-          String:          ' -I"C:\Program Files (x86)\Windows Kits\8.1\include\um" -I"C:\Program Files (x86)\Windows Kits\8.1\include\winrt" -TC -X'
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              0
-          String:          ret42-main.c
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              0
-          String:          'D:\b\vc140.pdb'
-      - Kind:            LF_BUILDINFO
-        BuildInfo:
-          ArgIndices:      [ 4103, 4104, 4108, 4109, 4107 ]
+    SectionData:     0400000006000112000000000E0008107400000000000000001000000A000210011000000C0001000A00011201000000000000000E0008107400000000000000031000001200011600000000041000006D61696E00F3F2F10E0001160000000001100000666F6F000E00051600000000443A5C6200F3F2F12200051600000000433A5C767331345C56435C42494E5C616D6436345C636C2E6578650002010516000000002D5A37202D63202D4D54202D49433A5C767331345C56435C494E434C554445202D49433A5C767331345C56435C41544C4D46435C494E434C554445202D4922433A5C50726F6772616D2046696C65732028783836295C57696E646F7773204B6974735C31305C696E636C7564655C31302E302E31303135302E305C7563727422202D4922433A5C50726F6772616D2046696C65732028783836295C57696E646F7773204B6974735C4E4554465853444B5C342E365C696E636C7564655C756D22202D4922433A5C50726F6772616D2046696C65732028783836295C57696E646F7773204B6974735C382E315C696E636C7564655C73686172656422000A0004160100000009100000820005160A100000202D4922433A5C50726F6772616D2046696C65732028783836295C57696E646F7773204B6974735C382E315C696E636C7564655C
 756D22202D4922433A5C50726F6772616D2046696C65732028783836295C57696E646F7773204B6974735C382E315C696E636C7564655C77696E727422202D5443202D5800F3F2F1160005160000000072657434322D6D61696E2E6300F3F2F11600051600000000443A5C625C76633134302E70646200F11A000316050007100000081000000C1000000D1000000B100000F2F1
   - Name:            '.text$mn'
     Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
     Alignment:       16

Modified: lld/trunk/test/COFF/Inputs/pdb2.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/Inputs/pdb2.yaml?rev=305371&r1=305370&r2=305371&view=diff
==============================================================================
--- lld/trunk/test/COFF/Inputs/pdb2.yaml (original)
+++ lld/trunk/test/COFF/Inputs/pdb2.yaml Wed Jun 14 01:24:24 2017
@@ -10,77 +10,7 @@ sections:
   - Name:            '.debug$S'
     Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
     Alignment:       1
-    Subsections:
-      - !Symbols
-        Records:
-          - Kind:            S_OBJNAME
-            ObjNameSym:
-              Signature:       0
-              ObjectName:      'D:\b\ret42-sub.obj'
-          - Kind:            S_COMPILE3
-            Compile3Sym:
-              Flags:           [ SecurityChecks, HotPatch ]
-              Machine:         X64
-              FrontendMajor:   19
-              FrontendMinor:   0
-              FrontendBuild:   23026
-              FrontendQFE:     0
-              BackendMajor:    19
-              BackendMinor:    0
-              BackendBuild:    23026
-              BackendQFE:      0
-              Version:         'Microsoft (R) Optimizing Compiler'
-      - !Symbols
-        Records:
-          - Kind:            S_GPROC32_ID
-            ProcSym:
-              PtrParent:       0
-              PtrEnd:          0
-              PtrNext:         0
-              CodeSize:        6
-              DbgStart:        0
-              DbgEnd:          5
-              FunctionType:    4098
-              Segment:         0
-              Flags:           [  ]
-              DisplayName:     foo
-          - Kind:            S_FRAMEPROC
-            FrameProcSym:
-              TotalFrameBytes: 0
-              PaddingFrameBytes: 0
-              OffsetToPadding: 0
-              BytesOfCalleeSavedRegisters: 0
-              OffsetOfExceptionHandler: 0
-              SectionIdOfExceptionHandler: 0
-              Flags:           [ AsynchronousExceptionHandling, OptimizedForSpeed ]
-          - Kind:            S_PROC_ID_END
-            ScopeEndSym:
-      - !Lines
-        CodeSize:        6
-        Flags:           [  ]
-        RelocOffset:     0
-        RelocSegment:    0
-        Blocks:
-          - FileName:        'd:\b\ret42-sub.c'
-            Lines:
-              - Offset:          0
-                LineStart:       1
-                IsStatement:     true
-                EndDelta:        0
-            Columns:
-      - !FileChecksums
-        Checksums:
-          - FileName:        'd:\b\ret42-sub.c'
-            Kind:            MD5
-            Checksum:        EC2D89EFF5A1FEB6B74EE4D79074072F
-      - !StringTable
-        Strings:
-          - 'd:\b\ret42-sub.c'
-      - !Symbols
-        Records:
-          - Kind:            S_BUILDINFO
-            BuildInfoSym:
-              BuildId:         4106
+    SectionData:     04000000F1000000570000001900011100000000443A5C625C72657434322D7375622E6F626A003A003C1100600000D00013000000F259000013000000F25900004D6963726F736F667420285229204F7074696D697A696E6720436F6D70696C65720000F10000004D000000290047110000000000000000000000000600000000000000050000000210000000000000000000666F6F001C001210000000000000000000000000000000000000000000000042110002004F11000000F2000000200000000000000000000000060000000000000001000000140000000000000001000080F400000018000000010000001001EC2D89EFF5A1FEB6B74EE4D79074072F0000F30000001200000000643A5C625C72657434322D7375622E63000000F10000000800000006004C110A100000
     Relocations:
       - VirtualAddress:  140
         SymbolName:      foo
@@ -97,52 +27,7 @@ sections:
   - Name:            '.debug$T'
     Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
     Alignment:       1
-    Types:
-      - Kind:            LF_ARGLIST
-        ArgList:
-          ArgIndices:      [  ]
-      - Kind:            LF_PROCEDURE
-        Procedure:
-          ReturnType:      116
-          CallConv:        NearC
-          Options:         [ None ]
-          ParameterCount:  0
-          ArgumentList:    4096
-      - Kind:            LF_FUNC_ID
-        FuncId:
-          ParentScope:     0
-          FunctionType:    4097
-          Name:            foo
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              0
-          String:          'D:\b'
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              0
-          String:          'C:\vs14\VC\BIN\amd64\cl.exe'
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              0
-          String:          '-Z7 -c -MT -IC:\vs14\VC\INCLUDE -IC:\vs14\VC\ATLMFC\INCLUDE -I"C:\Program Files (x86)\Windows Kits\10\include\10.0.10150.0\ucrt" -I"C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um" -I"C:\Program Files (x86)\Windows Kits\8.1\include\shared"'
-      - Kind:            LF_SUBSTR_LIST
-        StringList:
-          StringIndices:   [ 4101 ]
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              4102
-          String:          ' -I"C:\Program Files (x86)\Windows Kits\8.1\include\um" -I"C:\Program Files (x86)\Windows Kits\8.1\include\winrt" -TC -X'
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              0
-          String:          ret42-sub.c
-      - Kind:            LF_STRING_ID
-        StringId:
-          Id:              0
-          String:          'D:\b\vc140.pdb'
-      - Kind:            LF_BUILDINFO
-        BuildInfo:
-          ArgIndices:      [ 4099, 4100, 4104, 4105, 4103 ]
+    SectionData:     0400000006000112000000000E0008107400000000000000001000000E0001160000000001100000666F6F000E00051600000000443A5C6200F3F2F12200051600000000433A5C767331345C56435C42494E5C616D6436345C636C2E6578650002010516000000002D5A37202D63202D4D54202D49433A5C767331345C56435C494E434C554445202D49433A5C767331345C56435C41544C4D46435C494E434C554445202D4922433A5C50726F6772616D2046696C65732028783836295C57696E646F7773204B6974735C31305C696E636C7564655C31302E302E31303135302E305C7563727422202D4922433A5C50726F6772616D2046696C65732028783836295C57696E646F7773204B6974735C4E4554465853444B5C342E365C696E636C7564655C756D22202D4922433A5C50726F6772616D2046696C65732028783836295C57696E646F7773204B6974735C382E315C696E636C7564655C73686172656422000A00041601000000051000008200051606100000202D4922433A5C50726F6772616D2046696C65732028783836295C57696E646F7773204B6974735C382E315C696E636C7564655C756D22202D4922433A5C50726F6772616D2046696C65732028783836295C57696E646F7773204B6974735C382E315C696E636C7564655C77696E7274
 22202D5443202D5800F3F2F1120005160000000072657434322D7375622E63001600051600000000443A5C625C76633134302E70646200F11A00031605000310000004100000081000000910000007100000F2F1
   - Name:            '.text$mn'
     Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
     Alignment:       16

Modified: lld/trunk/test/COFF/sort-debug.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/sort-debug.test?rev=305371&r1=305370&r2=305371&view=diff
==============================================================================
--- lld/trunk/test/COFF/sort-debug.test (original)
+++ lld/trunk/test/COFF/sort-debug.test Wed Jun 14 01:24:24 2017
@@ -35,46 +35,7 @@ sections:
   - Name:            '.debug$S'
     Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
     Alignment:       1
-    Subsections:
-      - !Symbols
-        Records:
-          - Kind:            S_GPROC32_ID
-            ProcSym:
-              PtrParent:       0
-              PtrEnd:          0
-              PtrNext:         0
-              CodeSize:        16
-              DbgStart:        0
-              DbgEnd:          0
-              FunctionType:    0
-              Segment:         0
-              Flags:           [  ]
-              DisplayName:     main
-          - Kind:            S_PROC_ID_END
-            ScopeEndSym:
-      - !Lines
-        CodeSize:        16
-        Flags:           [ HasColumnInfo ]
-        RelocOffset:     0
-        RelocSegment:    0
-        Blocks:
-          - FileName:        '\usr\local\google\home\majnemer\llvm\src\tools\lld\<stdin>'
-            Lines:
-              - Offset:          0
-                LineStart:       1
-                IsStatement:     false
-                EndDelta:        0
-            Columns:
-              - StartColumn:     0
-                EndColumn:       0
-      - !FileChecksums
-        Checksums:
-          - FileName:        '\usr\local\google\home\majnemer\llvm\src\tools\lld\<stdin>'
-            Kind:            None
-            Checksum:        ''
-      - !StringTable
-        Strings:
-          - '\usr\local\google\home\majnemer\llvm\src\tools\lld\<stdin>'
+    SectionData:     04000000F1000000300000002A00471100000000000000000000000010000000000000000000000000000000000000000000006D61696E0002004F11F200000024000000000000000000010010000000000000000100000018000000000000000100000000000000F4000000080000000100000000000000F30000003C000000005C7573725C6C6F63616C5C676F6F676C655C686F6D655C6D616A6E656D65725C6C6C766D5C7372635C746F6F6C735C6C6C645C3C737464696E3E00
     Relocations:
       - VirtualAddress:  44
         SymbolName:      _main




More information about the llvm-commits mailing list