authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-08-29 18:19:39-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-08-29 18:19:39-07:00
logbf28765a975355c27558eaa86cf00ccb29b663a7
tree0088a79455f3b2077e54621ec821b437e6f5c734
parentf52ee1607ab6e055e7e3225ca521a75f7e208364

LLVM: upgrade byval attr code to LLVM 15 opaque pointers

Follow-up from 74673b7f69b27dc39a653f92eb58bba71e289f39.

1 files changed, 12 insertions(+), 11 deletions(-)

src/codegen/llvm.zig+12-11
......@@ -797,6 +797,7 @@ pub const Object = struct {
797797 const param_ty = fn_info.param_types[it.zig_index - 1];
798798 const param = llvm_func.getParam(llvm_arg_i);
799799 try args.ensureUnusedCapacity(1);
800 assert(!it.byval_attr);
800801
801802 if (isByRef(param_ty)) {
802803 const alignment = param_ty.abiAlignment(target);
......@@ -840,11 +841,16 @@ pub const Object = struct {
840841 },
841842 .byref => {
842843 const param_ty = fn_info.param_types[it.zig_index - 1];
844 const param_llvm_ty = try dg.lowerType(param_ty);
843845 const param = llvm_func.getParam(llvm_arg_i);
846 const alignment = param_ty.abiAlignment(target);
844847
845848 dg.addArgAttr(llvm_func, llvm_arg_i, "nonnull");
846849 dg.addArgAttr(llvm_func, llvm_arg_i, "readonly");
847 dg.addArgAttrInt(llvm_func, llvm_arg_i, "align", param_ty.abiAlignment(target));
850 dg.addArgAttrInt(llvm_func, llvm_arg_i, "align", alignment);
851 if (it.byval_attr) {
852 llvm_func.addByValAttr(llvm_arg_i, param_llvm_ty);
853 }
848854
849855 llvm_arg_i += 1;
850856
......@@ -853,14 +859,13 @@ pub const Object = struct {
853859 if (isByRef(param_ty)) {
854860 args.appendAssumeCapacity(param);
855861 } else {
856 const alignment = param_ty.abiAlignment(target);
857 const param_llvm_ty = try dg.lowerType(param_ty);
858862 const load_inst = builder.buildLoad(param_llvm_ty, param, "");
859863 load_inst.setAlignment(alignment);
860864 args.appendAssumeCapacity(load_inst);
861865 }
862866 },
863867 .abi_sized_int => {
868 assert(!it.byval_attr);
864869 const param_ty = fn_info.param_types[it.zig_index - 1];
865870 const param = llvm_func.getParam(llvm_arg_i);
866871 llvm_arg_i += 1;
......@@ -890,6 +895,7 @@ pub const Object = struct {
890895 }
891896 },
892897 .slice => {
898 assert(!it.byval_attr);
893899 const param_ty = fn_info.param_types[it.zig_index - 1];
894900 const ptr_info = param_ty.ptrInfo().data;
895901
......@@ -919,6 +925,7 @@ pub const Object = struct {
919925 try args.append(aggregate);
920926 },
921927 .multiple_llvm_ints => {
928 assert(!it.byval_attr);
922929 const llvm_ints = it.llvm_types_buffer[0..it.llvm_types_len];
923930 const param_ty = fn_info.param_types[it.zig_index - 1];
924931 const param_llvm_ty = try dg.lowerType(param_ty);
......@@ -949,6 +956,7 @@ pub const Object = struct {
949956 try args.append(loaded);
950957 },
951958 .multiple_llvm_float => {
959 assert(!it.byval_attr);
952960 const llvm_floats = it.llvm_types_buffer[0..it.llvm_types_len];
953961 const param_ty = fn_info.param_types[it.zig_index - 1];
954962 const param_llvm_ty = try dg.lowerType(param_ty);
......@@ -983,6 +991,7 @@ pub const Object = struct {
983991 try args.append(loaded);
984992 },
985993 .as_u16 => {
994 assert(!it.byval_attr);
986995 const param = llvm_func.getParam(llvm_arg_i);
987996 llvm_arg_i += 1;
988997 const casted = builder.buildBitCast(param, dg.context.halfType(), "");
......@@ -2406,14 +2415,6 @@ pub const DeclGen = struct {
24062415 dg.addFnAttr(llvm_fn, "noreturn");
24072416 }
24082417
2409 var llvm_arg_i = @as(c_uint, @boolToInt(sret)) + @boolToInt(err_return_tracing);
2410 var it = iterateParamTypes(dg, fn_info);
2411 while (it.next()) |_| : (llvm_arg_i += 1) {
2412 if (!it.byval_attr) continue;
2413 const param = llvm_fn.getParam(llvm_arg_i);
2414 llvm_fn.addByValAttr(llvm_arg_i, param.typeOf().getElementType());
2415 }
2416
24172418 return llvm_fn;
24182419 }
24192420