qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use cx results in loops with conditions 

This folds the jumps generated by e.g. && and || expressions directly
into the jump to the start/end of the loop.

Change-Id: I53f8cb6eb6b995b7418b57ada59c17d3a556935a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Erik Verbruggen 2017-06-14 14:36:38 +02:00 committed by Lars Knoll
parent eb2c4b5cff
commit 15f11ab322
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qml/compiler/qv4codegen.cpp
View File

@ -2652,8 +2652,7 @@ bool Codegen::visit(DoWhileStatement *ast)
statement(ast->statement);
cond.link();
Reference r = expression(ast->expression);
bytecodeGenerator->jumpEq(r.asRValue()).link(body);
condition(ast->expression, &body, &end, false);
end.link();
leaveLoop();
@ -2742,18 +2741,18 @@ bool Codegen::visit(ForStatement *ast)
statement(ast->initialiser);
Moth::BytecodeGenerator::Label cond = bytecodeGenerator->label();
Moth::BytecodeGenerator::Label body = bytecodeGenerator->newLabel();
Moth::BytecodeGenerator::Label step = bytecodeGenerator->newLabel();
Moth::BytecodeGenerator::Label end = bytecodeGenerator->newLabel();
enterLoop(ast, &end, &step);
Reference r = expression(ast->condition);
bytecodeGenerator->jumpNe(r.asRValue()).link(end);
condition(ast->condition, &body, &end, true);
body.link();
statement(ast->statement);
step.link();
statement(ast->expression);
bytecodeGenerator->jump().link(cond);
end.link();
@ -2881,18 +2880,18 @@ bool Codegen::visit(LocalForStatement *ast)
variableDeclarationList(ast->declarations);
Moth::BytecodeGenerator::Label cond = bytecodeGenerator->label();
Moth::BytecodeGenerator::Label body = bytecodeGenerator->newLabel();
Moth::BytecodeGenerator::Label step = bytecodeGenerator->newLabel();
Moth::BytecodeGenerator::Label end = bytecodeGenerator->newLabel();
enterLoop(ast, &end, &step);
Reference r = expression(ast->condition);
bytecodeGenerator->jumpNe(r.asRValue()).link(end);
condition(ast->condition, &body, &end, true);
body.link();
statement(ast->statement);
step.link();
statement(ast->expression);
bytecodeGenerator->jump().link(cond);
end.link();
@ -3164,20 +3163,19 @@ bool Codegen::visit(WhileStatement *ast)
if (hasError)
return true;
Moth::BytecodeGenerator::Label start = bytecodeGenerator->newLabel();
Moth::BytecodeGenerator::Label end = bytecodeGenerator->newLabel();
Moth::BytecodeGenerator::Label cond = bytecodeGenerator->label();
enterLoop(ast, &end, &cond);
Reference r = expression(ast->expression);
Moth::BytecodeGenerator::Jump jump_end = bytecodeGenerator->jumpNe(r.asRValue());
condition(ast->expression, &start, &end, true);
start.link();
statement(ast->statement);
bytecodeGenerator->jump().link(cond);
leaveLoop();
end.link();
jump_end.link();
return false;
}