Changeset 33319

Timestamp:

05/12/08 23:03:08 (6 months ago)

Author:

mrowe@apple.com

Message:

Bug 18827: SquirrelFish: Prevent getters and setters from destroying the current RegisterFile
<https://bugs.webkit.org/show_bug.cgi?id=18827>

Reviewed by Maciej

This patch makes getters and setters work. It does this by
tracking whether the RegisterFile is "safe", that is whether
the interpreter is in a state that in which it can handle
the RegisterFile being reallocated.

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/Machine.cpp (modified) (6 diffs)
• VM/RegisterFile.h (modified) (3 diffs)
• kjs/function.cpp (modified) (1 diff)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-01  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Maciej.
+
+        Bug 18827: SquirrelFish: Prevent getters and setters from destroying the current RegisterFile
+        <https://bugs.webkit.org/show_bug.cgi?id=18827>
+        
+        This patch makes getters and setters work.  It does this by
+        tracking whether the RegisterFile is "safe", that is whether
+        the interpreter is in a state that in which it can handle
+        the RegisterFile being reallocated.
+
+        * VM/Machine.cpp:
+        (KJS::resolve):
+        (KJS::Machine::privateExecute):
+        * VM/RegisterFile.h:
+        * kjs/function.cpp:
+        (KJS::FunctionImp::callAsFunction):
+
 2008-04-30  Geoffrey Garen  <ggaren@apple.com>
 

branches/squirrelfish/JavaScriptCore/VM/Machine.cpp

@@ -270 +270 @@
         if (o->getPropertySlot(exec, ident, slot)) {
             r[dst].u.jsValue = slot.getValue(exec, o, ident);
-            return true;
+            exceptionValue = exec->exception();
+            return !exceptionValue;
         }
     } while (++iter != end);
@@ -717 +718 @@
     JSValue** k = codeBlock->jsValues.data();
     
+    registerFile->setUnsafeForReentry(true);
 #define VM_CHECK_EXCEPTION() \
      do { \
@@ -1423 +1425 @@
             JSObject* thisObject = r[thisRegister].u.jsObject;
 
+            registerFile->setUnsafeForReentry(false);
             JSValue* result = eval(exec, thisObject, scopeChain, registerFile, r, argv, argc, exceptionValue);
+            registerFile->setUnsafeForReentry(true);
             r = (*registerBase) + registerOffset;
 
@@ -1494 +1498 @@
             List args(&r[argv + 1].u.jsValue, argc - 1);
 
+            registerFile->setUnsafeForReentry(false);
             JSValue* returnValue = static_cast<JSObject*>(v)->callAsFunction(exec, thisObj, args);
+            registerFile->setUnsafeForReentry(true);
 
             r = (*registerBase) + registerOffset;
@@ -1596 +1602 @@
 
             List args(&r[argv + 1].u.jsValue, argc - 1);
+            registerFile->setUnsafeForReentry(false);
             JSValue* returnValue = constructor->construct(exec, args);
+            registerFile->setUnsafeForReentry(true);
         
             r = (*registerBase) + registerOffset;
@@ -1741 +1749 @@
     }
     vm_throw: {
+        exec->clearException();
         handlerVPC = throwException(exec, exceptionValue, registerBase, vPC, codeBlock, k, scopeChain, r);
         if (!handlerVPC) {

branches/squirrelfish/JavaScriptCore/VM/RegisterFile.h

@@ -89 +89 @@
         enum { DefaultRegisterFileSize = 2 * 1024 * 1024 };
         RegisterFile(RegisterFileStack* stack, size_t maxSize)
-            : m_isForImplicitCall(false)
+            : m_unsafeForReentry(false)
+            , m_isForImplicitCall(false)
             , m_size(0)
             , m_capacity(0)
@@ -150 +151 @@
             Collector::markStackObjectsConservatively(m_buffer, m_base + m_size);
         }
-        
+        bool unsafeForReentry() { return m_unsafeForReentry; }
+        void setUnsafeForReentry(bool unsafeForReentry) { m_unsafeForReentry = unsafeForReentry; }
         void setIsForImplicitCall(bool isForImplicitCall) { m_isForImplicitCall = isForImplicitCall; }
         bool isForImplicitCall() { return m_isForImplicitCall; }
@@ -165 +167 @@
         
         void setBase(Register*);
-        
+        bool m_unsafeForReentry;
         bool m_isForImplicitCall;
         size_t m_size;

branches/squirrelfish/JavaScriptCore/kjs/function.cpp

@@ -84 +84 @@
 {
     JSValue* exception = 0;
-    JSValue* result = machine().execute(body.get(), exec, this, thisObj, args, &exec->dynamicGlobalObject()->registerFileStack(), _scope.node(), &exception);
-    exec->setException(exception);
-    return result;
+    RegisterFileStack* stack = &exec->dynamicGlobalObject()->registerFileStack();
+    RegisterFile* current = stack->current();
+    if (current->unsafeForReentry()) {
+        stack->pushFunctionRegisterFile();
+        JSValue* result = machine().execute(body.get(), exec, this, thisObj, args, stack, _scope.node(), &exception);
+        stack->popFunctionRegisterFile();
+        exec->setException(exception);
+        return result;
+    } else {
+        JSValue* result = machine().execute(body.get(), exec, this, thisObj, args, stack, _scope.node(), &exception);
+        current->setUnsafeForReentry(false);
+        exec->setException(exception);
+        return result;
+    }
 }