diff --git a/src/codegen/s390x/abi.zig b/src/codegen/s390x/abi.zig index f8c7864a4a313f54085b357a93f6d943ab72524e..2c3051ffc3139a314cedadf9ec98027d846a7dd3 100644 --- a/src/codegen/s390x/abi.zig +++ b/src/codegen/s390x/abi.zig @@ -45,14 +45,7 @@ pub fn classifyType(ty: Type, context: Context, zcu: *Zcu) Class { 128 => return .pointer, }, .pointer, .optional => return .simple, - .array => switch (ty.arrayLenIncludingSentinel(zcu)) { - 0 => return .none, - 1 => switch (context) { - .ret => {}, - .arg => return classifyType(ty.childType(zcu), context, zcu), - }, - else => {}, - }, + .array => {}, .@"struct", .@"union" => |tag| switch (ty.containerLayout(zcu)) { .auto => unreachable, .@"extern" => switch (context) { diff --git a/test/c_abi/main.zig b/test/c_abi/main.zig index 53e3890f31fa28014d84fc96012d21dbda3699dd..a481a015117276e8abf7c4393f6d85cf60dd20fb 100644 --- a/test/c_abi/main.zig +++ b/test/c_abi/main.zig @@ -16153,7 +16153,6 @@ test "struct [1]f32" { if (builtin.cpu.arch.isMIPS64()) return error.SkipZigTest; if (builtin.cpu.arch.isPowerPC()) return error.SkipZigTest; if (builtin.cpu.arch.isRISCV()) return error.SkipZigTest; - if (builtin.cpu.arch == .s390x) return error.SkipZigTest; const s = c_ret_struct_array_1_f32(); try expect(s.a[0] == 4); @@ -16321,7 +16320,6 @@ test "struct [0:sentinel]f32" { if (builtin.cpu.arch.isMIPS64()) return error.SkipZigTest; if (builtin.cpu.arch.isPowerPC()) return error.SkipZigTest; if (builtin.cpu.arch.isRISCV()) return error.SkipZigTest; - if (builtin.cpu.arch == .s390x) return error.SkipZigTest; var sentinel_index: usize = 0; _ = &sentinel_index; @@ -16802,7 +16800,6 @@ test "struct [1]f64" { if (builtin.cpu.arch.isMIPS64()) return error.SkipZigTest; if (builtin.cpu.arch.isPowerPC()) return error.SkipZigTest; if (builtin.cpu.arch.isRISCV()) return error.SkipZigTest; - if (builtin.cpu.arch == .s390x) return error.SkipZigTest; const s = c_ret_struct_array_1_f64(); try expect(s.a[0] == 4);