diff options
author | Robin Burchell <robin.burchell@viroteck.net> | 2016-12-02 20:48:47 +0100 |
---|---|---|
committer | Robin Burchell <robin.burchell@viroteck.net> | 2016-12-05 10:27:02 +0000 |
commit | f7d2f276ecc1d88fd050afb1bb674cc295af21aa (patch) | |
tree | f8363d48aafb1b75dc2c3fbb998115bc491ad053 /src/qml/compiler/qqmltypecompiler.cpp | |
parent | f2a9579375bf5ae6f70747b9209082e504a16397 (diff) |
Remove unnecessary tests
_canSimplify is only set during accept(), so the additional tests do not seem to
have any purpose.
Change-Id: I0ee337c1457ec89940d1351eecd17cbfbfc7ff83
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler.cpp')
-rw-r--r-- | src/qml/compiler/qqmltypecompiler.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp index 2308e66609..393616dfac 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/compiler/qqmltypecompiler.cpp @@ -1570,19 +1570,15 @@ bool QQmlJavaScriptBindingExpressionSimplificationPass::simplifyBinding(QV4::IR: if (!_canSimplify) return false; } - if (!_canSimplify) - return false; } if (_returnValueOfBindingExpression == -1) return false; - if (_canSimplify) { - if (_nameOfFunctionCalled) { - if (_functionCallReturnValue != _returnValueOfBindingExpression) - return false; - return detectTranslationCallAndConvertBinding(binding); - } + if (_nameOfFunctionCalled) { + if (_functionCallReturnValue != _returnValueOfBindingExpression) + return false; + return detectTranslationCallAndConvertBinding(binding); } return false; |