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

Convert returned associated constants. (#3029)

Browse Source 
Associated constants were getting returned directly, crashing because
the value InterpProgram received was an AssociatedConstant instead of an
IntValue. We have a similar Convert call in ReturnVar, so I _think_ this
is the right approach.
This commit is contained in:
Jon Ross-Perkins
2023-07-26 21:30:28 +00:00
committed by GitHub
parent c4b880c6ef
commit bbf896e165
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/interpreter/interpreter.cpp
+7 -3
View File
@@ -2526,12 +2526,16 @@ auto Interpreter::StepStmt() -> ErrorOr<Success> {
// { {v :: return [] :: C, E, F} :: {C', E', F'} :: S, H}
// -> { {v :: C', E', F'} :: S, H}
const CallableDeclaration& function = cast<Return>(stmt).function();
CARBON_ASSIGN_OR_RETURN(
Nonnull<const Value*> return_value,
Convert(act.results()[0], &function.return_term().static_type(),
stmt.source_loc()));
// Write to initialized storage location, if any.
if (const auto location = act.location_received()) {
CARBON_RETURN_IF_ERROR(heap_.Write(
Address(*location), act.results()[0], stmt.source_loc()));
CARBON_RETURN_IF_ERROR(
heap_.Write(Address(*location), return_value, stmt.source_loc()));
}
return todo_.UnwindPast(*function.body(), act.results()[0]);
return todo_.UnwindPast(*function.body(), return_value);
}
}
}