Changeset 34607 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.cpp

Timestamp:

Jun 16, 2008, 4:28:38 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

Make Identifier construction use an explicitly passed IdentifierTable.

No change on SunSpider total.

File:

• trunk/JavaScriptCore/VM/CodeGenerator.cpp (modified) (8 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -180 +180 @@
     , m_continueDepth(0)
     , m_nextVar(-1)
-    , m_propertyNames(&scopeChain.globalObject()->globalExec()->propertyNames())
+    , m_globalData(&scopeChain.globalObject()->globalExec()->globalData())
     , m_lastOpcodeID(op_end)
 {
@@ -239 +239 @@
     , m_continueDepth(0)
     , m_nextVar(-1)
-    , m_propertyNames(&scopeChain.globalObject()->globalExec()->propertyNames())
+    , m_globalData(&scopeChain.globalObject()->globalExec()->globalData())
     , m_lastOpcodeID(op_end)
 {
@@ -254 +254 @@
     for (size_t i = 0; i < varStack.size(); ++i) {
         const Identifier& ident = varStack[i].first;
-        if (ident == m_propertyNames->arguments)
+        if (ident == propertyNames().arguments)
             continue;
 
@@ -286 +286 @@
     , m_continueDepth(0)
     , m_nextVar(-1)
-    , m_propertyNames(&scopeChain.globalObject()->globalExec()->propertyNames())
+    , m_globalData(&scopeChain.globalObject()->globalExec()->globalData())
     , m_lastOpcodeID(op_end)
 {
@@ -317 +317 @@
 RegisterID* CodeGenerator::registerForLocal(const Identifier& ident)
 {
-    if (m_codeType == FunctionCode && ident == m_propertyNames->arguments)
+    if (m_codeType == FunctionCode && ident == propertyNames().arguments)
         m_codeBlock->needsFullScopeChain = true;
 
-    if (ident == m_propertyNames->thisIdentifier)
+    if (ident == propertyNames().thisIdentifier)
         return &m_thisRegister;
 
@@ -346 +346 @@
 bool CodeGenerator::isLocal(const Identifier& ident)
 {
-    if (ident == m_propertyNames->thisIdentifier)
+    if (ident == propertyNames().thisIdentifier)
         return true;
     
@@ -481 +481 @@
     pair<IdentifierMap::iterator, bool> result = m_identifierMap.add(rep, m_codeBlock->identifiers.size());
     if (result.second) // new entry
-        m_codeBlock->identifiers.append(rep);
+        m_codeBlock->identifiers.append(Identifier(m_globalData, rep));
 
     return result.first->second;
@@ -591 +591 @@
 {
     // Cases where we cannot optimise the lookup
-    if (property == m_propertyNames->arguments || !canOptimizeNonLocals()) {
+    if (property == propertyNames().arguments || !canOptimizeNonLocals()) {
         stackDepth = 0;
         index = missingSymbolMarker();