Changeset 161104 in webkit

Timestamp:

Dec 27, 2013 10:39:04 AM (10 years ago)

Author:

mark.lam@apple.com

Message:

CStack: Cosmetic: rename VM::entryScope to firstEntryScope.
​https://bugs.webkit.org/show_bug.cgi?id=126266.

Not yet reviewed.

Also renamed VMEntryScope::m_prev to m_prevFirstEntryScope.

• debugger/Debugger.cpp:

(JSC::Debugger::recompileAllJSFunctions):

• heap/Heap.cpp:

(JSC::Heap::lastChanceToFinalize):
(JSC::Heap::deleteAllCompiledCode):

• interpreter/CallFrame.cpp:

(JSC::CallFrame::vmEntryGlobalObject):

• interpreter/JSStack.cpp:

(JSC::JSStack::updateStackLimit):

• runtime/VM.cpp:

(JSC::VM::VM):
(JSC::VM::releaseExecutableMemory):

• runtime/VM.h:
• runtime/VMEntryScope.cpp:

(JSC::VMEntryScope::VMEntryScope):
(JSC::VMEntryScope::~VMEntryScope):

• runtime/VMEntryScope.h:

Location:

branches/jsCStack/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• debugger/Debugger.cpp (modified) (1 diff)
• heap/Heap.cpp (modified) (2 diffs)
• interpreter/CallFrame.cpp (modified) (1 diff)
• interpreter/JSStack.cpp (modified) (1 diff)
• runtime/VM.cpp (modified) (2 diffs)
• runtime/VM.h (modified) (1 diff)
• runtime/VMEntryScope.cpp (modified) (2 diffs)
• runtime/VMEntryScope.h (modified) (1 diff)

branches/jsCStack/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-12-27  Mark Lam  <mark.lam@apple.com>
+
+        CStack: Cosmetic: rename VM::entryScope to firstEntryScope.
+        https://bugs.webkit.org/show_bug.cgi?id=126266.
+
+        Not yet reviewed.
+
+        Also renamed VMEntryScope::m_prev to m_prevFirstEntryScope.
+
+        * debugger/Debugger.cpp:
+        (JSC::Debugger::recompileAllJSFunctions):
+        * heap/Heap.cpp:
+        (JSC::Heap::lastChanceToFinalize):
+        (JSC::Heap::deleteAllCompiledCode):
+        * interpreter/CallFrame.cpp:
+        (JSC::CallFrame::vmEntryGlobalObject):
+        * interpreter/JSStack.cpp:
+        (JSC::JSStack::updateStackLimit):
+        * runtime/VM.cpp:
+        (JSC::VM::VM):
+        (JSC::VM::releaseExecutableMemory):
+        * runtime/VM.h:
+        * runtime/VMEntryScope.cpp:
+        (JSC::VMEntryScope::VMEntryScope):
+        (JSC::VMEntryScope::~VMEntryScope):
+        * runtime/VMEntryScope.h:
+
 2013-12-25  Mark Lam  <mark.lam@apple.com>
 

branches/jsCStack/Source/JavaScriptCore/debugger/Debugger.cpp

@@ -197 +197 @@
     // If JavaScript is running, it's not safe to recompile, since we'll end
     // up throwing away code that is live on the stack.
-    ASSERT(!vm->entryScope);
-    if (vm->entryScope)
+    ASSERT(!vm->firstEntryScope);
+    if (vm->firstEntryScope)
         return;
     

branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp

@@ -292 +292 @@
 void Heap::lastChanceToFinalize()
 {
-    RELEASE_ASSERT(!m_vm->entryScope);
+    RELEASE_ASSERT(!m_vm->firstEntryScope);
     RELEASE_ASSERT(m_operationInProgress == NoOperation);
 
@@ -696 +696 @@
     // If JavaScript is running, it's not safe to delete code, since we'll end
     // up deleting code that is live on the stack.
-    if (m_vm->entryScope)
+    if (m_vm->firstEntryScope)
         return;
 

branches/jsCStack/Source/JavaScriptCore/interpreter/CallFrame.cpp

@@ -131 +131 @@
     // For any ExecState that's not a globalExec, the 
     // dynamic global object must be set since code is running
-    ASSERT(vm().entryScope);
-    return vm().entryScope->globalObject();
+    ASSERT(vm().firstEntryScope);
+    return vm().firstEntryScope->globalObject();
 }
 

branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp

@@ -205 +205 @@
         disableErrorStackReserve();
 #endif
-    if (m_vm.entryScope)
-        m_vm.entryScope->updateStackLimit();
+    if (m_vm.firstEntryScope)
+        m_vm.firstEntryScope->updateStackLimit();
 }
 

branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp

@@ -199 +199 @@
     , jsFinalObjectClassInfo(JSFinalObject::info())
     , sizeOfLastScratchBuffer(0)
-    , entryScope(0)
+    , firstEntryScope(0)
     , m_enabledProfiler(0)
     , m_regExpCache(new RegExpCache(this))
@@ -551 +551 @@
     prepareToDiscardCode();
     
-    if (entryScope) {
+    if (firstEntryScope) {
         StackPreservingRecompiler recompiler;
         HeapIterationScope iterationScope(heap);

branches/jsCStack/Source/JavaScriptCore/runtime/VM.h

@@ -427 +427 @@
         void gatherConservativeRoots(ConservativeRoots&);
 
-        VMEntryScope* entryScope;
+        VMEntryScope* firstEntryScope;
 
         HashSet<JSObject*> stringRecursionCheckVisitedObjects;

branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.cpp

@@ -36 +36 @@
     , m_stack(wtfThreadData().stack())
     , m_globalObject(globalObject)
-    , m_prev(vm.entryScope)
+    , m_prevFirstEntryScope(vm.firstEntryScope)
     , m_prevStackLimit(vm.stackLimit())
     , m_prevLastStackTop(vm.lastStackTop())
 {
-    if (!vm.entryScope) {
+    if (!vm.firstEntryScope) {
 #if ENABLE(ASSEMBLER)
         if (ExecutableAllocator::underMemoryPressure())
             vm.heap.deleteAllCompiledCode();
 #endif
-        vm.entryScope = this;
+        vm.firstEntryScope = this;
 
         // Reset the date cache between JS invocations to force the VM to
@@ -60 +60 @@
 VMEntryScope::~VMEntryScope()
 {
-    m_vm.entryScope = m_prev;
+    m_vm.firstEntryScope = m_prevFirstEntryScope;
     m_vm.setStackLimit(m_prevStackLimit);
     m_vm.setLastStackTop(m_prevLastStackTop);

branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.h

@@ -52 +52 @@
     JSGlobalObject* m_globalObject;
 
-    // m_prev, m_prevStackLimit & m_prevLastStackTop may belong to a different thread's stack.
-    VMEntryScope* m_prev;
+    // m_prevFirstEntryScope, m_prevStackLimit & m_prevLastStackTop may belong to a different thread's stack.
+    VMEntryScope* m_prevFirstEntryScope;
     void* m_prevStackLimit;
     void* m_prevLastStackTop;