diff options
author | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-09-12 10:39:53 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-09-12 11:27:35 +0000 |
commit | a3a380f334aa1335a802fe429c199db8ccb1e862 (patch) | |
tree | e353ae4d6767f52852cbfac92d44ee7815499a0b | |
parent | e9803945e926d3318fd3f26cfd25308418c55234 (diff) |
Remove superfluous call to String::makeIdentifier
This is already done at the top of the method. Also mark the slow path
of makeIdentifier as never-inline, so it won't bloat functions when
makeIdentifier is inlined.
Change-Id: I707f9b82f555314bea154014d8cbb876b26d0d4b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | src/qml/jsruntime/qv4context.cpp | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4string_p.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index 6de6424f0e..b4edd34380 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -281,7 +281,6 @@ ReturnedValue ExecutionContext::getProperty(String *name) } case Heap::ExecutionContext::Type_CallContext: { Heap::CallContext *c = static_cast<Heap::CallContext *>(ctx); - name->makeIdentifier(); Identifier *id = name->identifier(); uint index = c->internalClass->find(id); diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h index 2f34dd6139..d1b936bb4e 100644 --- a/src/qml/jsruntime/qv4string_p.h +++ b/src/qml/jsruntime/qv4string_p.h @@ -181,7 +181,8 @@ struct Q_QML_PRIVATE_EXPORT String : public Managed { makeIdentifierImpl(); } - void makeIdentifierImpl() const; + // slow path + Q_NEVER_INLINE void makeIdentifierImpl() const; static uint createHashValue(const QChar *ch, int length, uint *subtype) { |