097d23d909
The generic-?? wrong-fallback was not in lowerNullCoalesce: coercing ?A -> ?B (differing payload, e.g. the ?i32->?i64 call-arg coercion when instantiating unwrap_or(99, ?i32)) routed through .optional_wrap, which unconditionally unwrapped the source and re-wrapped as ALWAYS-PRESENT, so a null became present-zero everywhere (args, returns, field init, var-decl, ??). Add a CoercionPlan.optional_to_optional (conversions.zig) + a presence-preserving arm in coerceMode (coerce.zig): has_value -> present: unwrap+coerce-child+wrap-present; absent: constNull(dst); merge via a dst_ty block param. lowerVarDecl gains a !src_is_optional guard so an annotated x : ?B = <?A> routes through the same arm (also makes aggregate-payload var-decl ?[3]i64->?[]i64 / ?Concrete->?Protocol work). Alias-optional struct-literal default already works (grouping + 0166); a 1-tuple default ?(i32,) ?? 5 now emits a clean diagnostic instead of an LLVM PHI abort (no implicit scalar->1-tuple coercion per spec). Regressions: optionals/0916 (generic ??), 0917 (alias struct default), 0918 (var-decl optional->optional), diagnostics/1202 (1-tuple default) + a conversions.test.zig unit test. Verified by 3 adversarial reviews, suite 798/0.
15 lines
586 B
Plaintext
15 lines
586 B
Plaintext
// `??` default whose type can't match a 1-tuple optional payload is a clean
|
|
// diagnostic, not an LLVM PHI-type crash.
|
|
//
|
|
// Regression (issue 0180): `?(i32,) ?? 5` built a merge PHI of `{i32}` (the
|
|
// unwrapped 1-tuple payload) vs `i32` (the scalar default) and aborted the
|
|
// LLVM verifier. There is no implicit scalar->1-tuple coercion (a 1-tuple
|
|
// value is written `(5,)`), so the mismatch is now reported at the default.
|
|
#import "modules/std.sx";
|
|
|
|
main :: () {
|
|
o : ?(i32,) = null;
|
|
x := o ?? 5; // default 'i64' vs payload '(i32,)' -> diagnostic
|
|
print("{}\n", x.0);
|
|
}
|