Commit 4b667e736201d9fbe2e440863ce1e631a2d3b4e7 | zig

author	Andrew Kelley <andrew@ziglang.org> 2023-12-18 18:17:45-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-01-01 17:51:20-07:00
log	4b667e736201d9fbe2e440863ce1e631a2d3b4e7
tree	ec54cabd14be4a9767077ff044485a0bba51d375
parent	fe87bae7e39657c96015aa7f3c7a35a0b01da1ad

fix compilations without zig compilation units

2 files changed, 46 insertions(+), 42 deletions(-)

src
- Compilation.zig
- main.zig

src/Compilation.zig+1-1

...	@@ -1180,7 +1180,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {	...	@@ -1180,7 +1180,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1180	return error.ExportTableAndImportTableConflict;	1180	return error.ExportTableAndImportTableConflict;
1181	}	1181	}
1182		1182
1183	const have_zcu = options.root_mod.root_src_path.len != 0;	1183	const have_zcu = options.config.have_zcu;
1184		1184
1185	const comp: *Compilation = comp: {	1185	const comp: *Compilation = comp: {
1186	// For allocations that have the same lifetime as Compilation. This	1186	// For allocations that have the same lifetime as Compilation. This

src/main.zig+45-41

 @@ -2515,21 +2515,48 @@ fn buildOutputType(
         // Without this, there will be no main module created and no zig
         // compilation unit, and therefore also no builtin.zig contents
         // created.
-        root_src_file = "dummy.zig";
+        root_src_file = "builtin.zig";
     }
-    if (root_src_file) |unresolved_src_path| {
+    implicit_root_mod: {
-        if (create_module.modules.count() != 0) {
+        const unresolved_src_path = b: {
-            fatal("main module provided both by '--mod {s} {}{s}' and by positional argument '{s}'", .{
+            if (root_src_file) |src_path| {
-                create_module.modules.keys()[0],
+                if (create_module.modules.count() != 0) {
-                create_module.modules.values()[0].paths.root,
+                    fatal("main module provided both by '--mod {s} {}{s}' and by positional argument '{s}'", .{
-                create_module.modules.values()[0].paths.root_src_path,
+                        create_module.modules.keys()[0],
-                unresolved_src_path,
+                        create_module.modules.values()[0].paths.root,
-            });
+                        create_module.modules.values()[0].paths.root_src_path,
-        }
+                        src_path,
+                    });
+                }
+                create_module.opts.have_zcu = true;
+                break :b src_path;
+            }
+            if (create_module.modules.count() != 0)
+                break :implicit_root_mod;
+            if (create_module.c_source_files.items.len >= 1)
+                break :b create_module.c_source_files.items[0].src_path;
+            if (link_objects.items.len >= 1)
+                break :b link_objects.items[0].path;
+            if (emit_bin == .yes)
+                break :b emit_bin.yes;
+            if (create_module.rc_source_files.items.len >= 1)
+                break :b create_module.rc_source_files.items[0].src_path;
+            if (arg_mode == .run)
+                fatal("`zig run` expects at least one positional argument", .{});
+            fatal("expected a positional argument, -femit-bin=[path], --show-builtin, or --name [name]", .{});
+            break :implicit_root_mod;
+        };
         // See duplicate logic: ModCreationGlobalFlags
-        create_module.opts.have_zcu = true;
         if (mod_opts.single_threaded == false)
             create_module.opts.any_non_single_threaded = true;
         if (mod_opts.sanitize_thread == true)
 @@ -2542,7 +2569,12 @@ fn buildOutputType(
             create_module.opts.any_error_tracing = true;
         const src_path = try introspect.resolvePath(arena, unresolved_src_path);
-        try create_module.modules.put(arena, "main", .{
+        const name = if (arg_mode == .zig_test)
+            "test"
+        else
+            fs.path.stem(fs.path.basename(src_path));
+        try create_module.modules.put(arena, name, .{
             .paths = .{
                 .root = .{
                     .root_dir = Cache.Directory.cwd(),
 @@ -2718,35 +2750,7 @@ fn buildOutputType(
         }
     }
-    const root_name = if (provided_name) |n| n else blk: {
+    const root_name = if (provided_name) |n| n else main_mod.fully_qualified_name;
-        if (arg_mode == .zig_test) {
-            break :blk "test";
-        } else if (root_src_file) |file| {
-            const basename = fs.path.basename(file);
-            break :blk basename[0 .. basename.len - fs.path.extension(basename).len];
-        } else if (create_module.c_source_files.items.len >= 1) {
-            const basename = fs.path.basename(create_module.c_source_files.items[0].src_path);
-            break :blk basename[0 .. basename.len - fs.path.extension(basename).len];
-        } else if (link_objects.items.len >= 1) {
-            const basename = fs.path.basename(link_objects.items[0].path);
-            break :blk basename[0 .. basename.len - fs.path.extension(basename).len];
-        } else if (emit_bin == .yes) {
-            const basename = fs.path.basename(emit_bin.yes);
-            break :blk basename[0 .. basename.len - fs.path.extension(basename).len];
-        } else if (create_module.rc_source_files.items.len >= 1) {
-            const basename = fs.path.basename(create_module.rc_source_files.items[0].src_path);
-            break :blk basename[0 .. basename.len - fs.path.extension(basename).len];
-        } else if (show_builtin) {
-            break :blk "builtin";
-        } else if (arg_mode == .run) {
-            fatal("`zig run` expects at least one positional argument", .{});
-            // TODO once the attempt to unwrap error: LinkingWithoutZigSourceUnimplemented
-            // is solved, remove the above fatal() and uncomment the `break` below.
-            //break :blk "run";
-        } else {
-            fatal("expected a positional argument, -femit-bin=[path], --show-builtin, or --name [name]", .{});
-        }
-    };
     // Resolve the library path arguments with respect to sysroot.
     var lib_dirs: std.ArrayListUnmanaged([]const u8) = .{};