Allow for function declarations inside conditionals

This is strictly speaking a regression from 5.1/v8, which allows for that
as real world JavaScript appears to require it.

Task-number: QTBUG-33064
Change-Id: Iceaca84373f12fb08459ed007afb25b5a705fa31
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

2 files changed, 0 insertions, 32 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index 4f9815826b..b3eba3c84b 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -71,7 +71,6 @@ Codegen::ScanFunctions::ScanFunctions(Codegen *cg, const QString &sourceCode)
     : _cg(cg)
     , _sourceCode(sourceCode)
     , _env(0)
-    , _inFuncBody(false)
     , _allowFuncDecls(true)
 {
 }
@@ -298,13 +297,6 @@ void Codegen::ScanFunctions::endVisit(FunctionDeclaration *)
     leaveEnvironment();
 }
 
-bool Codegen::ScanFunctions::visit(FunctionBody *ast)
-{
-    TemporaryBoolAssignment inFuncBody(_inFuncBody, true);
-    Node::accept(ast->elements, this);
-    return false;
-}
-
 bool Codegen::ScanFunctions::visit(WithStatement *ast)
 {
     if (_env->isStrict) {
@@ -315,25 +307,6 @@ bool Codegen::ScanFunctions::visit(WithStatement *ast)
     return true;
 }
 
-bool Codegen::ScanFunctions::visit(IfStatement *ast) {
-    Node::accept(ast->expression, this);
-
-    TemporaryBoolAssignment allowFuncDecls(_allowFuncDecls, !_inFuncBody);
-    Node::accept(ast->ok, this);
-    Node::accept(ast->ko, this);
-
-    return false;
-}
-
-bool Codegen::ScanFunctions::visit(WhileStatement *ast) {
-    Node::accept(ast->expression, this);
-
-    TemporaryBoolAssignment allowFuncDecls(_allowFuncDecls, !_inFuncBody);
-    Node::accept(ast->statement, this);
-
-    return false;
-}
-
 bool Codegen::ScanFunctions::visit(DoWhileStatement *ast) {
     {
         TemporaryBoolAssignment allowFuncDecls(_allowFuncDecls, !_env->isStrict);
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 075371b273..2d2ca55f8d 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -477,12 +477,8 @@ protected:
         virtual bool visit(AST::FunctionDeclaration *ast);
         virtual void endVisit(AST::FunctionDeclaration *);
 
-        virtual bool visit(AST::FunctionBody *ast);
-
         virtual bool visit(AST::WithStatement *ast);
 
-        virtual bool visit(AST::IfStatement *ast);
-        virtual bool visit(AST::WhileStatement *ast);
         virtual bool visit(AST::DoWhileStatement *ast);
         virtual bool visit(AST::ForStatement *ast);
         virtual bool visit(AST::LocalForStatement *ast);
@@ -500,7 +496,6 @@ protected:
         Environment *_env;
         QStack<Environment *> _envStack;
 
-        bool _inFuncBody;
         bool _allowFuncDecls;
     };