Move conversion of this object into generated code

When a non strict mode function uses the this object, we
need to make sure it's being correctly converted into a
object before being accessed. So far this was being done
by ScriptFunction::call. Move this into the generated code to
avoid overhead for methods not using 'this', and simplify our
ScriptFunction::call() implementation.

Change-Id: I739f4a89d29ed8082ce59e48d1523776224fc29d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/qml/compiler/qv4jsir_p.h b/src/qml/compiler/qv4jsir_p.h
index 933ba1321d..a7bed6419b 100644
--- a/src/qml/compiler/qv4jsir_p.h
+++ b/src/qml/compiler/qv4jsir_p.h
@@ -324,6 +324,7 @@ struct Name: Expr {
         builtin_define_getter_setter,
         builtin_define_object_literal,
         builtin_setup_argument_object,
+        builtin_convert_this_to_object,
         builtin_qml_id_scope,
         builtin_qml_imported_scripts_object,
         builtin_qml_context_object,
@@ -733,12 +734,13 @@ struct Function {
 
     uint hasDirectEval: 1;
     uint usesArgumentsObject : 1;
+    uint usesThis : 1;
     uint isStrict: 1;
     uint isNamedExpression : 1;
     uint hasTry: 1;
     uint hasWith: 1;
     uint hasQmlDependencies : 1;
-    uint unused : 25;
+    uint unused : 24;
 
     // Location of declaration in source code (-1 if not specified)
     int line;