Changeset 36741 in webkit for trunk/JavaScriptCore/VM

Timestamp:

Sep 21, 2008, 1:35:20 PM (17 years ago)

Author:

Darin Adler

Message:

2008-09-21 Judit Jasz <​[email protected]>

Reviewed and tweaked by Darin Adler.

• ​https://bugs.webkit.org/show_bug.cgi?id=20645 Elminate duplicate constant values in CodeBlocks.

Seems to be a wash on SunSpider.

• VM/CodeGenerator.cpp: (JSC::CodeGenerator::emitLoad): Use m_numberMap and m_stringMap to guarantee we emit the same JSValue* for identical numbers and strings.
• VM/CodeGenerator.h: Added overload of emitLoad for const Identifier&. Add NumberMap and IdentifierStringMap types and m_numberMap and m_stringMap.
• kjs/nodes.cpp: (JSC::StringNode::emitCode): Call the new emitLoad and let it do the JSString creation.

Location:

trunk/JavaScriptCore/VM

Files:

• CodeGenerator.cpp (modified) (1 diff)
• CodeGenerator.h (modified) (3 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -731 +731 @@
 }
 
-RegisterID* CodeGenerator::emitLoad(RegisterID* dst, double d)
-{
-    return emitLoad(dst, jsNumber(globalExec(), d));
+RegisterID* CodeGenerator::emitLoad(RegisterID* dst, double number)
+{
+    pair<NumberMap::iterator, bool> addResult = m_numberMap.add(number, 0);
+    if (addResult.second)
+        addResult.first->second = jsNumber(globalExec(), number);
+    return emitLoad(dst, addResult.first->second);
+}
+
+RegisterID* CodeGenerator::emitLoad(RegisterID* dst, const Identifier& identifier)
+{
+    pair<IdentifierStringMap::iterator, bool> addResult = m_stringMap.add(identifier.ustring().rep(), 0);
+    if (addResult.second)
+        addResult.first->second = jsOwnedString(globalExec(), identifier.ustring());
+    return emitLoad(dst, addResult.first->second);
 }
 

trunk/JavaScriptCore/VM/CodeGenerator.h

@@ -229 +229 @@
         RegisterID* emitLoad(RegisterID* dst, bool);
         RegisterID* emitLoad(RegisterID* dst, double);
+        RegisterID* emitLoad(RegisterID* dst, const Identifier&);
         RegisterID* emitLoad(RegisterID* dst, JSValue*);
         RegisterID* emitUnexpectedLoad(RegisterID* dst, bool);
@@ -348 +349 @@
 
         typedef HashMap<RefPtr<UString::Rep>, int, IdentifierRepHash, HashTraits<RefPtr<UString::Rep> >, IdentifierMapIndexHashTraits> IdentifierMap;
+        typedef HashMap<double, JSValue*> NumberMap;
+        typedef HashMap<UString::Rep*, JSString*, IdentifierRepHash> IdentifierStringMap;
 
         RegisterID* emitCall(OpcodeID, RegisterID*, RegisterID*, RegisterID*, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);
@@ -422 +425 @@
         IdentifierMap m_identifierMap;
         JSValueMap m_jsValueMap;
+        NumberMap m_numberMap;
+        IdentifierStringMap m_stringMap;
 
         JSGlobalData* m_globalData;