carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 08:54:47 +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/if_expr/basic.carbon
Vendored
+31 -31
View File
@@ -22,59 +22,59 @@ fn Select(b: bool) -> i32 {
// CHECK:STDOUT: source_filename = "basic.carbon"
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define i32 @_CF.Main() #0 !dbg !4 {
// CHECK:STDOUT: define i32 @_CF.Main() #0 !dbg !40 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: ret i32 1, !dbg !8
// CHECK:STDOUT: ret i32 1, !dbg !43
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define i32 @_CG.Main() #0 !dbg !9 {
// CHECK:STDOUT: define i32 @_CG.Main() #0 !dbg !44 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: ret i32 2, !dbg !10
// CHECK:STDOUT: ret i32 2, !dbg !47
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define i32 @_CSelect.Main(i1 %b) #0 !dbg !11 {
// CHECK:STDOUT: define i32 @_CSelect.Main(i1 %b) #0 !dbg !48 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: br i1 %b, label %if.expr.then, label %if.expr.else, !dbg !17
// CHECK:STDOUT: br i1 %b, label %if.expr.then, label %if.expr.else, !dbg !54
// CHECK:STDOUT:
// CHECK:STDOUT: if.expr.then: ; preds = %entry
// CHECK:STDOUT: %F.call = call i32 @_CF.Main(), !dbg !18
// CHECK:STDOUT: br label %if.expr.result, !dbg !17
// CHECK:STDOUT: %F.call = call i32 @_CF.Main(), !dbg !55
// CHECK:STDOUT: br label %if.expr.result, !dbg !54
// CHECK:STDOUT:
// CHECK:STDOUT: if.expr.else: ; preds = %entry
// CHECK:STDOUT: %G.call = call i32 @_CG.Main(), !dbg !19
// CHECK:STDOUT: br label %if.expr.result, !dbg !17
// CHECK:STDOUT: %G.call = call i32 @_CG.Main(), !dbg !56
// CHECK:STDOUT: br label %if.expr.result, !dbg !54
// CHECK:STDOUT:
// CHECK:STDOUT: if.expr.result: ; preds = %if.expr.else, %if.expr.then
// CHECK:STDOUT: %0 = phi i32 [ %F.call, %if.expr.then ], [ %G.call, %if.expr.else ]
// CHECK:STDOUT: ret i32 %0, !dbg !20
// CHECK:STDOUT: ret i32 %0, !dbg !57
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: attributes #0 = { nounwind }
// CHECK:STDOUT:
// CHECK:STDOUT: !llvm.dbg.cu = !{!0}
// CHECK:STDOUT: !llvm.dbg.cu = !{!33}
// 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: 13, type: !5, spFlags: DISPFlagDefinition, unit: !0)
// CHECK:STDOUT: !5 = !DISubroutineType(types: !6)
// CHECK:STDOUT: !6 = !{!7}
// CHECK:STDOUT: !7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
// CHECK:STDOUT: !8 = !DILocation(line: 13, column: 17, scope: !4)
// CHECK:STDOUT: !9 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main", scope: null, file: !1, line: 14, type: !5, spFlags: DISPFlagDefinition, unit: !0)
// CHECK:STDOUT: !10 = !DILocation(line: 14, column: 17, scope: !9)
// CHECK:STDOUT: !11 = distinct !DISubprogram(name: "Select", linkageName: "_CSelect.Main", scope: null, file: !1, line: 16, type: !12, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !15)
// CHECK:STDOUT: !12 = !DISubroutineType(types: !13)
// CHECK:STDOUT: !13 = !{!7, !14}
// CHECK:STDOUT: !14 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
// CHECK:STDOUT: !15 = !{!16}
// CHECK:STDOUT: !16 = !DILocalVariable(arg: 1, scope: !11, type: !14)
// CHECK:STDOUT: !17 = !DILocation(line: 17, column: 10, scope: !11)
// CHECK:STDOUT: !18 = !DILocation(line: 17, column: 20, scope: !11)
// CHECK:STDOUT: !19 = !DILocation(line: 17, column: 29, scope: !11)
// CHECK:STDOUT: !20 = !DILocation(line: 17, column: 3, scope: !11)
// CHECK:STDOUT: !32 = !DIFile(filename: "basic.carbon", directory: "")
// CHECK:STDOUT: !33 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !32, producer: "carbon", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
// CHECK:STDOUT: !34 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
// CHECK:STDOUT: !35 = !{!34}
// CHECK:STDOUT: !36 = !DISubroutineType(types: !35)
// CHECK:STDOUT: !37 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
// CHECK:STDOUT: !38 = !{!34, !37}
// CHECK:STDOUT: !39 = !DISubroutineType(types: !38)
// CHECK:STDOUT: !40 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main", scope: null, file: !32, line: 13, type: !36, spFlags: DISPFlagDefinition, unit: !33)
// CHECK:STDOUT: !43 = !DILocation(line: 13, column: 17, scope: !40)
// CHECK:STDOUT: !44 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main", scope: null, file: !32, line: 14, type: !36, spFlags: DISPFlagDefinition, unit: !33)
// CHECK:STDOUT: !47 = !DILocation(line: 14, column: 17, scope: !44)
// CHECK:STDOUT: !48 = distinct !DISubprogram(name: "Select", linkageName: "_CSelect.Main", scope: null, file: !32, line: 16, type: !39, spFlags: DISPFlagDefinition, unit: !33, retainedNodes: !58)
// CHECK:STDOUT: !49 = !DILocalVariable(arg: 1, scope: !48, type: !37)
// CHECK:STDOUT: !54 = !DILocation(line: 17, column: 10, scope: !48)
// CHECK:STDOUT: !55 = !DILocation(line: 17, column: 20, scope: !48)
// CHECK:STDOUT: !56 = !DILocation(line: 17, column: 29, scope: !48)
// CHECK:STDOUT: !57 = !DILocation(line: 17, column: 3, scope: !48)
// CHECK:STDOUT: !58 = !{!49}
// CHECK:STDOUT: