use cCallingConvention instead of .C in Sema
using `.C` in Sema is incorrect since it will be resolved under the target that Zig was compiled with, not the target build configuration. This is easily solved by just calling `cCallingConvention` on the target to resolve it.
This commit is contained in:
17
src/Sema.zig
17
src/Sema.zig
@@ -26619,6 +26619,7 @@ fn zirFuncFancy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
|
||||
|
||||
const pt = sema.pt;
|
||||
const zcu = pt.zcu;
|
||||
const ip = &zcu.intern_pool;
|
||||
const inst_data = sema.code.instructions.items(.data)[@intFromEnum(inst)].pl_node;
|
||||
const extra = sema.code.extraData(Zir.Inst.FuncFancy, inst_data.payload_index);
|
||||
const target = zcu.getTarget();
|
||||
@@ -26793,7 +26794,21 @@ fn zirFuncFancy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
|
||||
|
||||
const zir_decl = sema.code.getDeclaration(decl_inst.resolve(&zcu.intern_pool) orelse return error.AnalysisFail)[0];
|
||||
if (zir_decl.flags.is_export) {
|
||||
break :cc .C;
|
||||
break :cc target.cCallingConvention() orelse {
|
||||
// This target has no default C calling convention. We sometimes trigger a similar
|
||||
// error by trying to evaluate `std.builtin.CallingConvention.c`, so for consistency,
|
||||
// let's eval that now and just get the transitive error. (It's guaranteed to error
|
||||
// because it does the exact `cCallingConvention` call we just did.)
|
||||
const cc_type = try sema.getBuiltinType("CallingConvention");
|
||||
_ = try sema.namespaceLookupVal(
|
||||
block,
|
||||
LazySrcLoc.unneeded,
|
||||
cc_type.getNamespaceIndex(zcu),
|
||||
try ip.getOrPutString(sema.gpa, pt.tid, "c", .no_embedded_nulls),
|
||||
);
|
||||
// The above should have errored.
|
||||
@panic("std.builtin is corrupt");
|
||||
};
|
||||
}
|
||||
}
|
||||
break :cc .auto;
|
||||
|
||||
Reference in New Issue
Block a user