1 files changed, 31 insertions, 10 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index 0afc97e4bf..693a4230ba 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -92,6 +92,27 @@ static bool cjumpCanHandle(IR::AluOp op)
     }
 }
 
+static inline void setJumpOutLocation(IR::Stmt *s, const Statement *body,
+                                      const SourceLocation &fallback)
+{
+    switch (body->kind) {
+    // Statements where we might never execute the last line.
+    // Use the fallback.
+    case Statement::Kind_ConditionalExpression:
+    case Statement::Kind_ForEachStatement:
+    case Statement::Kind_ForStatement:
+    case Statement::Kind_IfStatement:
+    case Statement::Kind_LocalForEachStatement:
+    case Statement::Kind_LocalForStatement:
+    case Statement::Kind_WhileStatement:
+        setLocation(s, fallback);
+        break;
+    default:
+        setLocation(s, body->lastSourceLocation());
+        break;
+    }
+}
+
 Codegen::ScanFunctions::ScanFunctions(Codegen *cg, const QString &sourceCode, CompilationMode defaultProgramMode)
     : _cg(cg)
     , _sourceCode(sourceCode)
@@ -1497,7 +1518,7 @@ IR::Expr *Codegen::identifier(const QString &name, int line, int col)
     IR::Function *f = _function;
 
     while (f && e->parent) {
-        if (f->insideWithOrCatch || (f->isNamedExpression && f->name == name))
+        if (f->insideWithOrCatch || (f->isNamedExpression && QStringRef(f->name) == name))
             return _block->NAME(name, line, col);
 
         int index = e->findMember(name);
@@ -1508,7 +1529,7 @@ IR::Expr *Codegen::identifier(const QString &name, int line, int col)
                 al->isArgumentsOrEval = true;
             return al;
         }
-        const int argIdx = f->indexOfArgument(&name);
+        const int argIdx = f->indexOfArgument(QStringRef(&name));
         if (argIdx != -1)
             return _block->ARG(argIdx, scope);
 
@@ -2269,7 +2290,7 @@ bool Codegen::visit(DoWhileStatement *ast)
 
     _block = loopbody;
     statement(ast->statement);
-    _block->JUMP(loopcond);
+    setJumpOutLocation(_block->JUMP(loopcond), ast->statement, ast->semicolonToken);
 
     _block = loopcond;
     condition(ast->expression, loopbody, loopend);
@@ -2334,7 +2355,7 @@ bool Codegen::visit(ForEachStatement *ast)
         return false;
     move(*init, _block->TEMP(temp));
     statement(ast->statement);
-    _block->JUMP(foreachin);
+    setJumpOutLocation(_block->JUMP(foreachin), ast->statement, ast->forToken);
 
     _block = foreachin;
 
@@ -2373,7 +2394,7 @@ bool Codegen::visit(ForStatement *ast)
 
     _block = forbody;
     statement(ast->statement);
-    _block->JUMP(forstep);
+    setJumpOutLocation(_block->JUMP(forstep), ast->statement, ast->forToken);
 
     _block = forstep;
     statement(ast->expression);
@@ -2399,12 +2420,12 @@ bool Codegen::visit(IfStatement *ast)
 
     _block = iftrue;
     statement(ast->ok);
-    _block->JUMP(endif);
+    setJumpOutLocation(_block->JUMP(endif), ast->ok, ast->ifToken);
 
     if (ast->ko) {
         _block = iffalse;
         statement(ast->ko);
-        _block->JUMP(endif);
+        setJumpOutLocation(_block->JUMP(endif), ast->ko, ast->elseToken);
     }
 
     _block = endif;
@@ -2473,7 +2494,7 @@ bool Codegen::visit(LocalForEachStatement *ast)
     int temp = _block->newTemp();
     move(identifier(ast->declaration->name.toString()), _block->TEMP(temp));
     statement(ast->statement);
-    _block->JUMP(foreachin);
+    setJumpOutLocation(_block->JUMP(foreachin), ast->statement, ast->forToken);
 
     _block = foreachin;
 
@@ -2512,7 +2533,7 @@ bool Codegen::visit(LocalForStatement *ast)
 
     _block = forbody;
     statement(ast->statement);
-    _block->JUMP(forstep);
+    setJumpOutLocation(_block->JUMP(forstep), ast->statement, ast->forToken);
 
     _block = forstep;
     statement(ast->expression);
@@ -2813,7 +2834,7 @@ bool Codegen::visit(WhileStatement *ast)
 
     _block = whilebody;
     statement(ast->statement);
-    _block->JUMP(whilecond);
+    setJumpOutLocation(_block->JUMP(whilecond), ast->statement, ast->whileToken);
 
     _block = whileend;
     leaveLoop();