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

Avoid dereferencing a disengaged optional (#865)

Browse Source
This commit is contained in:
Geoff Romer
2021-10-01 19:23:46 -07:00
committed by GitHub
parent c37521fdc3
commit 52b09f099b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/type_checker.cpp
+3 -1
View File
@@ -992,7 +992,9 @@ auto TypeChecker::TypeCheckFunDef(FunctionDefinition* f, TypeEnv types,
&return_type_context);
body_stmt = res.stmt;
// Save the return type in case it changed.
return_type = *return_type_context.deduced_return_type();
if (return_type_context.deduced_return_type().has_value()) {
return_type = *return_type_context.deduced_return_type();
}
}
auto body = CheckOrEnsureReturn(body_stmt, f->is_omitted_return_type(),
f->source_loc());