carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 20:21:21 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix initialization of a variable via an ImplicitAs conversion. (#6327)

Browse Source 
We used to generate initialization to a temporary instead, and leave the
variable uninitialized.
This commit is contained in:
Richard Smith
2025-11-05 21:05:34 +00:00
committed by GitHub
parent 8166f9a7cf
commit f2e98c2047
6 changed files with 162 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/convert.cpp
+4 -3
View File
@@ -1451,6 +1451,7 @@ auto Convert(Context& context, SemIR::LocId loc_id, SemIR::InstId expr_id,
if (expr_id == SemIR::ErrorInst::InstId) {
return expr_id;
}
bool performed_builtin_conversion = expr_id != orig_expr_id;
// Defer the action if it's dependent. We do this now rather than before
// attempting any conversion so that we can still perform builtin conversions
@@ -1552,10 +1553,10 @@ auto Convert(Context& context, SemIR::LocId loc_id, SemIR::InstId expr_id,
case SemIR::ExprCategory::Initializing:
if (target.is_initializer()) {
if (orig_expr_id == expr_id) {
if (!performed_builtin_conversion) {
// Don't fill in the return slot if we created the expression through
// a conversion. In that case, we will have created it with the
// target already set.
// a builtin conversion. In that case, we will have created it with
// the target already set.
// TODO: Find a better way to track whether we need to do this.
MarkInitializerFor(sem_ir, expr_id, target);
}