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/qv4identifier.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/qv4identifier.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4identifier.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4identifier.cpp b/src/qml/jsruntime/qv4identifier.cpp index d7e0e25ddf..3432f8702d 100644 --- a/src/qml/jsruntime/qv4identifier.cpp +++ b/src/qml/jsruntime/qv4identifier.cpp @@ -152,7 +152,7 @@ const Identifier *IdentifierHashBase::toIdentifier(const QString &str) const return d->identifierTable->identifier(str); } -const Identifier *IdentifierHashBase::toIdentifier(String *str) const +const Identifier *IdentifierHashBase::toIdentifier(Heap::String *str) const { Q_ASSERT(d); return d->identifierTable->identifier(str); |