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

Timestamp:

Sep 29, 2008, 12:49:55 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-29 Cameron Zwarich <​[email protected]>

Reviewed by Sam Weinig.

Remove the isActivationObject() virtual method on JSObject and use
StructureID information instead. This should be slightly faster, but
isActivationObject() is only used in assertions and unwinding the stack
for exceptions.

• VM/Machine.cpp: (JSC::depth): (JSC::Machine::unwindCallFrame): (JSC::Machine::privateExecute): (JSC::Machine::cti_op_ret_activation):
• kjs/JSActivation.cpp:
• kjs/JSActivation.h:
• kjs/JSObject.h:

File:

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

trunk/JavaScriptCore/VM/Machine.cpp

@@ -114 +114 @@
     ScopeChainIterator iter = sc.begin();
     ScopeChainIterator end = sc.end();
-    while (!(*iter)->isActivationObject()) {
+    while (!(*iter)->isObject(&JSActivation::info)) {
         ++iter;
         if (iter == end)
@@ -794 +794 @@
     // If this call frame created an activation, tear it off.
     if (JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].jsValue(exec))) {
-        ASSERT(activation->isActivationObject());
+        ASSERT(activation->isObject(&JSActivation::info));
         activation->copyRegisters();
     }
@@ -3357 +3357 @@
         if (JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].jsValue(exec))) {
             ASSERT(!r[RegisterFile::CodeBlock].codeBlock()->needsFullScopeChain || scopeChain->object == activation);
-            ASSERT(activation->isActivationObject());
+            ASSERT(activation->isObject(&JSActivation::info));
             activation->copyRegisters();
         }
@@ -4577 +4577 @@
 
     ASSERT(!ARG_r[RegisterFile::CodeBlock].codeBlock()->needsFullScopeChain || ARG_scopeChain->object == activation);
-    ASSERT(activation->isActivationObject());
+    ASSERT(activation->isObject(&JSActivation::info));
     activation->copyRegisters();
 }