diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-11 15:08:30 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-12 20:44:13 +0100 |
| commit | afbf1f74af678af0eda76035133406aa8883408a (patch) | |
| tree | 2bc7b93256cad8691baa0079e60ba4cf2d52fa93 /src/qml/jsruntime/qv4internalclass.cpp | |
| parent | faf13a3aa0c97b7386e44d02f323a9156a733c9f (diff) | |
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 <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4internalclass.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4internalclass.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4internalclass.cpp b/src/qml/jsruntime/qv4internalclass.cpp index 0f8eb2bfff..7247228091 100644 --- a/src/qml/jsruntime/qv4internalclass.cpp +++ b/src/qml/jsruntime/qv4internalclass.cpp @@ -310,7 +310,8 @@ InternalClass *InternalClass::addMemberImpl(String *string, PropertyAttributes d // The incoming string can come from anywhere, so make sure to // store a string in the nameMap that's guaranteed to get // marked properly during GC. - String *name = engine->newIdentifier(string->toQString()); + // #### GC + String *name = reinterpret_cast<String*>(engine->newIdentifier(string->toQString())); newClass->nameMap.add(newClass->size, name); newClass->propertyData.add(newClass->size, data); ++newClass->size; |