Generate LLVM code for the `this-expression'.

1 files changed, 9 insertions, 3 deletions

diff --git a/qv4isel_llvm.cpp b/qv4isel_llvm.cpp
index d7829bf034..0f882e0a3b 100644
--- a/qv4isel_llvm.cpp
+++ b/qv4isel_llvm.cpp
@@ -356,9 +356,15 @@ void LLVMInstructionSelection::visitString(IR::String *e)
 void LLVMInstructionSelection::visitName(IR::Name *e)
 {
     llvm::Value *result = newLLVMTemp(_valueTy);
-    llvm::Value *name = getIdentifier(*e->id);
-    CreateCall3(_llvmModule->getFunction("__qmljs_get_activation_property"),
-                _llvmFunction->arg_begin(), result, name);
+
+    if (e->id == QStringLiteral("this")) {
+        CreateCall2(_llvmModule->getFunction("__qmljs_llvm_get_this_object"),
+                    _llvmFunction->arg_begin(), result);
+    } else {
+        llvm::Value *name = getIdentifier(*e->id);
+        CreateCall3(_llvmModule->getFunction("__qmljs_get_activation_property"),
+                    _llvmFunction->arg_begin(), result, name);
+    }
     _llvmValue = CreateLoad(result);
 
 }