Changeset 36036 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 2, 2008, 7:58:14 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-02 Geoffrey Garen <​[email protected]>

Reviewed by Anders Carlsson.

Added optimized paths for comparing to null.

SunSpider says 0.5% faster.

Location:

trunk/JavaScriptCore/kjs

Files:

• JSCell.h (modified) (1 diff)
• JSObject.h (modified) (1 diff)
• nodes.cpp (modified) (2 diffs)
• nodes.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/JSCell.h

@@ -78 +78 @@
         virtual JSObject* toObject(ExecState*) const = 0;
 
+        // WebCore uses this to make document.all and style.filter undetectable
+        virtual bool masqueradeAsUndefined() const { return false; }
+
         // Garbage collection.
         void* operator new(size_t, ExecState*);

trunk/JavaScriptCore/kjs/JSObject.h

@@ -115 +115 @@
         virtual bool getPropertyAttributes(ExecState*, const Identifier& propertyName, unsigned& attributes) const;
 
-        // WebCore uses this to make document.all and style.filter undetectable
-        virtual bool masqueradeAsUndefined() const { return false; }
-
         // This get function only looks at the property map.
         JSValue* getDirect(const Identifier& propertyName) const { return m_propertyMap.get(propertyName); }

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -744 +744 @@
 RegisterID* BinaryOpNode::emitCode(CodeGenerator& generator, RegisterID* dst)
 {
+    OpcodeID opcode = this->opcode();
+    if (opcode == op_eq || opcode == op_neq) {
+        if (m_expr1->isNull() || m_expr2->isNull()) {
+            RefPtr<RegisterID> src = generator.emitNode(dst, m_expr1->isNull() ? m_expr2.get() : m_expr1.get());
+            return generator.emitUnaryOp(opcode == op_eq ? op_eq_null : op_neq_null, generator.finalDestination(dst, src.get()), src.get());
+        }
+    }
+
     RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(m_expr1.get(), m_rightHasAssignments, m_expr2->isPure(generator));
     RegisterID* src2 = generator.emitNode(m_expr2.get());
-    return generator.emitBinaryOp(opcode(), generator.finalDestination(dst, src1.get()), src1.get(), src2);
+    return generator.emitBinaryOp(opcode, generator.finalDestination(dst, src1.get()), src1.get(), src2);
 }
 
@@ -1811 +1819 @@
     proto->putDirect(exec->propertyNames().constructor, func, DontEnum);
     func->putDirect(exec->propertyNames().prototype, proto, DontDelete);
-    func->putDirect(exec->propertyNames().length, jsNumber(exec, m_body->parameters().size()), ReadOnly | DontDelete | DontEnum);
     return func;
 }

trunk/JavaScriptCore/kjs/nodes.h

@@ -209 +209 @@
         virtual bool isNumber() const KJS_FAST_CALL { return false; }
         virtual bool isString() const KJS_FAST_CALL { return false; }
+        virtual bool isNull() const KJS_FAST_CALL { return false; }
         virtual bool isPure(CodeGenerator&) const KJS_FAST_CALL { return false; }        
         virtual bool isLocation() const KJS_FAST_CALL { return false; }
@@ -245 +246 @@
         {
         }
+
+        virtual bool isNull() const KJS_FAST_CALL { return true; }
 
         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;