Changeset 36462 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

Sep 15, 2008, 4:33:25 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-15 Gavin Barraclough <​[email protected]>

Reviewed by Geoff Garen.

Inline code generation of eq_null/neq_null for CTI. Uses vptr checking for
StringObjectsThatAreMasqueradingAsBeingUndefined. In the long run, the
masquerading may be handled differently (through the StructureIDs - see bug
#20823).

1% on v8-tests.

• VM/CTI.cpp: (JSC::CTI::emitJumpSlowCaseIfIsJSCell): (JSC::CTI::privateCompileMainPass): (JSC::CTI::privateCompileSlowCases):
• VM/CTI.h:
• VM/Machine.cpp: (JSC::Machine::Machine): (JSC::Machine::cti_op_eq_null): (JSC::Machine::cti_op_neq_null):
• VM/Machine.h: (JSC::Machine::doesMasqueradesAsUndefined):
• kjs/JSWrapperObject.h: (JSC::JSWrapperObject::): (JSC::JSWrapperObject::JSWrapperObject):
• kjs/StringObject.h: (JSC::StringObject::StringObject):
• kjs/StringObjectThatMasqueradesAsUndefined.h: (JSC::StringObjectThatMasqueradesAsUndefined::StringObjectThatMasqueradesAsUndefined):

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (4 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -54 +54 @@
 #include "operations.h"
 #include "SamplingTool.h"
+#include "StringObjectThatMasqueradesAsUndefined.h"
 #include <stdio.h>
 
@@ -572 +573 @@
     m_jsArrayVptr = jsArray->vptr();
     static_cast<JSCell*>(jsArray)->~JSCell();
+
+    StringObjectThatMasqueradesAsUndefined* jsStringObjectThatMasqueradesAsUndefined = new (storage) StringObjectThatMasqueradesAsUndefined(StringObjectThatMasqueradesAsUndefined::VPtrStealingHack);
+    m_jsStringObjectThatMasqueradesAsUndefinedVptr = jsStringObjectThatMasqueradesAsUndefined->vptr();
+    static_cast<JSCell*>(jsStringObjectThatMasqueradesAsUndefined)->~JSCell();
 
     JSString* jsString = new (storage) JSString(JSString::VPtrStealingHack);
@@ -5402 +5407 @@
 {
     JSValue* src = ARG_src1;
+    
     if (src->isUndefinedOrNull())
         return jsBoolean(true);
 
-    return jsBoolean(!JSImmediate::isImmediate(src) && static_cast<JSCell*>(src)->masqueradeAsUndefined());
+    return jsBoolean(ARG_exec->machine()->doesMasqueradesAsUndefined(src));
 }
 
@@ -5414 +5420 @@
         return jsBoolean(false);
 
-    return jsBoolean(JSImmediate::isImmediate(src) || !static_cast<JSCell*>(src)->masqueradeAsUndefined());
+    return jsBoolean(!ARG_exec->machine()->doesMasqueradesAsUndefined(src));
 }