From 96d22b00a402686a0fb8a45f907a9dc78f3d5f2e Mon Sep 17 00:00:00 2001
From: David Gonzalez Martin <davidgmbb@gmail.com>
Date: Mon, 3 Mar 2025 07:00:19 -0600
Subject: [PATCH] Fix debug info with type 'bits'

---
 src/converter.zig | 18 +++++++++++-------
 src/main.zig      |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/converter.zig b/src/converter.zig
index d4fa20d..984e0ce 100644
--- a/src/converter.zig
+++ b/src/converter.zig
@@ -1339,6 +1339,11 @@ const Converter = struct {
                             } else {
                                 // TODO: take ABI into account
                                 const return_value = converter.parse_value(module, current_function_global.value.type.bb.function.semantic_return_type, .value);
+
+                                if (module.llvm.di_builder) |_| {
+                                    module.llvm.builder.set_current_debug_location(statement_debug_location);
+                                }
+
                                 switch (current_function_type.return_type_abi.kind) {
                                     .direct => {
                                         module.llvm.builder.create_ret(return_value.llvm);
@@ -3603,13 +3608,14 @@ pub noinline fn convert(arena: *Arena, options: ConvertOptions) void {
                             };
 
                             const field_bit_size = field_type.get_bit_size();
-                            field_bit_offset += field_bit_size;
 
                             if (module.llvm.di_builder) |di_builder| {
                                 const member_type = di_builder.create_bit_field_member_type(module.llvm.global_scope, field_name, module.llvm.file, field_line, field_bit_size, field_bit_offset, 0, .{}, backing_type.llvm.debug);
                                 llvm_debug_field_buffer[field_count] = member_type;
                             }
 
+                            field_bit_offset += field_bit_size;
+
                             converter.skip_space();
 
                             _ = converter.consume_character_if_match(',');
@@ -3692,7 +3698,6 @@ pub noinline fn convert(arena: *Arena, options: ConvertOptions) void {
         di_builder.finalize();
     }
 
-    // if (lib.optimization_mode == .Debug) {
     const verify_result = module.llvm.handle.verify();
     if (!verify_result.success) {
         lib.print_string(module.llvm.handle.to_string());
@@ -3701,11 +3706,10 @@ pub noinline fn convert(arena: *Arena, options: ConvertOptions) void {
         os.abort();
     }
 
-    // if (!lib.is_test) {
-    //     const module_string = module.llvm.handle.to_string();
-    //     lib.print_string_stderr(module_string);
-    // }
-    // }
+    if (!lib.is_test) {
+        const module_string = module.llvm.handle.to_string();
+        lib.print_string_stderr(module_string);
+    }
 
     var error_message: llvm.String = undefined;
     const target_machine = llvm.Target.Machine.create(.{
diff --git a/src/main.zig b/src/main.zig
index 57bc590..d8b79d0 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -31,7 +31,7 @@ pub fn main(argc: c_int, argv: [*:null]const ?[*:0]const u8) callconv(.C) c_int
     const arena = lib.global.arena;
 
     const build_dir = "bb-cache";
-    const output_path_base = arena.join_string(&.{ build_dir, "/", base_name, "_", @tagName(lib.optimization_mode) });
+    const output_path_base = arena.join_string(&.{ build_dir, "/", base_name });
     const output_object_path = arena.join_string(&.{ output_path_base, ".o" });
     const output_executable_path = output_path_base;