Commit 7c6981e0c0

Andrew Kelley <andrew@ziglang.org>
2022-01-19 19:56:01
stage2: fix ABI size of slice types to be 2 * ptr size
Previously it was returning 1 * ptr size.
master
1 parent 4e8fedf
Changed files (1)
src
type.zig
src/type.zig
@@ -2094,8 +2094,7 @@ pub const Type = extern union {
             .const_slice,
             .mut_slice,
             => {
-                if (self.elemType().hasCodeGenBits()) return @divExact(target.cpu.arch.ptrBitWidth(), 8) * 2;
-                return @divExact(target.cpu.arch.ptrBitWidth(), 8);
+                return @divExact(target.cpu.arch.ptrBitWidth(), 8) * 2;
             },
             .const_slice_u8,
             .const_slice_u8_sentinel_0,
@@ -2114,12 +2113,16 @@ pub const Type = extern union {
             .many_mut_pointer,
             .c_const_pointer,
             .c_mut_pointer,
-            .pointer,
             .manyptr_u8,
             .manyptr_const_u8,
             .manyptr_const_u8_sentinel_0,
             => return @divExact(target.cpu.arch.ptrBitWidth(), 8),
 
+            .pointer => switch (self.castTag(.pointer).?.data.size) {
+                .Slice => @divExact(target.cpu.arch.ptrBitWidth(), 8) * 2,
+                else => @divExact(target.cpu.arch.ptrBitWidth(), 8),
+            },
+
             .c_short => return @divExact(CType.short.sizeInBits(target), 8),
             .c_ushort => return @divExact(CType.ushort.sizeInBits(target), 8),
             .c_int => return @divExact(CType.int.sizeInBits(target), 8),
@@ -2276,13 +2279,8 @@ pub const Type = extern union {
 
             .const_slice,
             .mut_slice,
-            => {
-                if (ty.elemType().hasCodeGenBits()) {
-                    return target.cpu.arch.ptrBitWidth() * 2;
-                } else {
-                    return target.cpu.arch.ptrBitWidth();
-                }
-            },
+            => return target.cpu.arch.ptrBitWidth() * 2,
+
             .const_slice_u8,
             .const_slice_u8_sentinel_0,
             => target.cpu.arch.ptrBitWidth() * 2,
@@ -2303,7 +2301,6 @@ pub const Type = extern union {
             .many_mut_pointer,
             .c_const_pointer,
             .c_mut_pointer,
-            .pointer,
             => {
                 if (ty.elemType().hasCodeGenBits()) {
                     return target.cpu.arch.ptrBitWidth();
@@ -2312,6 +2309,11 @@ pub const Type = extern union {
                 }
             },
 
+            .pointer => switch (ty.castTag(.pointer).?.data.size) {
+                .Slice => target.cpu.arch.ptrBitWidth() * 2,
+                else => target.cpu.arch.ptrBitWidth(),
+            },
+
             .manyptr_u8,
             .manyptr_const_u8,
             .manyptr_const_u8_sentinel_0,