| ... | @@ -1042,7 +1042,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node | ... | @@ -1042,7 +1042,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node |
| 1042 | | 1042 | |
| 1043 | for (positionals.items) |obj| { | 1043 | for (positionals.items) |obj| { |
| 1044 | self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) { | 1044 | self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) { |
| 1045 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported | 1045 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported |
| 1046 | else => |e| try self.reportParseError( | 1046 | else => |e| try self.reportParseError( |
| 1047 | obj.path, | 1047 | obj.path, |
| 1048 | "unexpected error: parsing input file failed with error {s}", | 1048 | "unexpected error: parsing input file failed with error {s}", |
| ... | @@ -1128,7 +1128,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node | ... | @@ -1128,7 +1128,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node |
| 1128 | | 1128 | |
| 1129 | for (system_libs.items) |lib| { | 1129 | for (system_libs.items) |lib| { |
| 1130 | self.parseLibrary(lib, false) catch |err| switch (err) { | 1130 | self.parseLibrary(lib, false) catch |err| switch (err) { |
| 1131 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported | 1131 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported |
| 1132 | else => |e| try self.reportParseError( | 1132 | else => |e| try self.reportParseError( |
| 1133 | lib.path, | 1133 | lib.path, |
| 1134 | "unexpected error: parsing library failed with error {s}", | 1134 | "unexpected error: parsing library failed with error {s}", |
| ... | @@ -1151,7 +1151,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node | ... | @@ -1151,7 +1151,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node |
| 1151 | | 1151 | |
| 1152 | for (positionals.items) |obj| { | 1152 | for (positionals.items) |obj| { |
| 1153 | self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) { | 1153 | self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) { |
| 1154 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported | 1154 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported |
| 1155 | else => |e| try self.reportParseError( | 1155 | else => |e| try self.reportParseError( |
| 1156 | obj.path, | 1156 | obj.path, |
| 1157 | "unexpected error: parsing input file failed with error {s}", | 1157 | "unexpected error: parsing input file failed with error {s}", |
| ... | @@ -1316,7 +1316,7 @@ pub fn flushStaticLib(self: *Elf, comp: *Compilation, module_obj_path: ?[]const | ... | @@ -1316,7 +1316,7 @@ pub fn flushStaticLib(self: *Elf, comp: *Compilation, module_obj_path: ?[]const |
| 1316 | | 1316 | |
| 1317 | for (positionals.items) |obj| { | 1317 | for (positionals.items) |obj| { |
| 1318 | self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) { | 1318 | self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) { |
| 1319 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported | 1319 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported |
| 1320 | else => |e| try self.reportParseError( | 1320 | else => |e| try self.reportParseError( |
| 1321 | obj.path, | 1321 | obj.path, |
| 1322 | "unexpected error: parsing input file failed with error {s}", | 1322 | "unexpected error: parsing input file failed with error {s}", |
| ... | @@ -1453,7 +1453,7 @@ pub fn flushObject(self: *Elf, comp: *Compilation, module_obj_path: ?[]const u8) | ... | @@ -1453,7 +1453,7 @@ pub fn flushObject(self: *Elf, comp: *Compilation, module_obj_path: ?[]const u8) |
| 1453 | | 1453 | |
| 1454 | for (positionals.items) |obj| { | 1454 | for (positionals.items) |obj| { |
| 1455 | self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) { | 1455 | self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) { |
| 1456 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported | 1456 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported |
| 1457 | else => |e| try self.reportParseError( | 1457 | else => |e| try self.reportParseError( |
| 1458 | obj.path, | 1458 | obj.path, |
| 1459 | "unexpected error: parsing input file failed with error {s}", | 1459 | "unexpected error: parsing input file failed with error {s}", |
| ... | @@ -1959,7 +1959,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void { | ... | @@ -1959,7 +1959,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void { |
| 1959 | .needed = scr_obj.needed, | 1959 | .needed = scr_obj.needed, |
| 1960 | .path = full_path, | 1960 | .path = full_path, |
| 1961 | }, false) catch |err| switch (err) { | 1961 | }, false) catch |err| switch (err) { |
| 1962 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported | 1962 | error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => continue, // already reported |
| 1963 | else => |e| try self.reportParseError( | 1963 | else => |e| try self.reportParseError( |
| 1964 | full_path, | 1964 | full_path, |
| 1965 | "unexpected error: parsing library failed with error {s}", | 1965 | "unexpected error: parsing library failed with error {s}", |
Jakub Konka <kubkon@jakubkonka.com> 2023-12-05 14:54:03+01:00