carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

roll llvm to 7024b9e1b423b3c3c6ac76ab6a73cb2c9e4ef842 (#7781)

Browse Source 
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:
Nicholas Bishop
2026-09-14 21:54:09 +00:00
committed by GitHub
parent 4081848d65
commit cf66fb8aeb
257 changed files with 22634 additions and 23205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/lower/testdata/interop/cpp/debug_info.carbon
Vendored
+30 -30
View File
@@ -29,45 +29,45 @@ fn Call() -> i32 {
// CHECK:STDOUT: target triple = "x86_64-unknown-linux-gnu"
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: mustprogress nounwind uwtable
// CHECK:STDOUT: define dso_local noundef i32 @_Z1fv() #0 !dbg !14 {
// CHECK:STDOUT: define dso_local noundef i32 @_Z1fv() #0 !dbg !6 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: ret i32 42, !dbg !18
// CHECK:STDOUT: ret i32 42, !dbg !10
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define i32 @_CCall.Main() #1 !dbg !19 {
// CHECK:STDOUT: define i32 @_CCall.Main() #1 !dbg !31 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %f.call = call i32 @_Z1fv(), !dbg !20
// CHECK:STDOUT: ret i32 %f.call, !dbg !21
// CHECK:STDOUT: %f.call = call i32 @_Z1fv(), !dbg !34
// CHECK:STDOUT: ret i32 %f.call, !dbg !35
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: attributes #0 = { mustprogress nounwind uwtable "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cmov,+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
// CHECK:STDOUT: attributes #1 = { nounwind }
// CHECK:STDOUT:
// CHECK:STDOUT: !llvm.dbg.cu = !{!0, !2}
// CHECK:STDOUT: !llvm.module.flags = !{!4, !5, !6, !7, !8}
// CHECK:STDOUT: !llvm.errno.tbaa = !{!9}
// CHECK:STDOUT: !llvm.dbg.cu = !{!1, !30}
// CHECK:STDOUT: !llvm.module.flags = !{!14, !15, !36, !37, !38}
// CHECK:STDOUT: !llvm.errno.tbaa = !{!43}
// CHECK:STDOUT:
// CHECK:STDOUT: !0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
// CHECK:STDOUT: !1 = !DIFile(filename: "<carbon Cpp imports>", directory: "", checksumkind: CSK_MD5, checksum: "9eecb7db59d16c80417c72d1e1f4fbf1")
// CHECK:STDOUT: !2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !3, producer: "carbon", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
// CHECK:STDOUT: !3 = !DIFile(filename: "debug_info.carbon", directory: "")
// CHECK:STDOUT: !4 = !{i32 7, !"Dwarf Version", i32 5}
// CHECK:STDOUT: !5 = !{i32 2, !"Debug Info Version", i32 3}
// CHECK:STDOUT: !6 = !{i32 8, !"PIC Level", i32 2}
// CHECK:STDOUT: !7 = !{i32 7, !"PIE Level", i32 2}
// CHECK:STDOUT: !8 = !{i32 7, !"uwtable", i32 2}
// CHECK:STDOUT: !9 = !{!10, !11, i64 0}
// CHECK:STDOUT: !10 = !{!"__libc_errno", !11, i64 0}
// CHECK:STDOUT: !11 = !{!"int", !12, i64 0}
// CHECK:STDOUT: !12 = !{!"omnipotent char", !13, i64 0}
// CHECK:STDOUT: !13 = !{!"Simple C++ TBAA"}
// CHECK:STDOUT: !14 = distinct !DISubprogram(name: "f", linkageName: "_Z1fv", scope: !3, file: !3, line: 18, type: !15, scopeLine: 18, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, keyInstructions: true)
// CHECK:STDOUT: !15 = !DISubroutineType(types: !16)
// CHECK:STDOUT: !16 = !{!17}
// CHECK:STDOUT: !17 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
// CHECK:STDOUT: !18 = !DILocation(line: 18, column: 11, scope: !14, atomGroup: 1, atomRank: 1)
// CHECK:STDOUT: !19 = distinct !DISubprogram(name: "Call", linkageName: "_CCall.Main", scope: null, file: !3, line: 21, type: !15, spFlags: DISPFlagDefinition, unit: !2)
// CHECK:STDOUT: !20 = !DILocation(line: 22, column: 10, scope: !19)
// CHECK:STDOUT: !21 = !DILocation(line: 22, column: 3, scope: !19)
// CHECK:STDOUT: !0 = !DIFile(filename: "<carbon Cpp imports>", directory: "", checksumkind: CSK_MD5, checksum: "9eecb7db59d16c80417c72d1e1f4fbf1")
// CHECK:STDOUT: !1 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !0, isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
// CHECK:STDOUT: !2 = !DIFile(filename: "debug_info.carbon", directory: "")
// CHECK:STDOUT: !3 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
// CHECK:STDOUT: !4 = !{!3}
// CHECK:STDOUT: !5 = !DISubroutineType(types: !4)
// CHECK:STDOUT: !6 = distinct !DISubprogram(name: "f", linkageName: "_Z1fv", scope: !2, file: !2, line: 18, type: !5, scopeLine: 18, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !1, keyInstructions: true)
// CHECK:STDOUT: !10 = !DILocation(line: 18, column: 11, scope: !6, atomGroup: 1, atomRank: 1)
// CHECK:STDOUT: !14 = !{i32 7, !"Dwarf Version", i32 5}
// CHECK:STDOUT: !15 = !{i32 2, !"Debug Info Version", i32 3}
// CHECK:STDOUT: !30 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !2, producer: "carbon", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
// CHECK:STDOUT: !31 = distinct !DISubprogram(name: "Call", linkageName: "_CCall.Main", scope: null, file: !2, line: 21, type: !5, spFlags: DISPFlagDefinition, unit: !30)
// CHECK:STDOUT: !34 = !DILocation(line: 22, column: 10, scope: !31)
// CHECK:STDOUT: !35 = !DILocation(line: 22, column: 3, scope: !31)
// CHECK:STDOUT: !36 = !{i32 8, !"PIC Level", i32 2}
// CHECK:STDOUT: !37 = !{i32 7, !"PIE Level", i32 2}
// CHECK:STDOUT: !38 = !{i32 7, !"uwtable", i32 2}
// CHECK:STDOUT: !39 = !{!"Simple C++ TBAA"}
// CHECK:STDOUT: !40 = !{!"omnipotent char", !39, i64 0}
// CHECK:STDOUT: !41 = !{!"int", !40, i64 0}
// CHECK:STDOUT: !42 = !{!"__libc_errno", !41, i64 0}
// CHECK:STDOUT: !43 = !{!42, !41, i64 0}
// CHECK:STDOUT: