Merge remote-tracking branch 'origin/master' into asmjit

This commit is contained in:
Magnus Norddahl 2018-10-07 06:32:13 +02:00
commit c5a5265e40
126 changed files with 16445 additions and 12869 deletions

View file

@ -10291,9 +10291,14 @@ FxWhileLoop::~FxWhileLoop()
FxExpression *FxWhileLoop::DoResolve(FCompileContext &ctx)
{
CHECKRESOLVED();
SAFE_RESOLVE(Condition, ctx);
SAFE_RESOLVE_OPT(Condition, ctx);
SAFE_RESOLVE_OPT(Code, ctx);
if (Condition == nullptr)
{
Condition = new FxConstant(true, ScriptPosition);
}
if (Condition->ValueType != TypeBool)
{
Condition = new FxBoolCast(Condition);