Changeset 150160 in webkit

Timestamp:

May 15, 2013, 5:29:25 PM (13 years ago)

Author:

oliver@apple.com

Message:

RefCountedArray needs to use vector initialisers for its backing store
​https://bugs.webkit.org/show_bug.cgi?id=116194

Reviewed by Gavin Barraclough.

Source/JavaScriptCore:

Use an out of line function to clear the exception stack to avoid
needing to include otherwise unnecessary headers all over the place.

Everything else is just being updated to use that.

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

(JSC::ExecState::clearSupplementaryExceptionInfo):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::addStackTraceIfNecessary):
(JSC::Interpreter::throwException):

• runtime/JSGlobalObject.cpp:

(JSC::DynamicGlobalObjectScope::DynamicGlobalObjectScope):

• runtime/VM.cpp:

(JSC):
(JSC::VM::clearExceptionStack):

• runtime/VM.h:

(VM):
(JSC::VM::exceptionStack):

Source/WebCore:

Update to use new functions for operating on the exception stack.

• bindings/js/ScriptCallStackFactory.cpp:

(WebCore::createScriptCallStackFromException):

Source/WTF:

Use VectorOperations to operate on the backing store

• wtf/RefCountedArray.h:

(WTF::RefCountedArray::RefCountedArray):
(WTF::RefCountedArray::operator=):
(WTF::RefCountedArray::~RefCountedArray):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (modified) (1 diff)
• JavaScriptCore/interpreter/CallFrame.h (modified) (1 diff)
• JavaScriptCore/interpreter/Interpreter.cpp (modified) (2 diffs)
• JavaScriptCore/runtime/JSGlobalObject.cpp (modified) (1 diff)
• JavaScriptCore/runtime/VM.cpp (modified) (1 diff)
• JavaScriptCore/runtime/VM.h (modified) (2 diffs)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/RefCountedArray.h (modified) (3 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/ScriptCallStackFactory.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-05-15  Oliver Hunt  <oliver@apple.com>
+
+        RefCountedArray needs to use vector initialisers for its backing store
+        https://bugs.webkit.org/show_bug.cgi?id=116194
+
+        Reviewed by Gavin Barraclough.
+
+        Use an out of line function to clear the exception stack to avoid
+        needing to include otherwise unnecessary headers all over the place.
+
+        Everything else is just being updated to use that.
+
+        * bytecompiler/BytecodeGenerator.cpp:
+        * interpreter/CallFrame.h:
+        (JSC::ExecState::clearSupplementaryExceptionInfo):
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::addStackTraceIfNecessary):
+        (JSC::Interpreter::throwException):
+        * runtime/JSGlobalObject.cpp:
+        (JSC::DynamicGlobalObjectScope::DynamicGlobalObjectScope):
+        * runtime/VM.cpp:
+        (JSC):
+        (JSC::VM::clearExceptionStack):
+        * runtime/VM.h:
+        (VM):
+        (JSC::VM::exceptionStack):
+
 2013-05-15  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -41 +41 @@
 #include "Options.h"
 #include "StrongInlines.h"
+#include "UnlinkedCodeBlock.h"
 #include <wtf/text/WTFString.h>
 

trunk/Source/JavaScriptCore/interpreter/CallFrame.h

@@ -71 +71 @@
         void clearSupplementaryExceptionInfo()
         {
-            vm().exceptionStack = RefCountedArray<StackFrame>();
+            vm().clearExceptionStack();
         }
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -695 +695 @@
     Vector<StackFrame> stackTrace;
     getStackTrace(&callFrame->vm(), stackTrace);
-    vm->exceptionStack = RefCountedArray<StackFrame>(stackTrace);
+    vm->exceptionStack() = RefCountedArray<StackFrame>(stackTrace);
     if (stackTrace.isEmpty() || !error.isObject())
         return;
@@ -746 +746 @@
         isTermination = isTerminatedExecutionException(exception);
     } else {
-        if (!callFrame->vm().exceptionStack.size()) {
+        if (!callFrame->vm().exceptionStack().size()) {
             Vector<StackFrame> stack;
             Interpreter::getStackTrace(&callFrame->vm(), stack);
-            callFrame->vm().exceptionStack = RefCountedArray<StackFrame>(stack);
+            callFrame->vm().exceptionStack() = RefCountedArray<StackFrame>(stack);
         }
     }

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -593 +593 @@
     }
     // Clear the exception stack between entries
-    vm.exceptionStack = RefCountedArray<StackFrame>();
+    vm.clearExceptionStack();
 }
 

trunk/Source/JavaScriptCore/runtime/VM.cpp

@@ -515 +515 @@
     heap.collectAllGarbage();
 }
+
+void VM::clearExceptionStack()
+{
+    m_exceptionStack = RefCountedArray<StackFrame>();
+}
     
 void releaseExecutableMemory(VM& vm)

trunk/Source/JavaScriptCore/runtime/VM.h

@@ -327 +327 @@
 
         JSValue exception;
-        RefCountedArray<StackFrame> exceptionStack;
+        JS_EXPORT_PRIVATE void clearExceptionStack();
+        RefCountedArray<StackFrame>& exceptionStack() { return m_exceptionStack; }
 
         const ClassInfo* const jsArrayClassInfo;
@@ -492 +493 @@
         bool m_inDefineOwnProperty;
         RefPtr<CodeCache> m_codeCache;
+        RefCountedArray<StackFrame> m_exceptionStack;
 
         TypedArrayDescriptor m_int8ArrayDescriptor;

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-05-15  Oliver Hunt  <oliver@apple.com>
+
+        RefCountedArray needs to use vector initialisers for its backing store
+        https://bugs.webkit.org/show_bug.cgi?id=116194
+
+        Reviewed by Gavin Barraclough.
+
+        Use VectorOperations to operate on the backing store
+
+        * wtf/RefCountedArray.h:
+        (WTF::RefCountedArray::RefCountedArray):
+        (WTF::RefCountedArray::operator=):
+        (WTF::RefCountedArray::~RefCountedArray):
+
 2013-05-15  Nico Weber  <thakis@chromium.org>
 

trunk/Source/WTF/wtf/RefCountedArray.h

@@ -84 +84 @@
         Header::fromPayload(m_data)->length = other.size();
         ASSERT(Header::fromPayload(m_data)->length == other.size());
-        memcpy(m_data, other.begin(), sizeof(T) * other.size());
+        VectorTypeOperations<T>::uninitializedCopy(other.begin(), other.end(), m_data);
     }
     
@@ -98 +98 @@
         if (--Header::fromPayload(oldData)->refCount)
             return *this;
+        VectorTypeOperations<T>::destruct(oldData, oldData + Header::fromPayload(oldData)->length);
         fastFree(Header::fromPayload(oldData));
         return *this;
@@ -108 +109 @@
         if (--Header::fromPayload(m_data)->refCount)
             return;
+        VectorTypeOperations<T>::destruct(begin(), end());
         fastFree(Header::fromPayload(m_data));
     }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-15  Oliver Hunt  <oliver@apple.com>
+
+        RefCountedArray needs to use vector initialisers for its backing store
+        https://bugs.webkit.org/show_bug.cgi?id=116194
+
+        Reviewed by Gavin Barraclough.
+
+        Update to use new functions for operating on the exception stack.
+
+        * bindings/js/ScriptCallStackFactory.cpp:
+        (WebCore::createScriptCallStackFromException):
+
 2013-05-15  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp

@@ -94 +94 @@
 {
     Vector<ScriptCallFrame> frames;
-    RefCountedArray<StackFrame> stackTrace = exec->vm().exceptionStack;
+    RefCountedArray<StackFrame> stackTrace = exec->vm().exceptionStack();
     for (size_t i = 0; i < stackTrace.size() && i < maxStackSize; i++) {
         if (!stackTrace[i].callee && frames.size())