Преглед изворни кода

Use `Core.Range` from `for` lowering tests. (#5746)

Avoids duplicated test helper `EmptyRange`.
Richard Smith пре 10 месеци
родитељ
комит
3a7a09dfab
2 измењених фајлова са 266 додато и 155 уклоњено
  1. 139 83
      toolchain/lower/testdata/for/break_continue.carbon
  2. 127 72
      toolchain/lower/testdata/for/for.carbon

+ 139 - 83
toolchain/lower/testdata/for/break_continue.carbon

@@ -8,24 +8,14 @@
 // TIP: To dump output, run:
 // TIP:   bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/lower/testdata/for/break_continue.carbon
 
-class EmptyRange(T:! type) {
-  impl as Core.Iterate where .CursorType = {} and .ElementType = T {
-    fn NewCursor[self: Self]() -> {} {
-      return {};
-    }
-    fn Next[self: Self](cursor: {}*) -> Core.Optional(T) {
-      return Core.Optional(T).None();
-    }
-  }
-}
+import Core library "range";
 
 fn F() -> bool;
 fn G() -> bool;
 fn H();
 
 fn For() {
-  var r: EmptyRange(i32) = {};
-  for (n: i32 in r) {
+  for (n: i32 in Core.Range(100)) {
     if (F()) { break; }
     if (G()) { continue; }
     H();
@@ -35,8 +25,6 @@ fn For() {
 // CHECK:STDOUT: ; ModuleID = 'break_continue.carbon'
 // CHECK:STDOUT: source_filename = "break_continue.carbon"
 // CHECK:STDOUT:
-// CHECK:STDOUT: @EmptyRange.val.loc27_3.1 = internal constant {} zeroinitializer
-// CHECK:STDOUT:
 // CHECK:STDOUT: declare i1 @_CF.Main()
 // CHECK:STDOUT:
 // CHECK:STDOUT: declare i1 @_CG.Main()
@@ -45,84 +33,128 @@ fn For() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: define void @_CFor.Main() !dbg !4 {
 // CHECK:STDOUT: entry:
-// CHECK:STDOUT:   %r.var = alloca {}, align 8, !dbg !7
-// CHECK:STDOUT:   %var = alloca {}, align 8, !dbg !8
-// CHECK:STDOUT:   %.loc28_19.1.temp = alloca { i1, i32 }, align 8, !dbg !8
-// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 0, ptr %r.var), !dbg !7
-// CHECK:STDOUT:   call void @llvm.memcpy.p0.p0.i64(ptr align 1 %r.var, ptr align 1 @EmptyRange.val.loc27_3.1, i64 0, i1 false), !dbg !7
-// CHECK:STDOUT:   call void @"_CNewCursor.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4"(ptr %r.var), !dbg !8
-// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 0, ptr %var), !dbg !8
+// CHECK:STDOUT:   %.loc18_32.1.temp = alloca { i32, i32 }, align 8, !dbg !7
+// CHECK:STDOUT:   %var = alloca i32, align 4, !dbg !8
+// CHECK:STDOUT:   %.loc18_33.1.temp = alloca { i1, i32 }, align 8, !dbg !8
+// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 8, ptr %.loc18_32.1.temp), !dbg !7
+// CHECK:STDOUT:   call void @_CRange.Core(ptr %.loc18_32.1.temp, i32 100), !dbg !7
+// CHECK:STDOUT:   %NewCursor.call = call i32 @"_CNewCursor.IntRange.Core:Iterate.Core.be1e879c1ad406d8"(ptr %.loc18_32.1.temp), !dbg !8
+// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 4, ptr %var), !dbg !8
+// CHECK:STDOUT:   store i32 %NewCursor.call, ptr %var, align 4, !dbg !8
 // CHECK:STDOUT:   br label %for.next, !dbg !8
 // CHECK:STDOUT:
-// CHECK:STDOUT: for.next:                                         ; preds = %if.else.loc30, %if.then.loc30, %entry
-// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 8, ptr %.loc28_19.1.temp), !dbg !8
-// CHECK:STDOUT:   call void @"_CNext.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4"(ptr %.loc28_19.1.temp, ptr %r.var, ptr %var), !dbg !8
-// CHECK:STDOUT:   %HasValue.call = call i1 @_CHasValue.Optional.Core.b88d1103f417c6d4(ptr %.loc28_19.1.temp), !dbg !8
+// CHECK:STDOUT: for.next:                                         ; preds = %if.else.loc20, %if.then.loc20, %entry
+// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 8, ptr %.loc18_33.1.temp), !dbg !8
+// CHECK:STDOUT:   call void @"_CNext.IntRange.Core:Iterate.Core.be1e879c1ad406d8"(ptr %.loc18_33.1.temp, ptr %.loc18_32.1.temp, ptr %var), !dbg !8
+// CHECK:STDOUT:   %HasValue.call = call i1 @_CHasValue.Optional.Core.b88d1103f417c6d4(ptr %.loc18_33.1.temp), !dbg !8
 // CHECK:STDOUT:   br i1 %HasValue.call, label %for.body, label %for.done, !dbg !8
 // CHECK:STDOUT:
 // CHECK:STDOUT: for.body:                                         ; preds = %for.next
-// CHECK:STDOUT:   %Get.call = call i32 @_CGet.Optional.Core.b88d1103f417c6d4(ptr %.loc28_19.1.temp), !dbg !8
+// CHECK:STDOUT:   %Get.call = call i32 @_CGet.Optional.Core.b88d1103f417c6d4(ptr %.loc18_33.1.temp), !dbg !8
 // CHECK:STDOUT:   %F.call = call i1 @_CF.Main(), !dbg !9
-// CHECK:STDOUT:   br i1 %F.call, label %if.then.loc29, label %if.else.loc29, !dbg !10
+// CHECK:STDOUT:   br i1 %F.call, label %if.then.loc19, label %if.else.loc19, !dbg !10
 // CHECK:STDOUT:
-// CHECK:STDOUT: if.then.loc29:                                    ; preds = %for.body
+// CHECK:STDOUT: if.then.loc19:                                    ; preds = %for.body
 // CHECK:STDOUT:   br label %for.done, !dbg !11
 // CHECK:STDOUT:
-// CHECK:STDOUT: if.else.loc29:                                    ; preds = %for.body
+// CHECK:STDOUT: if.else.loc19:                                    ; preds = %for.body
 // CHECK:STDOUT:   %G.call = call i1 @_CG.Main(), !dbg !12
-// CHECK:STDOUT:   br i1 %G.call, label %if.then.loc30, label %if.else.loc30, !dbg !13
+// CHECK:STDOUT:   br i1 %G.call, label %if.then.loc20, label %if.else.loc20, !dbg !13
 // CHECK:STDOUT:
-// CHECK:STDOUT: if.then.loc30:                                    ; preds = %if.else.loc29
+// CHECK:STDOUT: if.then.loc20:                                    ; preds = %if.else.loc19
 // CHECK:STDOUT:   br label %for.next, !dbg !14
 // CHECK:STDOUT:
-// CHECK:STDOUT: if.else.loc30:                                    ; preds = %if.else.loc29
+// CHECK:STDOUT: if.else.loc20:                                    ; preds = %if.else.loc19
 // CHECK:STDOUT:   call void @_CH.Main(), !dbg !15
 // CHECK:STDOUT:   br label %for.next, !dbg !16
 // CHECK:STDOUT:
-// CHECK:STDOUT: for.done:                                         ; preds = %if.then.loc29, %for.next
+// CHECK:STDOUT: for.done:                                         ; preds = %if.then.loc19, %for.next
+// CHECK:STDOUT:   %.loc18_33.12 = load i32, ptr %var, align 4, !dbg !8
 // CHECK:STDOUT:   ret void, !dbg !17
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
+// CHECK:STDOUT: declare void @_CRange.Core(ptr sret({ i32, i32 }), i32)
+// CHECK:STDOUT:
 // CHECK:STDOUT: ; Function Attrs: nocallback nofree nosync nounwind willreturn memory(argmem: readwrite)
 // CHECK:STDOUT: declare void @llvm.lifetime.start.p0(i64 immarg, ptr captures(none)) #0
 // CHECK:STDOUT:
-// CHECK:STDOUT: ; Function Attrs: nocallback nofree nounwind willreturn memory(argmem: readwrite)
-// CHECK:STDOUT: declare void @llvm.memcpy.p0.p0.i64(ptr noalias writeonly captures(none), ptr noalias readonly captures(none), i64, i1 immarg) #1
+// CHECK:STDOUT: define linkonce_odr i32 @"_CNewCursor.IntRange.Core:Iterate.Core.be1e879c1ad406d8"(ptr %self) !dbg !18 {
+// CHECK:STDOUT:   %start = getelementptr inbounds nuw { i32, i32 }, ptr %self, i32 0, i32 0, !dbg !20
+// CHECK:STDOUT:   %1 = load i32, ptr %start, align 4, !dbg !20
+// CHECK:STDOUT:   ret i32 %1, !dbg !21
+// CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: define linkonce_odr void @"_CNewCursor.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4"(ptr %self) !dbg !18 {
-// CHECK:STDOUT: entry:
-// CHECK:STDOUT:   ret void, !dbg !19
+// CHECK:STDOUT: define linkonce_odr void @"_CNext.IntRange.Core:Iterate.Core.be1e879c1ad406d8"(ptr sret({ i1, i32 }) %return, ptr %self, ptr %cursor) !dbg !22 {
+// CHECK:STDOUT:   %1 = alloca i32, align 4, !dbg !23
+// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 4, ptr %1), !dbg !23
+// CHECK:STDOUT:   %2 = load i32, ptr %cursor, align 4, !dbg !24
+// CHECK:STDOUT:   store i32 %2, ptr %1, align 4, !dbg !23
+// CHECK:STDOUT:   %end = getelementptr inbounds nuw { i32, i32 }, ptr %self, i32 0, i32 1, !dbg !25
+// CHECK:STDOUT:   %3 = load i32, ptr %end, align 4, !dbg !25
+// CHECK:STDOUT:   %4 = load i32, ptr %1, align 4, !dbg !26
+// CHECK:STDOUT:   %5 = icmp slt i32 %4, %3, !dbg !26
+// CHECK:STDOUT:   br i1 %5, label %6, label %8, !dbg !27
+// CHECK:STDOUT:
+// CHECK:STDOUT: 6:                                                ; preds = %0
+// CHECK:STDOUT:   call void @"_COp.Int.Core:Inc.Core.be1e879c1ad406d8"(ptr %cursor), !dbg !28
+// CHECK:STDOUT:   %7 = load i32, ptr %1, align 4, !dbg !29
+// CHECK:STDOUT:   call void @_CSome.Optional.Core.b88d1103f417c6d4(ptr %return, i32 %7), !dbg !30
+// CHECK:STDOUT:   ret void, !dbg !31
+// CHECK:STDOUT:
+// CHECK:STDOUT: 8:                                                ; preds = %0
+// CHECK:STDOUT:   call void @_CNone.Optional.Core.b88d1103f417c6d4(ptr %return), !dbg !32
+// CHECK:STDOUT:   ret void, !dbg !33
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: define linkonce_odr void @"_CNext.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4"(ptr sret({ i1, i32 }) %return, ptr %self, ptr %cursor) !dbg !20 {
-// CHECK:STDOUT: entry:
-// CHECK:STDOUT:   call void @_CNone.Optional.Core.b88d1103f417c6d4(ptr %return), !dbg !21
-// CHECK:STDOUT:   ret void, !dbg !22
+// CHECK:STDOUT: define linkonce_odr i1 @_CHasValue.Optional.Core.b88d1103f417c6d4(ptr %self) !dbg !34 {
+// CHECK:STDOUT:   %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %self, i32 0, i32 0, !dbg !36
+// CHECK:STDOUT:   %1 = load i1, ptr %has_value, align 1, !dbg !36
+// CHECK:STDOUT:   ret i1 %1, !dbg !37
+// CHECK:STDOUT: }
+// CHECK:STDOUT:
+// CHECK:STDOUT: define linkonce_odr i32 @_CGet.Optional.Core.b88d1103f417c6d4(ptr %self) !dbg !38 {
+// CHECK:STDOUT:   %value = getelementptr inbounds nuw { i1, i32 }, ptr %self, i32 0, i32 1, !dbg !39
+// CHECK:STDOUT:   %1 = load i32, ptr %value, align 4, !dbg !39
+// CHECK:STDOUT:   ret i32 %1, !dbg !40
+// CHECK:STDOUT: }
+// CHECK:STDOUT:
+// CHECK:STDOUT: declare void @_CInclusiveRange.Core(ptr sret({ i32, i32 }), i32, i32)
+// CHECK:STDOUT:
+// CHECK:STDOUT: define linkonce_odr void @"_COp.Int.Core:Inc.Core.be1e879c1ad406d8"(ptr %self) !dbg !41 {
+// CHECK:STDOUT:   call void @"_COp:thunk.Int.Core:AddAssignWith.Core.25a9a5e901f5b032"(ptr %self, i32 1), !dbg !43
+// CHECK:STDOUT:   ret void, !dbg !44
+// CHECK:STDOUT: }
+// CHECK:STDOUT:
+// CHECK:STDOUT: define linkonce_odr void @_CSome.Optional.Core.b88d1103f417c6d4(ptr sret({ i1, i32 }) %return, i32 %value) !dbg !45 {
+// CHECK:STDOUT:   %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %return, i32 0, i32 0, !dbg !46
+// CHECK:STDOUT:   %value1 = getelementptr inbounds nuw { i1, i32 }, ptr %return, i32 0, i32 1, !dbg !46
+// CHECK:STDOUT:   store i32 %value, ptr %value1, align 4, !dbg !46
+// CHECK:STDOUT:   store i1 true, ptr %has_value, align 1, !dbg !46
+// CHECK:STDOUT:   ret void, !dbg !47
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: define linkonce_odr i1 @_CHasValue.Optional.Core.b88d1103f417c6d4(ptr %self) !dbg !23 {
-// CHECK:STDOUT:   %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %self, i32 0, i32 0, !dbg !25
-// CHECK:STDOUT:   %1 = load i1, ptr %has_value, align 1, !dbg !25
-// CHECK:STDOUT:   ret i1 %1, !dbg !26
+// CHECK:STDOUT: define linkonce_odr void @_CNone.Optional.Core.b88d1103f417c6d4(ptr sret({ i1, i32 }) %return) !dbg !48 {
+// CHECK:STDOUT:   %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %return, i32 0, i32 0, !dbg !49
+// CHECK:STDOUT:   store i1 false, ptr %has_value, align 1, !dbg !49
+// CHECK:STDOUT:   ret void, !dbg !50
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: define linkonce_odr i32 @_CGet.Optional.Core.b88d1103f417c6d4(ptr %self) !dbg !27 {
-// CHECK:STDOUT:   %value = getelementptr inbounds nuw { i1, i32 }, ptr %self, i32 0, i32 1, !dbg !28
-// CHECK:STDOUT:   %1 = load i32, ptr %value, align 4, !dbg !28
-// CHECK:STDOUT:   ret i32 %1, !dbg !29
+// CHECK:STDOUT: define linkonce_odr void @"_COp:thunk.Int.Core:AddAssignWith.Core.25a9a5e901f5b032"(ptr %self, i32 %other) !dbg !51 {
+// CHECK:STDOUT:   %1 = call i32 @"_CConvert.8b3d5d6a6c17be04:ImplicitAs.Core.b88d1103f417c6d4"(i32 %other), !dbg !52
+// CHECK:STDOUT:   %2 = load i32, ptr %self, align 4, !dbg !53
+// CHECK:STDOUT:   %3 = add i32 %2, %1, !dbg !53
+// CHECK:STDOUT:   store i32 %3, ptr %self, align 4, !dbg !53
+// CHECK:STDOUT:   ret void, !dbg !53
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: define linkonce_odr void @_CNone.Optional.Core.b88d1103f417c6d4(ptr sret({ i1, i32 }) %return) !dbg !30 {
-// CHECK:STDOUT:   %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %return, i32 0, i32 0, !dbg !31
-// CHECK:STDOUT:   store i1 false, ptr %has_value, align 1, !dbg !31
-// CHECK:STDOUT:   ret void, !dbg !32
+// CHECK:STDOUT: define linkonce_odr i32 @"_CConvert.8b3d5d6a6c17be04:ImplicitAs.Core.b88d1103f417c6d4"(i32 %self) !dbg !54 {
+// CHECK:STDOUT:   ret i32 %self, !dbg !56
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: ; uselistorder directives
-// CHECK:STDOUT: uselistorder ptr @llvm.lifetime.start.p0, { 2, 1, 0 }
+// CHECK:STDOUT: uselistorder ptr @llvm.lifetime.start.p0, { 0, 3, 2, 1 }
 // CHECK:STDOUT:
 // CHECK:STDOUT: attributes #0 = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) }
-// CHECK:STDOUT: attributes #1 = { nocallback nofree nounwind willreturn memory(argmem: readwrite) }
 // CHECK:STDOUT:
 // CHECK:STDOUT: !llvm.module.flags = !{!0, !1}
 // CHECK:STDOUT: !llvm.dbg.cu = !{!2}
@@ -131,32 +163,56 @@ fn For() {
 // CHECK:STDOUT: !1 = !{i32 2, !"Debug Info Version", i32 3}
 // CHECK:STDOUT: !2 = distinct !DICompileUnit(language: DW_LANG_C, file: !3, producer: "carbon", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
 // CHECK:STDOUT: !3 = !DIFile(filename: "break_continue.carbon", directory: "")
-// CHECK:STDOUT: !4 = distinct !DISubprogram(name: "For", linkageName: "_CFor.Main", scope: null, file: !3, line: 26, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !4 = distinct !DISubprogram(name: "For", linkageName: "_CFor.Main", scope: null, file: !3, line: 17, type: !5, spFlags: DISPFlagDefinition, unit: !2)
 // CHECK:STDOUT: !5 = !DISubroutineType(types: !6)
 // CHECK:STDOUT: !6 = !{}
-// CHECK:STDOUT: !7 = !DILocation(line: 27, column: 3, scope: !4)
-// CHECK:STDOUT: !8 = !DILocation(line: 28, column: 7, scope: !4)
-// CHECK:STDOUT: !9 = !DILocation(line: 29, column: 9, scope: !4)
-// CHECK:STDOUT: !10 = !DILocation(line: 29, column: 8, scope: !4)
-// CHECK:STDOUT: !11 = !DILocation(line: 29, column: 16, scope: !4)
-// CHECK:STDOUT: !12 = !DILocation(line: 30, column: 9, scope: !4)
-// CHECK:STDOUT: !13 = !DILocation(line: 30, column: 8, scope: !4)
-// CHECK:STDOUT: !14 = !DILocation(line: 30, column: 16, scope: !4)
-// CHECK:STDOUT: !15 = !DILocation(line: 31, column: 5, scope: !4)
-// CHECK:STDOUT: !16 = !DILocation(line: 28, column: 3, scope: !4)
-// CHECK:STDOUT: !17 = !DILocation(line: 26, column: 1, scope: !4)
-// CHECK:STDOUT: !18 = distinct !DISubprogram(name: "NewCursor", linkageName: "_CNewCursor.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4", scope: null, file: !3, line: 13, type: !5, spFlags: DISPFlagDefinition, unit: !2)
-// CHECK:STDOUT: !19 = !DILocation(line: 14, column: 7, scope: !18)
-// CHECK:STDOUT: !20 = distinct !DISubprogram(name: "Next", linkageName: "_CNext.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4", scope: null, file: !3, line: 16, type: !5, spFlags: DISPFlagDefinition, unit: !2)
-// CHECK:STDOUT: !21 = !DILocation(line: 17, column: 14, scope: !20)
-// CHECK:STDOUT: !22 = !DILocation(line: 17, column: 7, scope: !20)
-// CHECK:STDOUT: !23 = distinct !DISubprogram(name: "HasValue", linkageName: "_CHasValue.Optional.Core.b88d1103f417c6d4", scope: null, file: !24, line: 28, type: !5, spFlags: DISPFlagDefinition, unit: !2)
-// CHECK:STDOUT: !24 = !DIFile(filename: "{{.*}}/prelude/types/optional.carbon", directory: "")
-// CHECK:STDOUT: !25 = !DILocation(line: 28, column: 46, scope: !23)
-// CHECK:STDOUT: !26 = !DILocation(line: 28, column: 39, scope: !23)
-// CHECK:STDOUT: !27 = distinct !DISubprogram(name: "Get", linkageName: "_CGet.Optional.Core.b88d1103f417c6d4", scope: null, file: !24, line: 29, type: !5, spFlags: DISPFlagDefinition, unit: !2)
-// CHECK:STDOUT: !28 = !DILocation(line: 29, column: 38, scope: !27)
-// CHECK:STDOUT: !29 = !DILocation(line: 29, column: 31, scope: !27)
-// CHECK:STDOUT: !30 = distinct !DISubprogram(name: "None", linkageName: "_CNone.Optional.Core.b88d1103f417c6d4", scope: null, file: !24, line: 18, type: !5, spFlags: DISPFlagDefinition, unit: !2)
-// CHECK:STDOUT: !31 = !DILocation(line: 20, column: 5, scope: !30)
-// CHECK:STDOUT: !32 = !DILocation(line: 21, column: 5, scope: !30)
+// CHECK:STDOUT: !7 = !DILocation(line: 18, column: 18, scope: !4)
+// CHECK:STDOUT: !8 = !DILocation(line: 18, column: 7, scope: !4)
+// CHECK:STDOUT: !9 = !DILocation(line: 19, column: 9, scope: !4)
+// CHECK:STDOUT: !10 = !DILocation(line: 19, column: 8, scope: !4)
+// CHECK:STDOUT: !11 = !DILocation(line: 19, column: 16, scope: !4)
+// CHECK:STDOUT: !12 = !DILocation(line: 20, column: 9, scope: !4)
+// CHECK:STDOUT: !13 = !DILocation(line: 20, column: 8, scope: !4)
+// CHECK:STDOUT: !14 = !DILocation(line: 20, column: 16, scope: !4)
+// CHECK:STDOUT: !15 = !DILocation(line: 21, column: 5, scope: !4)
+// CHECK:STDOUT: !16 = !DILocation(line: 18, column: 3, scope: !4)
+// CHECK:STDOUT: !17 = !DILocation(line: 17, column: 1, scope: !4)
+// CHECK:STDOUT: !18 = distinct !DISubprogram(name: "NewCursor", linkageName: "_CNewCursor.IntRange.Core:Iterate.Core.be1e879c1ad406d8", scope: null, file: !19, line: 25, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !19 = !DIFile(filename: "{{.*}}/range.carbon", directory: "")
+// CHECK:STDOUT: !20 = !DILocation(line: 25, column: 51, scope: !18)
+// CHECK:STDOUT: !21 = !DILocation(line: 25, column: 44, scope: !18)
+// CHECK:STDOUT: !22 = distinct !DISubprogram(name: "Next", linkageName: "_CNext.IntRange.Core:Iterate.Core.be1e879c1ad406d8", scope: null, file: !19, line: 26, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !23 = !DILocation(line: 27, column: 7, scope: !22)
+// CHECK:STDOUT: !24 = !DILocation(line: 27, column: 27, scope: !22)
+// CHECK:STDOUT: !25 = !DILocation(line: 28, column: 19, scope: !22)
+// CHECK:STDOUT: !26 = !DILocation(line: 28, column: 11, scope: !22)
+// CHECK:STDOUT: !27 = !DILocation(line: 28, column: 10, scope: !22)
+// CHECK:STDOUT: !28 = !DILocation(line: 29, column: 9, scope: !22)
+// CHECK:STDOUT: !29 = !DILocation(line: 30, column: 38, scope: !22)
+// CHECK:STDOUT: !30 = !DILocation(line: 30, column: 16, scope: !22)
+// CHECK:STDOUT: !31 = !DILocation(line: 30, column: 9, scope: !22)
+// CHECK:STDOUT: !32 = !DILocation(line: 32, column: 16, scope: !22)
+// CHECK:STDOUT: !33 = !DILocation(line: 32, column: 9, scope: !22)
+// CHECK:STDOUT: !34 = distinct !DISubprogram(name: "HasValue", linkageName: "_CHasValue.Optional.Core.b88d1103f417c6d4", scope: null, file: !35, line: 28, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !35 = !DIFile(filename: "{{.*}}/prelude/types/optional.carbon", directory: "")
+// CHECK:STDOUT: !36 = !DILocation(line: 28, column: 46, scope: !34)
+// CHECK:STDOUT: !37 = !DILocation(line: 28, column: 39, scope: !34)
+// CHECK:STDOUT: !38 = distinct !DISubprogram(name: "Get", linkageName: "_CGet.Optional.Core.b88d1103f417c6d4", scope: null, file: !35, line: 29, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !39 = !DILocation(line: 29, column: 38, scope: !38)
+// CHECK:STDOUT: !40 = !DILocation(line: 29, column: 31, scope: !38)
+// CHECK:STDOUT: !41 = distinct !DISubprogram(name: "Op", linkageName: "_COp.Int.Core:Inc.Core.be1e879c1ad406d8", scope: null, file: !42, line: 331, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !42 = !DIFile(filename: "{{.*}}/prelude/types/int.carbon", directory: "")
+// CHECK:STDOUT: !43 = !DILocation(line: 333, column: 5, scope: !41)
+// CHECK:STDOUT: !44 = !DILocation(line: 331, column: 3, scope: !41)
+// CHECK:STDOUT: !45 = distinct !DISubprogram(name: "Some", linkageName: "_CSome.Optional.Core.b88d1103f417c6d4", scope: null, file: !35, line: 24, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !46 = !DILocation(line: 25, column: 12, scope: !45)
+// CHECK:STDOUT: !47 = !DILocation(line: 25, column: 5, scope: !45)
+// CHECK:STDOUT: !48 = distinct !DISubprogram(name: "None", linkageName: "_CNone.Optional.Core.b88d1103f417c6d4", scope: null, file: !35, line: 18, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !49 = !DILocation(line: 20, column: 5, scope: !48)
+// CHECK:STDOUT: !50 = !DILocation(line: 21, column: 5, scope: !48)
+// CHECK:STDOUT: !51 = distinct !DISubprogram(name: "Op", linkageName: "_COp:thunk.Int.Core:AddAssignWith.Core.25a9a5e901f5b032", scope: null, file: !42, line: 267, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !52 = !DILocation(line: 4294967295, scope: !51)
+// CHECK:STDOUT: !53 = !DILocation(line: 267, column: 3, scope: !51)
+// CHECK:STDOUT: !54 = distinct !DISubprogram(name: "Convert", linkageName: "_CConvert.8b3d5d6a6c17be04:ImplicitAs.Core.b88d1103f417c6d4", scope: null, file: !55, line: 18, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !55 = !DIFile(filename: "{{.*}}/prelude/operators/as.carbon", directory: "")
+// CHECK:STDOUT: !56 = !DILocation(line: 18, column: 38, scope: !54)

+ 127 - 72
toolchain/lower/testdata/for/for.carbon

@@ -8,26 +8,15 @@
 // TIP: To dump output, run:
 // TIP:   bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/lower/testdata/for/for.carbon
 
-class EmptyRange(T:! type) {
-  impl as Core.Iterate where .CursorType = {} and .ElementType = T {
-    fn NewCursor[self: Self]() -> {} {
-      return {};
-    }
-    fn Next[self: Self](cursor: {}*) -> Core.Optional(T) {
-      return Core.Optional(T).None();
-    }
-  }
-}
+import Core library "range";
 
 fn F();
 fn G();
 fn H();
 
 fn For() {
-  var r: EmptyRange(i32) = {};
-
   F();
-  for (n: i32 in r) {
+  for (n: i32 in Core.Range(100)) {
     G();
   }
   H();
@@ -36,8 +25,6 @@ fn For() {
 // CHECK:STDOUT: ; ModuleID = 'for.carbon'
 // CHECK:STDOUT: source_filename = "for.carbon"
 // CHECK:STDOUT:
-// CHECK:STDOUT: @EmptyRange.val.loc27_3.1 = internal constant {} zeroinitializer
-// CHECK:STDOUT:
 // CHECK:STDOUT: declare void @_CF.Main()
 // CHECK:STDOUT:
 // CHECK:STDOUT: declare void @_CG.Main()
@@ -46,72 +33,116 @@ fn For() {
 // CHECK:STDOUT:
 // CHECK:STDOUT: define void @_CFor.Main() !dbg !4 {
 // CHECK:STDOUT: entry:
-// CHECK:STDOUT:   %r.var = alloca {}, align 8, !dbg !7
-// CHECK:STDOUT:   %var = alloca {}, align 8, !dbg !8
-// CHECK:STDOUT:   %.loc30_19.1.temp = alloca { i1, i32 }, align 8, !dbg !8
-// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 0, ptr %r.var), !dbg !7
-// CHECK:STDOUT:   call void @llvm.memcpy.p0.p0.i64(ptr align 1 %r.var, ptr align 1 @EmptyRange.val.loc27_3.1, i64 0, i1 false), !dbg !7
+// CHECK:STDOUT:   %.loc19_32.1.temp = alloca { i32, i32 }, align 8, !dbg !7
+// CHECK:STDOUT:   %var = alloca i32, align 4, !dbg !8
+// CHECK:STDOUT:   %.loc19_33.1.temp = alloca { i1, i32 }, align 8, !dbg !8
 // CHECK:STDOUT:   call void @_CF.Main(), !dbg !9
-// CHECK:STDOUT:   call void @"_CNewCursor.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4"(ptr %r.var), !dbg !8
-// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 0, ptr %var), !dbg !8
+// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 8, ptr %.loc19_32.1.temp), !dbg !7
+// CHECK:STDOUT:   call void @_CRange.Core(ptr %.loc19_32.1.temp, i32 100), !dbg !7
+// CHECK:STDOUT:   %NewCursor.call = call i32 @"_CNewCursor.IntRange.Core:Iterate.Core.be1e879c1ad406d8"(ptr %.loc19_32.1.temp), !dbg !8
+// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 4, ptr %var), !dbg !8
+// CHECK:STDOUT:   store i32 %NewCursor.call, ptr %var, align 4, !dbg !8
 // CHECK:STDOUT:   br label %for.next, !dbg !8
 // CHECK:STDOUT:
 // CHECK:STDOUT: for.next:                                         ; preds = %for.body, %entry
-// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 8, ptr %.loc30_19.1.temp), !dbg !8
-// CHECK:STDOUT:   call void @"_CNext.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4"(ptr %.loc30_19.1.temp, ptr %r.var, ptr %var), !dbg !8
-// CHECK:STDOUT:   %HasValue.call = call i1 @_CHasValue.Optional.Core.b88d1103f417c6d4(ptr %.loc30_19.1.temp), !dbg !8
+// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 8, ptr %.loc19_33.1.temp), !dbg !8
+// CHECK:STDOUT:   call void @"_CNext.IntRange.Core:Iterate.Core.be1e879c1ad406d8"(ptr %.loc19_33.1.temp, ptr %.loc19_32.1.temp, ptr %var), !dbg !8
+// CHECK:STDOUT:   %HasValue.call = call i1 @_CHasValue.Optional.Core.b88d1103f417c6d4(ptr %.loc19_33.1.temp), !dbg !8
 // CHECK:STDOUT:   br i1 %HasValue.call, label %for.body, label %for.done, !dbg !8
 // CHECK:STDOUT:
 // CHECK:STDOUT: for.body:                                         ; preds = %for.next
-// CHECK:STDOUT:   %Get.call = call i32 @_CGet.Optional.Core.b88d1103f417c6d4(ptr %.loc30_19.1.temp), !dbg !8
+// CHECK:STDOUT:   %Get.call = call i32 @_CGet.Optional.Core.b88d1103f417c6d4(ptr %.loc19_33.1.temp), !dbg !8
 // CHECK:STDOUT:   call void @_CG.Main(), !dbg !10
 // CHECK:STDOUT:   br label %for.next, !dbg !11
 // CHECK:STDOUT:
 // CHECK:STDOUT: for.done:                                         ; preds = %for.next
 // CHECK:STDOUT:   call void @_CH.Main(), !dbg !12
+// CHECK:STDOUT:   %.loc19_33.12 = load i32, ptr %var, align 4, !dbg !8
 // CHECK:STDOUT:   ret void, !dbg !13
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
+// CHECK:STDOUT: declare void @_CRange.Core(ptr sret({ i32, i32 }), i32)
+// CHECK:STDOUT:
 // CHECK:STDOUT: ; Function Attrs: nocallback nofree nosync nounwind willreturn memory(argmem: readwrite)
 // CHECK:STDOUT: declare void @llvm.lifetime.start.p0(i64 immarg, ptr captures(none)) #0
 // CHECK:STDOUT:
-// CHECK:STDOUT: ; Function Attrs: nocallback nofree nounwind willreturn memory(argmem: readwrite)
-// CHECK:STDOUT: declare void @llvm.memcpy.p0.p0.i64(ptr noalias writeonly captures(none), ptr noalias readonly captures(none), i64, i1 immarg) #1
+// CHECK:STDOUT: define linkonce_odr i32 @"_CNewCursor.IntRange.Core:Iterate.Core.be1e879c1ad406d8"(ptr %self) !dbg !14 {
+// CHECK:STDOUT:   %start = getelementptr inbounds nuw { i32, i32 }, ptr %self, i32 0, i32 0, !dbg !16
+// CHECK:STDOUT:   %1 = load i32, ptr %start, align 4, !dbg !16
+// CHECK:STDOUT:   ret i32 %1, !dbg !17
+// CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: define linkonce_odr void @"_CNewCursor.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4"(ptr %self) !dbg !14 {
-// CHECK:STDOUT: entry:
-// CHECK:STDOUT:   ret void, !dbg !15
+// CHECK:STDOUT: define linkonce_odr void @"_CNext.IntRange.Core:Iterate.Core.be1e879c1ad406d8"(ptr sret({ i1, i32 }) %return, ptr %self, ptr %cursor) !dbg !18 {
+// CHECK:STDOUT:   %1 = alloca i32, align 4, !dbg !19
+// CHECK:STDOUT:   call void @llvm.lifetime.start.p0(i64 4, ptr %1), !dbg !19
+// CHECK:STDOUT:   %2 = load i32, ptr %cursor, align 4, !dbg !20
+// CHECK:STDOUT:   store i32 %2, ptr %1, align 4, !dbg !19
+// CHECK:STDOUT:   %end = getelementptr inbounds nuw { i32, i32 }, ptr %self, i32 0, i32 1, !dbg !21
+// CHECK:STDOUT:   %3 = load i32, ptr %end, align 4, !dbg !21
+// CHECK:STDOUT:   %4 = load i32, ptr %1, align 4, !dbg !22
+// CHECK:STDOUT:   %5 = icmp slt i32 %4, %3, !dbg !22
+// CHECK:STDOUT:   br i1 %5, label %6, label %8, !dbg !23
+// CHECK:STDOUT:
+// CHECK:STDOUT: 6:                                                ; preds = %0
+// CHECK:STDOUT:   call void @"_COp.Int.Core:Inc.Core.be1e879c1ad406d8"(ptr %cursor), !dbg !24
+// CHECK:STDOUT:   %7 = load i32, ptr %1, align 4, !dbg !25
+// CHECK:STDOUT:   call void @_CSome.Optional.Core.b88d1103f417c6d4(ptr %return, i32 %7), !dbg !26
+// CHECK:STDOUT:   ret void, !dbg !27
+// CHECK:STDOUT:
+// CHECK:STDOUT: 8:                                                ; preds = %0
+// CHECK:STDOUT:   call void @_CNone.Optional.Core.b88d1103f417c6d4(ptr %return), !dbg !28
+// CHECK:STDOUT:   ret void, !dbg !29
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: define linkonce_odr void @"_CNext.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4"(ptr sret({ i1, i32 }) %return, ptr %self, ptr %cursor) !dbg !16 {
-// CHECK:STDOUT: entry:
-// CHECK:STDOUT:   call void @_CNone.Optional.Core.b88d1103f417c6d4(ptr %return), !dbg !17
-// CHECK:STDOUT:   ret void, !dbg !18
+// CHECK:STDOUT: define linkonce_odr i1 @_CHasValue.Optional.Core.b88d1103f417c6d4(ptr %self) !dbg !30 {
+// CHECK:STDOUT:   %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %self, i32 0, i32 0, !dbg !32
+// CHECK:STDOUT:   %1 = load i1, ptr %has_value, align 1, !dbg !32
+// CHECK:STDOUT:   ret i1 %1, !dbg !33
+// CHECK:STDOUT: }
+// CHECK:STDOUT:
+// CHECK:STDOUT: define linkonce_odr i32 @_CGet.Optional.Core.b88d1103f417c6d4(ptr %self) !dbg !34 {
+// CHECK:STDOUT:   %value = getelementptr inbounds nuw { i1, i32 }, ptr %self, i32 0, i32 1, !dbg !35
+// CHECK:STDOUT:   %1 = load i32, ptr %value, align 4, !dbg !35
+// CHECK:STDOUT:   ret i32 %1, !dbg !36
+// CHECK:STDOUT: }
+// CHECK:STDOUT:
+// CHECK:STDOUT: declare void @_CInclusiveRange.Core(ptr sret({ i32, i32 }), i32, i32)
+// CHECK:STDOUT:
+// CHECK:STDOUT: define linkonce_odr void @"_COp.Int.Core:Inc.Core.be1e879c1ad406d8"(ptr %self) !dbg !37 {
+// CHECK:STDOUT:   call void @"_COp:thunk.Int.Core:AddAssignWith.Core.25a9a5e901f5b032"(ptr %self, i32 1), !dbg !39
+// CHECK:STDOUT:   ret void, !dbg !40
+// CHECK:STDOUT: }
+// CHECK:STDOUT:
+// CHECK:STDOUT: define linkonce_odr void @_CSome.Optional.Core.b88d1103f417c6d4(ptr sret({ i1, i32 }) %return, i32 %value) !dbg !41 {
+// CHECK:STDOUT:   %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %return, i32 0, i32 0, !dbg !42
+// CHECK:STDOUT:   %value1 = getelementptr inbounds nuw { i1, i32 }, ptr %return, i32 0, i32 1, !dbg !42
+// CHECK:STDOUT:   store i32 %value, ptr %value1, align 4, !dbg !42
+// CHECK:STDOUT:   store i1 true, ptr %has_value, align 1, !dbg !42
+// CHECK:STDOUT:   ret void, !dbg !43
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: define linkonce_odr i1 @_CHasValue.Optional.Core.b88d1103f417c6d4(ptr %self) !dbg !19 {
-// CHECK:STDOUT:   %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %self, i32 0, i32 0, !dbg !21
-// CHECK:STDOUT:   %1 = load i1, ptr %has_value, align 1, !dbg !21
-// CHECK:STDOUT:   ret i1 %1, !dbg !22
+// CHECK:STDOUT: define linkonce_odr void @_CNone.Optional.Core.b88d1103f417c6d4(ptr sret({ i1, i32 }) %return) !dbg !44 {
+// CHECK:STDOUT:   %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %return, i32 0, i32 0, !dbg !45
+// CHECK:STDOUT:   store i1 false, ptr %has_value, align 1, !dbg !45
+// CHECK:STDOUT:   ret void, !dbg !46
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: define linkonce_odr i32 @_CGet.Optional.Core.b88d1103f417c6d4(ptr %self) !dbg !23 {
-// CHECK:STDOUT:   %value = getelementptr inbounds nuw { i1, i32 }, ptr %self, i32 0, i32 1, !dbg !24
-// CHECK:STDOUT:   %1 = load i32, ptr %value, align 4, !dbg !24
-// CHECK:STDOUT:   ret i32 %1, !dbg !25
+// CHECK:STDOUT: define linkonce_odr void @"_COp:thunk.Int.Core:AddAssignWith.Core.25a9a5e901f5b032"(ptr %self, i32 %other) !dbg !47 {
+// CHECK:STDOUT:   %1 = call i32 @"_CConvert.8b3d5d6a6c17be04:ImplicitAs.Core.b88d1103f417c6d4"(i32 %other), !dbg !48
+// CHECK:STDOUT:   %2 = load i32, ptr %self, align 4, !dbg !49
+// CHECK:STDOUT:   %3 = add i32 %2, %1, !dbg !49
+// CHECK:STDOUT:   store i32 %3, ptr %self, align 4, !dbg !49
+// CHECK:STDOUT:   ret void, !dbg !49
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: define linkonce_odr void @_CNone.Optional.Core.b88d1103f417c6d4(ptr sret({ i1, i32 }) %return) !dbg !26 {
-// CHECK:STDOUT:   %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %return, i32 0, i32 0, !dbg !27
-// CHECK:STDOUT:   store i1 false, ptr %has_value, align 1, !dbg !27
-// CHECK:STDOUT:   ret void, !dbg !28
+// CHECK:STDOUT: define linkonce_odr i32 @"_CConvert.8b3d5d6a6c17be04:ImplicitAs.Core.b88d1103f417c6d4"(i32 %self) !dbg !50 {
+// CHECK:STDOUT:   ret i32 %self, !dbg !52
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: ; uselistorder directives
-// CHECK:STDOUT: uselistorder ptr @llvm.lifetime.start.p0, { 2, 1, 0 }
+// CHECK:STDOUT: uselistorder ptr @llvm.lifetime.start.p0, { 0, 3, 2, 1 }
 // CHECK:STDOUT:
 // CHECK:STDOUT: attributes #0 = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) }
-// CHECK:STDOUT: attributes #1 = { nocallback nofree nounwind willreturn memory(argmem: readwrite) }
 // CHECK:STDOUT:
 // CHECK:STDOUT: !llvm.module.flags = !{!0, !1}
 // CHECK:STDOUT: !llvm.dbg.cu = !{!2}
@@ -120,28 +151,52 @@ fn For() {
 // CHECK:STDOUT: !1 = !{i32 2, !"Debug Info Version", i32 3}
 // CHECK:STDOUT: !2 = distinct !DICompileUnit(language: DW_LANG_C, file: !3, producer: "carbon", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
 // CHECK:STDOUT: !3 = !DIFile(filename: "for.carbon", directory: "")
-// CHECK:STDOUT: !4 = distinct !DISubprogram(name: "For", linkageName: "_CFor.Main", scope: null, file: !3, line: 26, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !4 = distinct !DISubprogram(name: "For", linkageName: "_CFor.Main", scope: null, file: !3, line: 17, type: !5, spFlags: DISPFlagDefinition, unit: !2)
 // CHECK:STDOUT: !5 = !DISubroutineType(types: !6)
 // CHECK:STDOUT: !6 = !{}
-// CHECK:STDOUT: !7 = !DILocation(line: 27, column: 3, scope: !4)
-// CHECK:STDOUT: !8 = !DILocation(line: 30, column: 7, scope: !4)
-// CHECK:STDOUT: !9 = !DILocation(line: 29, column: 3, scope: !4)
-// CHECK:STDOUT: !10 = !DILocation(line: 31, column: 5, scope: !4)
-// CHECK:STDOUT: !11 = !DILocation(line: 30, column: 3, scope: !4)
-// CHECK:STDOUT: !12 = !DILocation(line: 33, column: 3, scope: !4)
-// CHECK:STDOUT: !13 = !DILocation(line: 26, column: 1, scope: !4)
-// CHECK:STDOUT: !14 = distinct !DISubprogram(name: "NewCursor", linkageName: "_CNewCursor.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4", scope: null, file: !3, line: 13, type: !5, spFlags: DISPFlagDefinition, unit: !2)
-// CHECK:STDOUT: !15 = !DILocation(line: 14, column: 7, scope: !14)
-// CHECK:STDOUT: !16 = distinct !DISubprogram(name: "Next", linkageName: "_CNext.EmptyRange.Main:Iterate.Core.b88d1103f417c6d4", scope: null, file: !3, line: 16, type: !5, spFlags: DISPFlagDefinition, unit: !2)
-// CHECK:STDOUT: !17 = !DILocation(line: 17, column: 14, scope: !16)
-// CHECK:STDOUT: !18 = !DILocation(line: 17, column: 7, scope: !16)
-// CHECK:STDOUT: !19 = distinct !DISubprogram(name: "HasValue", linkageName: "_CHasValue.Optional.Core.b88d1103f417c6d4", scope: null, file: !20, line: 28, type: !5, spFlags: DISPFlagDefinition, unit: !2)
-// CHECK:STDOUT: !20 = !DIFile(filename: "{{.*}}/prelude/types/optional.carbon", directory: "")
-// CHECK:STDOUT: !21 = !DILocation(line: 28, column: 46, scope: !19)
-// CHECK:STDOUT: !22 = !DILocation(line: 28, column: 39, scope: !19)
-// CHECK:STDOUT: !23 = distinct !DISubprogram(name: "Get", linkageName: "_CGet.Optional.Core.b88d1103f417c6d4", scope: null, file: !20, line: 29, type: !5, spFlags: DISPFlagDefinition, unit: !2)
-// CHECK:STDOUT: !24 = !DILocation(line: 29, column: 38, scope: !23)
-// CHECK:STDOUT: !25 = !DILocation(line: 29, column: 31, scope: !23)
-// CHECK:STDOUT: !26 = distinct !DISubprogram(name: "None", linkageName: "_CNone.Optional.Core.b88d1103f417c6d4", scope: null, file: !20, line: 18, type: !5, spFlags: DISPFlagDefinition, unit: !2)
-// CHECK:STDOUT: !27 = !DILocation(line: 20, column: 5, scope: !26)
-// CHECK:STDOUT: !28 = !DILocation(line: 21, column: 5, scope: !26)
+// CHECK:STDOUT: !7 = !DILocation(line: 19, column: 18, scope: !4)
+// CHECK:STDOUT: !8 = !DILocation(line: 19, column: 7, scope: !4)
+// CHECK:STDOUT: !9 = !DILocation(line: 18, column: 3, scope: !4)
+// CHECK:STDOUT: !10 = !DILocation(line: 20, column: 5, scope: !4)
+// CHECK:STDOUT: !11 = !DILocation(line: 19, column: 3, scope: !4)
+// CHECK:STDOUT: !12 = !DILocation(line: 22, column: 3, scope: !4)
+// CHECK:STDOUT: !13 = !DILocation(line: 17, column: 1, scope: !4)
+// CHECK:STDOUT: !14 = distinct !DISubprogram(name: "NewCursor", linkageName: "_CNewCursor.IntRange.Core:Iterate.Core.be1e879c1ad406d8", scope: null, file: !15, line: 25, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !15 = !DIFile(filename: "{{.*}}/range.carbon", directory: "")
+// CHECK:STDOUT: !16 = !DILocation(line: 25, column: 51, scope: !14)
+// CHECK:STDOUT: !17 = !DILocation(line: 25, column: 44, scope: !14)
+// CHECK:STDOUT: !18 = distinct !DISubprogram(name: "Next", linkageName: "_CNext.IntRange.Core:Iterate.Core.be1e879c1ad406d8", scope: null, file: !15, line: 26, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !19 = !DILocation(line: 27, column: 7, scope: !18)
+// CHECK:STDOUT: !20 = !DILocation(line: 27, column: 27, scope: !18)
+// CHECK:STDOUT: !21 = !DILocation(line: 28, column: 19, scope: !18)
+// CHECK:STDOUT: !22 = !DILocation(line: 28, column: 11, scope: !18)
+// CHECK:STDOUT: !23 = !DILocation(line: 28, column: 10, scope: !18)
+// CHECK:STDOUT: !24 = !DILocation(line: 29, column: 9, scope: !18)
+// CHECK:STDOUT: !25 = !DILocation(line: 30, column: 38, scope: !18)
+// CHECK:STDOUT: !26 = !DILocation(line: 30, column: 16, scope: !18)
+// CHECK:STDOUT: !27 = !DILocation(line: 30, column: 9, scope: !18)
+// CHECK:STDOUT: !28 = !DILocation(line: 32, column: 16, scope: !18)
+// CHECK:STDOUT: !29 = !DILocation(line: 32, column: 9, scope: !18)
+// CHECK:STDOUT: !30 = distinct !DISubprogram(name: "HasValue", linkageName: "_CHasValue.Optional.Core.b88d1103f417c6d4", scope: null, file: !31, line: 28, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !31 = !DIFile(filename: "{{.*}}/prelude/types/optional.carbon", directory: "")
+// CHECK:STDOUT: !32 = !DILocation(line: 28, column: 46, scope: !30)
+// CHECK:STDOUT: !33 = !DILocation(line: 28, column: 39, scope: !30)
+// CHECK:STDOUT: !34 = distinct !DISubprogram(name: "Get", linkageName: "_CGet.Optional.Core.b88d1103f417c6d4", scope: null, file: !31, line: 29, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !35 = !DILocation(line: 29, column: 38, scope: !34)
+// CHECK:STDOUT: !36 = !DILocation(line: 29, column: 31, scope: !34)
+// CHECK:STDOUT: !37 = distinct !DISubprogram(name: "Op", linkageName: "_COp.Int.Core:Inc.Core.be1e879c1ad406d8", scope: null, file: !38, line: 331, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !38 = !DIFile(filename: "{{.*}}/prelude/types/int.carbon", directory: "")
+// CHECK:STDOUT: !39 = !DILocation(line: 333, column: 5, scope: !37)
+// CHECK:STDOUT: !40 = !DILocation(line: 331, column: 3, scope: !37)
+// CHECK:STDOUT: !41 = distinct !DISubprogram(name: "Some", linkageName: "_CSome.Optional.Core.b88d1103f417c6d4", scope: null, file: !31, line: 24, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !42 = !DILocation(line: 25, column: 12, scope: !41)
+// CHECK:STDOUT: !43 = !DILocation(line: 25, column: 5, scope: !41)
+// CHECK:STDOUT: !44 = distinct !DISubprogram(name: "None", linkageName: "_CNone.Optional.Core.b88d1103f417c6d4", scope: null, file: !31, line: 18, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !45 = !DILocation(line: 20, column: 5, scope: !44)
+// CHECK:STDOUT: !46 = !DILocation(line: 21, column: 5, scope: !44)
+// CHECK:STDOUT: !47 = distinct !DISubprogram(name: "Op", linkageName: "_COp:thunk.Int.Core:AddAssignWith.Core.25a9a5e901f5b032", scope: null, file: !38, line: 267, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !48 = !DILocation(line: 4294967295, scope: !47)
+// CHECK:STDOUT: !49 = !DILocation(line: 267, column: 3, scope: !47)
+// CHECK:STDOUT: !50 = distinct !DISubprogram(name: "Convert", linkageName: "_CConvert.8b3d5d6a6c17be04:ImplicitAs.Core.b88d1103f417c6d4", scope: null, file: !51, line: 18, type: !5, spFlags: DISPFlagDefinition, unit: !2)
+// CHECK:STDOUT: !51 = !DIFile(filename: "{{.*}}/prelude/operators/as.carbon", directory: "")
+// CHECK:STDOUT: !52 = !DILocation(line: 18, column: 38, scope: !50)