Ported ExecutionEngine::newString and newIdentifier to Heap::String

Avoid the use of Returned<String> for newString and changed the identifier
table to use Heap::String. This required moving some code back into
Heap::String, but that's code that doesn't call back into the GC, so
allocations and therefore future object moves aren't possible.

Change-Id: I1dca3e9c12a9c56f09419af8cc8cba39fe04f720
Reviewed-by: Lars Knoll <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp
index 0935da3255..78cbe88ba9 100644
--- a/src/qml/jsruntime/qv4arrayobject.cpp
+++ b/src/qml/jsruntime/qv4arrayobject.cpp
@@ -205,7 +205,7 @@ ReturnedValue ArrayPrototype::method_join(CallContext *ctx)
             if (scope.hasException())
                 return Encode::undefined();
             if (!e->isNullOrUndefined())
-                R += e->toString(ctx)->toQString();
+                R += e->toQString();
         }
     } else {
         //
@@ -214,7 +214,7 @@ ReturnedValue ArrayPrototype::method_join(CallContext *ctx)
         ScopedString name(scope, ctx->d()->engine->newString(QStringLiteral("0")));
         ScopedValue r6(scope, self->get(name.getPointer()));
         if (!r6->isNullOrUndefined())
-            R = r6->toString(ctx)->toQString();
+            R = r6->toQString();
 
         ScopedValue r12(scope);
         for (quint32 k = 1; k < r2; ++k) {
@@ -226,7 +226,7 @@ ReturnedValue ArrayPrototype::method_join(CallContext *ctx)
                 return Encode::undefined();
 
             if (!r12->isNullOrUndefined())
-                R += r12->toString(ctx)->toQString();
+                R += r12->toQString();
         }
     }