Inline identifier lookup where it makes sense

Change-Id: I42ac6f4232fec2ce1535a007007542d8cc116433
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/jsruntime/qv4identifiertable.cpp b/src/qml/jsruntime/qv4identifiertable.cpp
index 07c19e4..618696a 100644 (file)
--- a/src/qml/jsruntime/qv4identifiertable.cpp
+++ b/src/qml/jsruntime/qv4identifiertable.cpp
@@ -135,7 +135,7 @@ String *IdentifierTable::insertString(const QString &s)
 }
 
 
-Identifier *IdentifierTable::identifier(String *str)
+Identifier *IdentifierTable::identifierImpl(String *str)
 {
     if (str->identifier)
         return str->identifier;

diff --git a/src/qml/jsruntime/qv4identifiertable_p.h b/src/qml/jsruntime/qv4identifiertable_p.h
index 0f9a592..6450a87 100644 (file)
--- a/src/qml/jsruntime/qv4identifiertable_p.h
+++ b/src/qml/jsruntime/qv4identifiertable_p.h
@@ -68,10 +68,17 @@ public:
 
     String *insertString(const QString &s);
 
-    Identifier *identifier(String *str);
+    Identifier *identifier(String *str) {
+        if (str->identifier)
+            return str->identifier;
+        return identifierImpl(str);
+    }
+
     Identifier *identifier(const QString &s);
     Identifier *identifier(const char *s, int len);
 
+    Identifier *identifierImpl(String *str);
+
     void mark() {
         for (int i = 0; i < alloc; ++i)
             if (entries[i])