Changeset 107345 in webkit

Timestamp:

Feb 9, 2012, 7:14:34 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Remove BytecodeGenerator::isLocal
​https://bugs.webkit.org/show_bug.cgi?id=78241

Minor refactor to BytecodeGenerator.

Patch by Andy Wingo <​wingo@igalia.com> on 2012-02-09
Reviewed by Gavin Barraclough.

• bytecompiler/BytecodeGenerator.h:
• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::isLocal):
(JSC::BytecodeGenerator::isLocalConstant): Remove now-unused
methods.

• bytecompiler/NodesCodegen.cpp:

(JSC::ResolveNode::isPure): Use the ResolveResult mechanism
instead of isLocal. This will recognize more resolve nodes as
being pure.
(JSC::PrefixResolveNode::emitBytecode): Use isReadOnly on the
location instead of isLocalConstant.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecompiler/BytecodeGenerator.cpp (modified) (1 diff)
• bytecompiler/BytecodeGenerator.h (modified) (1 diff)
• bytecompiler/NodesCodegen.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-02-09  Andy Wingo  <wingo@igalia.com>
+
+        Remove BytecodeGenerator::isLocal
+        https://bugs.webkit.org/show_bug.cgi?id=78241
+
+        Minor refactor to BytecodeGenerator.
+
+        Reviewed by Gavin Barraclough.
+
+        * bytecompiler/BytecodeGenerator.h:
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::isLocal):
+        (JSC::BytecodeGenerator::isLocalConstant): Remove now-unused
+        methods.
+        * bytecompiler/NodesCodegen.cpp:
+        (JSC::ResolveNode::isPure): Use the ResolveResult mechanism
+        instead of isLocal.  This will recognize more resolve nodes as
+        being pure.
+        (JSC::PrefixResolveNode::emitBytecode): Use isReadOnly on the
+        location instead of isLocalConstant.
+
 2012-02-09  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -560 +560 @@
     emitLazyNewFunction(reg, m_lazyFunctions.get(reg->index()));
     return reg;
-}
-
-bool BytecodeGenerator::isLocal(const Identifier& ident)
-{
-    if (ident == propertyNames().thisIdentifier)
-        return true;
-    
-    return shouldOptimizeLocals() && symbolTable().contains(ident.impl());
-}
-
-bool BytecodeGenerator::isLocalConstant(const Identifier& ident)
-{
-    return symbolTable().get(ident.impl()).isReadOnly();
 }
 

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h

@@ -263 +263 @@
         RegisterID* thisRegister() { return &m_thisRegister; }
 
-        bool isLocal(const Identifier&);
-        bool isLocalConstant(const Identifier&);
-
         // Returns the next available temporary register. Registers returned by
         // newTemporary require a modified form of reference counting: any

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -143 +143 @@
 bool ResolveNode::isPure(BytecodeGenerator& generator) const
 {
-    return generator.isLocal(m_ident);
+    return generator.resolve(m_ident).isStatic();
 }
 
@@ -793 +793 @@
     ResolveResult resolveResult = generator.resolve(m_ident);
     if (RegisterID* local = resolveResult.local()) {
-        if (generator.isLocalConstant(m_ident)) {
+        if (resolveResult.isReadOnly()) {
             if (dst == generator.ignoredResult())
                 return 0;