diff --git a/src/Sema.zig b/src/Sema.zig
index 0d568f8b38..30cebe18b3 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -4272,7 +4272,8 @@ fn zirCompileLog(
     }
     try writer.print("\n", .{});
 
-    const gop = try sema.mod.compile_log_decls.getOrPut(sema.gpa, sema.owner_decl_index);
+    const decl_index = if (sema.func) |some| some.owner_decl else sema.owner_decl_index;
+    const gop = try sema.mod.compile_log_decls.getOrPut(sema.gpa, decl_index);
     if (!gop.found_existing) {
         gop.value_ptr.* = src_node;
     }
diff --git a/test/cases/compile_errors/stage1/obj/compile-time_division_by_zero.zig b/test/cases/compile_errors/compile-time_division_by_zero.zig
similarity index 58%
rename from test/cases/compile_errors/stage1/obj/compile-time_division_by_zero.zig
rename to test/cases/compile_errors/compile-time_division_by_zero.zig
index e16f5f8cf4..969598e500 100644
--- a/test/cases/compile_errors/stage1/obj/compile-time_division_by_zero.zig
+++ b/test/cases/compile_errors/compile-time_division_by_zero.zig
@@ -6,7 +6,7 @@ comptime {
 }
 
 // error
-// backend=stage1
+// backend=stage2
 // target=native
 //
-// tmp.zig:4:17: error: division by zero
+// :4:19: error: division by zero here causes undefined behavior
diff --git a/test/cases/compile_errors/stage1/obj/compile-time_remainder_division_by_zero.zig b/test/cases/compile_errors/compile-time_remainder_division_by_zero.zig
similarity index 58%
rename from test/cases/compile_errors/stage1/obj/compile-time_remainder_division_by_zero.zig
rename to test/cases/compile_errors/compile-time_remainder_division_by_zero.zig
index 63f0def52c..301fad6a68 100644
--- a/test/cases/compile_errors/stage1/obj/compile-time_remainder_division_by_zero.zig
+++ b/test/cases/compile_errors/compile-time_remainder_division_by_zero.zig
@@ -6,7 +6,7 @@ comptime {
 }
 
 // error
-// backend=stage1
+// backend=stage2
 // target=native
 //
-// tmp.zig:4:17: error: division by zero
+// :4:19: error: division by zero here causes undefined behavior
diff --git a/test/cases/compile_errors/stage1/obj/compileLog_of_tagged_enum_doesnt_crash_the_compiler.zig b/test/cases/compile_errors/compileLog_of_tagged_enum_doesnt_crash_the_compiler.zig
similarity index 66%
rename from test/cases/compile_errors/stage1/obj/compileLog_of_tagged_enum_doesnt_crash_the_compiler.zig
rename to test/cases/compile_errors/compileLog_of_tagged_enum_doesnt_crash_the_compiler.zig
index 36e1ee1118..9189eeb48d 100644
--- a/test/cases/compile_errors/stage1/obj/compileLog_of_tagged_enum_doesnt_crash_the_compiler.zig
+++ b/test/cases/compile_errors/compileLog_of_tagged_enum_doesnt_crash_the_compiler.zig
@@ -6,12 +6,12 @@ fn testCompileLog(x: Bar) void {
     @compileLog(x);
 }
 
-pub fn main () void {
+pub export fn entry() void {
     comptime testCompileLog(Bar{.X = 123});
 }
 
 // error
-// backend=stage1
+// backend=stage2
 // target=native
 //
-// tmp.zig:6:5: error: found compile log statement
+// :6:5: error: found compile log statement
diff --git a/test/cases/compile_errors/stage1/obj/compile_log.zig b/test/cases/compile_errors/compile_log.zig
similarity index 54%
rename from test/cases/compile_errors/stage1/obj/compile_log.zig
rename to test/cases/compile_errors/compile_log.zig
index 7f5d522407..281f8747d2 100644
--- a/test/cases/compile_errors/stage1/obj/compile_log.zig
+++ b/test/cases/compile_errors/compile_log.zig
@@ -8,9 +8,7 @@ fn bar(a: i32, b: []const u8) void {
 }
 
 // error
-// backend=stage1
+// backend=llvm
 // target=native
 //
-// tmp.zig:5:5: error: found compile log statement
-// tmp.zig:6:5: error: found compile log statement
-// tmp.zig:7:5: error: found compile log statement
+// :5:5: error: found compile log statement
diff --git a/test/cases/compile_errors/stage1/obj/compile_log_statement_inside_function_which_must_be_comptime_evaluated.zig b/test/cases/compile_errors/compile_log_statement_inside_function_which_must_be_comptime_evaluated.zig
similarity index 72%
rename from test/cases/compile_errors/stage1/obj/compile_log_statement_inside_function_which_must_be_comptime_evaluated.zig
rename to test/cases/compile_errors/compile_log_statement_inside_function_which_must_be_comptime_evaluated.zig
index 19b96048cb..0bc45eae0a 100644
--- a/test/cases/compile_errors/stage1/obj/compile_log_statement_inside_function_which_must_be_comptime_evaluated.zig
+++ b/test/cases/compile_errors/compile_log_statement_inside_function_which_must_be_comptime_evaluated.zig
@@ -8,7 +8,7 @@ export fn entry() void {
 }
 
 // error
-// backend=stage1
+// backend=stage2
 // target=native
 //
-// tmp.zig:2:5: error: found compile log statement
+// :2:5: error: found compile log statement
diff --git a/test/cases/compile_errors/stage1/obj/compile_time_division_by_zero.zig b/test/cases/compile_errors/compile_time_division_by_zero.zig
similarity index 56%
rename from test/cases/compile_errors/stage1/obj/compile_time_division_by_zero.zig
rename to test/cases/compile_errors/compile_time_division_by_zero.zig
index 7f7e168f02..281ccf28a1 100644
--- a/test/cases/compile_errors/stage1/obj/compile_time_division_by_zero.zig
+++ b/test/cases/compile_errors/compile_time_division_by_zero.zig
@@ -6,7 +6,8 @@ fn foo(x: u32) u32 {
 export fn entry() usize { return @sizeOf(@TypeOf(y)); }
 
 // error
-// backend=stage1
+// backend=llvm
 // target=native
 //
-// tmp.zig:3:14: error: division by zero
+// :3:16: error: division by zero here causes undefined behavior
+// :1:14: note: called from here