Changeset 81191 in webkit for trunk/Source/JavaScriptCore/jit/JITStubs.cpp

Timestamp:

Mar 15, 2011, 4:29:56 PM (14 years ago)

Author:

[email protected]

Message:

2011-03-15 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Removed a few more deprecatedAppends, and removed HeapRoot<T>
​https://bugs.webkit.org/show_bug.cgi?id=56422

Added HeapRootMarker, a privileged class for marking direct heap roots
that are iterated during each garbage collection. This is easier to use
and more reliable than HeapRoot<T>, so I've removed HeapRoot<T>.

• debugger/Debugger.cpp: (JSC::evaluateInGlobalCallFrame):
• debugger/DebuggerCallFrame.cpp: (JSC::DebuggerCallFrame::evaluate):
• interpreter/CallFrame.h: (JSC::ExecState::exception):
• jit/JITStubs.cpp: (JSC::DEFINE_STUB_FUNCTION):
• runtime/Completion.cpp: (JSC::evaluate): exception is no longer a HeapRoot<T>, so no need to call .get() on it.

• runtime/Heap.cpp: (JSC::Heap::markProtectedObjects): (JSC::Heap::markTempSortVectors): (JSC::Heap::markRoots):
• runtime/Heap.h: Updated to use HeapRootMarker.

• runtime/JSCell.h: (JSC::JSCell::MarkStack::append): Added private functions for HeapRootMarker to use.

• runtime/JSGlobalData.h: exception is no longer a HeapRoot<T>.

• runtime/MarkStack.h: (JSC::HeapRootMarker::HeapRootMarker): (JSC::HeapRootMarker::mark): Added private functions for HeapRootMarker to use.

• runtime/SmallStrings.cpp: (JSC::SmallStrings::markChildren): Updated to use HeapRootMarker.

• runtime/SmallStrings.h: (JSC::SmallStrings::emptyString): (JSC::SmallStrings::singleCharacterString): (JSC::SmallStrings::singleCharacterStrings): Updated to use HeapRootMarker.

• runtime/WriteBarrier.h: Removed HeapRoot<T>.

File:

• trunk/Source/JavaScriptCore/jit/JITStubs.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/JITStubs.cpp

@@ -944 +944 @@
 #define CHECK_FOR_EXCEPTION() \
     do { \
-        if (UNLIKELY(stackFrame.globalData->exception.get())) \
+        if (UNLIKELY(stackFrame.globalData->exception)) \
             VM_THROW_EXCEPTION(); \
     } while (0)
 #define CHECK_FOR_EXCEPTION_AT_END() \
     do { \
-        if (UNLIKELY(stackFrame.globalData->exception.get())) \
+        if (UNLIKELY(stackFrame.globalData->exception)) \
             VM_THROW_EXCEPTION_AT_END(); \
     } while (0)
 #define CHECK_FOR_EXCEPTION_VOID() \
     do { \
-        if (UNLIKELY(stackFrame.globalData->exception.get())) { \
+        if (UNLIKELY(stackFrame.globalData->exception)) { \
             VM_THROW_EXCEPTION_AT_END(); \
             return; \
@@ -3473 +3473 @@
     STUB_INIT_STACK_FRAME(stackFrame);
     JSGlobalData* globalData = stackFrame.globalData;
-    ExceptionHandler handler = jitThrow(globalData, stackFrame.callFrame, globalData->exception.get(), globalData->exceptionLocation);
+    ExceptionHandler handler = jitThrow(globalData, stackFrame.callFrame, globalData->exception, globalData->exceptionLocation);
     STUB_SET_RETURN_ADDRESS(handler.catchRoutine);
     return handler.callFrame;