maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] Prevent possible infinte loop in parameter folding 

Original-commit: flang-compiler/f18@38360930ce
Reviewed-on: https://github.com/flang-compiler/f18/pull/469
Tree-same-pre-rewrite: false
This commit is contained in:
Jean Perier 2019-05-22 08:26:50 -07:00
parent 64a13fda35
commit 15630a4ddd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flang/lib/evaluate/fold.cc
View File

@ -806,6 +806,9 @@ static std::optional<Expr<T>> GetParameterValue(
auto converted{ConvertToType(*dyType, common::Clone(*init))};
semantics::ObjectEntityDetails *mutableObject{
const_cast<semantics::ObjectEntityDetails *>(object)};
// Reset expression now to prevent infinite loops if the init
// expression depends on symbol itself.
mutableObject->set_init(std::nullopt);
if (converted.has_value()) {
*converted = Fold(context, std::move(*converted));
auto *unwrapped{UnwrapExpr<Expr<T>>(*converted)};
@ -827,7 +830,6 @@ static std::optional<Expr<T>> GetParameterValue(
"Initialization expression for PARAMETER '%s' (%s) cannot be converted to its type (%s)"_err_en_US,
symbol->name(), ss.str(), dyType->AsFortran());
}
mutableObject->set_init(std::nullopt);
}
}
}