mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
roll llvm to 7024b9e1b423b3c3c6ac76ab6a73cb2c9e4ef842 (#7781)
Updated patch 0006 to include new files added in https://github.com/llvm/llvm-project/pull/207543. Dropped patch 0009 which was upstreamed in: https://github.com/llvm/llvm-project/pull/190088 Minor updates to patch 0011 for changes upstream. Minor updates in export.cpp to use `llvm::FoldingSetInsertToken` instead of a void pointer.
This commit is contained in:
+32
-32
@@ -39,59 +39,59 @@ fn CallF() {
|
||||
// CHECK:STDOUT: %type.10 = type {}
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: ; Function Attrs: nounwind
|
||||
// CHECK:STDOUT: define void @_CF.Main(%type.10 %_) #0 !dbg !4 {
|
||||
// CHECK:STDOUT: define void @_CF.Main(%type.10 %_) #0 !dbg !23 {
|
||||
// CHECK:STDOUT: entry:
|
||||
// CHECK:STDOUT: ret void, !dbg !10
|
||||
// CHECK:STDOUT: ret void, !dbg !26
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: declare %type.10 @_CG.Main()
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: ; Function Attrs: nounwind
|
||||
// CHECK:STDOUT: define %type.10 @_CH.Main() #0 !dbg !11 {
|
||||
// CHECK:STDOUT: define %type.10 @_CH.Main() #0 !dbg !28 {
|
||||
// CHECK:STDOUT: entry:
|
||||
// CHECK:STDOUT: %G.call = call %type.10 @_CG.Main(), !dbg !14
|
||||
// CHECK:STDOUT: ret %type.10 %G.call, !dbg !15
|
||||
// CHECK:STDOUT: %G.call = call %type.10 @_CG.Main(), !dbg !31
|
||||
// CHECK:STDOUT: ret %type.10 %G.call, !dbg !32
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: ; Function Attrs: nounwind
|
||||
// CHECK:STDOUT: define void @"_CAssoc.C.Main:I.Main"() #0 !dbg !16 {
|
||||
// CHECK:STDOUT: define void @"_CAssoc.C.Main:I.Main"() #0 !dbg !33 {
|
||||
// CHECK:STDOUT: entry:
|
||||
// CHECK:STDOUT: ret void, !dbg !19
|
||||
// CHECK:STDOUT: ret void, !dbg !34
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: ; Function Attrs: nounwind
|
||||
// CHECK:STDOUT: define void @_CCallF.Main() #0 !dbg !20 {
|
||||
// CHECK:STDOUT: define void @_CCallF.Main() #0 !dbg !35 {
|
||||
// CHECK:STDOUT: entry:
|
||||
// CHECK:STDOUT: call void @_CF.Main(%type.10 zeroinitializer), !dbg !21
|
||||
// CHECK:STDOUT: ret void, !dbg !22
|
||||
// CHECK:STDOUT: call void @_CF.Main(%type.10 zeroinitializer), !dbg !36
|
||||
// CHECK:STDOUT: ret void, !dbg !37
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: attributes #0 = { nounwind }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !llvm.dbg.cu = !{!0}
|
||||
// CHECK:STDOUT: !llvm.dbg.cu = !{!15}
|
||||
// CHECK:STDOUT: !llvm.module.flags = !{!2, !3}
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "carbon", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
|
||||
// CHECK:STDOUT: !1 = !DIFile(filename: "basic.carbon", directory: "")
|
||||
// CHECK:STDOUT: !2 = !{i32 7, !"Dwarf Version", i32 5}
|
||||
// CHECK:STDOUT: !3 = !{i32 2, !"Debug Info Version", i32 3}
|
||||
// CHECK:STDOUT: !4 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main", scope: null, file: !1, line: 19, type: !5, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !8)
|
||||
// CHECK:STDOUT: !5 = !DISubroutineType(types: !6)
|
||||
// CHECK:STDOUT: !6 = !{null, !7}
|
||||
// CHECK:STDOUT: !7 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
|
||||
// CHECK:STDOUT: !8 = !{!9}
|
||||
// CHECK:STDOUT: !9 = !DILocalVariable(arg: 1, scope: !4, type: !7)
|
||||
// CHECK:STDOUT: !10 = !DILocation(line: 19, column: 1, scope: !4)
|
||||
// CHECK:STDOUT: !11 = distinct !DISubprogram(name: "H", linkageName: "_CH.Main", scope: null, file: !1, line: 23, type: !12, spFlags: DISPFlagDefinition, unit: !0)
|
||||
// CHECK:STDOUT: !12 = !DISubroutineType(types: !13)
|
||||
// CHECK:STDOUT: !13 = !{!7}
|
||||
// CHECK:STDOUT: !14 = !DILocation(line: 23, column: 22, scope: !11)
|
||||
// CHECK:STDOUT: !15 = !DILocation(line: 23, column: 15, scope: !11)
|
||||
// CHECK:STDOUT: !16 = distinct !DISubprogram(name: "Assoc", linkageName: "_CAssoc.C.Main:I.Main", scope: null, file: !1, line: 27, type: !17, spFlags: DISPFlagDefinition, unit: !0)
|
||||
// CHECK:STDOUT: !17 = !DISubroutineType(types: !18)
|
||||
// CHECK:STDOUT: !18 = !{null}
|
||||
// CHECK:STDOUT: !19 = !DILocation(line: 27, column: 5, scope: !16)
|
||||
// CHECK:STDOUT: !20 = distinct !DISubprogram(name: "CallF", linkageName: "_CCallF.Main", scope: null, file: !1, line: 31, type: !17, spFlags: DISPFlagDefinition, unit: !0)
|
||||
// CHECK:STDOUT: !21 = !DILocation(line: 32, column: 3, scope: !20)
|
||||
// CHECK:STDOUT: !22 = !DILocation(line: 31, column: 1, scope: !20)
|
||||
// CHECK:STDOUT: !14 = !DIFile(filename: "basic.carbon", directory: "")
|
||||
// CHECK:STDOUT: !15 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !14, producer: "carbon", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
|
||||
// CHECK:STDOUT: !16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
|
||||
// CHECK:STDOUT: !17 = !{null, !16}
|
||||
// CHECK:STDOUT: !18 = !DISubroutineType(types: !17)
|
||||
// CHECK:STDOUT: !19 = !{!16}
|
||||
// CHECK:STDOUT: !20 = !DISubroutineType(types: !19)
|
||||
// CHECK:STDOUT: !21 = !{null}
|
||||
// CHECK:STDOUT: !22 = !DISubroutineType(types: !21)
|
||||
// CHECK:STDOUT: !23 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main", scope: null, file: !14, line: 19, type: !18, spFlags: DISPFlagDefinition, unit: !15, retainedNodes: !27)
|
||||
// CHECK:STDOUT: !24 = !DILocalVariable(arg: 1, scope: !23, type: !16)
|
||||
// CHECK:STDOUT: !26 = !DILocation(line: 19, column: 1, scope: !23)
|
||||
// CHECK:STDOUT: !27 = !{!24}
|
||||
// CHECK:STDOUT: !28 = distinct !DISubprogram(name: "H", linkageName: "_CH.Main", scope: null, file: !14, line: 23, type: !20, spFlags: DISPFlagDefinition, unit: !15)
|
||||
// CHECK:STDOUT: !31 = !DILocation(line: 23, column: 22, scope: !28)
|
||||
// CHECK:STDOUT: !32 = !DILocation(line: 23, column: 15, scope: !28)
|
||||
// CHECK:STDOUT: !33 = distinct !DISubprogram(name: "Assoc", linkageName: "_CAssoc.C.Main:I.Main", scope: null, file: !14, line: 27, type: !22, spFlags: DISPFlagDefinition, unit: !15)
|
||||
// CHECK:STDOUT: !34 = !DILocation(line: 27, column: 5, scope: !33)
|
||||
// CHECK:STDOUT: !35 = distinct !DISubprogram(name: "CallF", linkageName: "_CCallF.Main", scope: null, file: !14, line: 31, type: !22, spFlags: DISPFlagDefinition, unit: !15)
|
||||
// CHECK:STDOUT: !36 = !DILocation(line: 32, column: 3, scope: !35)
|
||||
// CHECK:STDOUT: !37 = !DILocation(line: 31, column: 1, scope: !35)
|
||||
// CHECK:STDOUT:
|
||||
|
||||
Reference in New Issue
Block a user