Fix run-time string handling with regards to the new heap

Changed runtimeStrings to be an array of Heap::String pointers instead of
indirect String pointers. Later that member along with other GC related members
will go into a managed subclass. Meanwhile the generated code no more loads
String pointers directly but just passes the index into the run-time strings to
the run-time functions, which in turn will load the heap string into a scoped
string.

Also replaced the template<T> Value::operator=(T *m) with a non-template
overload that takes a Managed *, in order to help the compiler choose the
non-template operator=(Heap::Base *) overload. This allows removing a bunch
of Value::fromHeapObject calls.

Change-Id: I20415c0549d33cca6813441a2495976b66d4c00e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h
index f5729348f1..35e078a5f9 100644
--- a/src/qml/jsruntime/qv4scopedvalue_p.h
+++ b/src/qml/jsruntime/qv4scopedvalue_p.h
@@ -256,7 +256,7 @@ struct Scoped
     Scoped(const Scope &scope, typename T::Data *t)
     {
         ptr = scope.engine->jsStackTop++;
-        *ptr = Value::fromHeapObject(t);
+        *ptr = t;
 #ifndef QT_NO_DEBUG
         ++scope.size;
 #endif
@@ -298,7 +298,7 @@ struct Scoped
         return *this;
     }
     Scoped<T> &operator=(typename T::Data *t) {
-        *ptr = Value::fromHeapObject(t);
+        *ptr = t;
         return *this;
     }
     Scoped<T> &operator=(const Value &v) {