Diff
Modified: branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog (105763 => 105764)
--- branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog 2012-01-24 19:28:13 UTC (rev 105763)
+++ branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog 2012-01-24 19:35:36 UTC (rev 105764)
@@ -1,3 +1,28 @@
+2011-01-24 Lucas Forschler <[email protected]>
+
+ Merge 105638
+
+ 2012-01-23 Mark Hahnenberg <[email protected]>
+
+ Remove StackBounds from JSGlobalData
+ https://bugs.webkit.org/show_bug.cgi?id=76310
+
+ Reviewed by Sam Weinig.
+
+ Removed StackBounds and the stack() function from JSGlobalData since it no
+ longer accessed any members of JSGlobalData.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ * heap/MachineStackMarker.cpp:
+ (JSC::MachineThreads::addCurrentThread):
+ (JSC::MachineThreads::gatherFromCurrentThread):
+ * parser/Parser.cpp:
+ (JSC::::Parser):
+ * runtime/JSGlobalData.cpp:
+ (JSC::JSGlobalData::JSGlobalData):
+ * runtime/JSGlobalData.h:
+
2012-01-15 Filip Pizlo <[email protected]>
Merge 105107.
Modified: branches/safari-534.54-branch/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (105763 => 105764)
--- branches/safari-534.54-branch/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2012-01-24 19:28:13 UTC (rev 105763)
+++ branches/safari-534.54-branch/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2012-01-24 19:35:36 UTC (rev 105764)
@@ -217,7 +217,7 @@
#ifndef NDEBUG
, m_lastOpcodePosition(0)
#endif
- , m_stack(m_globalData->stack())
+ , m_stack(wtfThreadData().stack())
, m_usesExceptions(false)
, m_expressionTooDeep(false)
{
@@ -288,7 +288,7 @@
#ifndef NDEBUG
, m_lastOpcodePosition(0)
#endif
- , m_stack(m_globalData->stack())
+ , m_stack(wtfThreadData().stack())
, m_usesExceptions(false)
, m_expressionTooDeep(false)
{
@@ -449,7 +449,7 @@
#ifndef NDEBUG
, m_lastOpcodePosition(0)
#endif
- , m_stack(m_globalData->stack())
+ , m_stack(wtfThreadData().stack())
, m_usesExceptions(false)
, m_expressionTooDeep(false)
{
Modified: branches/safari-534.54-branch/Source/_javascript_Core/heap/MachineStackMarker.cpp (105763 => 105764)
--- branches/safari-534.54-branch/Source/_javascript_Core/heap/MachineStackMarker.cpp 2012-01-24 19:28:13 UTC (rev 105763)
+++ branches/safari-534.54-branch/Source/_javascript_Core/heap/MachineStackMarker.cpp 2012-01-24 19:35:36 UTC (rev 105764)
@@ -197,7 +197,7 @@
return;
pthread_setspecific(m_threadSpecific, this);
- Thread* thread = new Thread(getCurrentPlatformThread(), m_heap->globalData()->stack().origin());
+ Thread* thread = new Thread(getCurrentPlatformThread(), wtfThreadData().stack().origin());
MutexLocker lock(m_registeredThreadsMutex);
@@ -261,7 +261,7 @@
conservativeRoots.add(registersBegin, registersEnd);
void* stackBegin = stackCurrent;
- void* stackEnd = m_heap->globalData()->stack().origin();
+ void* stackEnd = wtfThreadData().stack().origin();
swapIfBackwards(stackBegin, stackEnd);
conservativeRoots.add(stackBegin, stackEnd);
}
Modified: branches/safari-534.54-branch/Source/_javascript_Core/parser/Parser.cpp (105763 => 105764)
--- branches/safari-534.54-branch/Source/_javascript_Core/parser/Parser.cpp 2012-01-24 19:28:13 UTC (rev 105763)
+++ branches/safari-534.54-branch/Source/_javascript_Core/parser/Parser.cpp 2012-01-24 19:35:36 UTC (rev 105764)
@@ -44,7 +44,7 @@
Parser<LexerType>::Parser(JSGlobalData* globalData, const SourceCode& source, FunctionParameters* parameters, JSParserStrictness strictness, JSParserMode parserMode)
: m_globalData(globalData)
, m_source(&source)
- , m_stack(globalData->stack())
+ , m_stack(wtfThreadData().stack())
, m_error(false)
, m_errorMessage("Parse error")
, m_allowsIn(true)
Modified: branches/safari-534.54-branch/Source/_javascript_Core/runtime/JSGlobalData.cpp (105763 => 105764)
--- branches/safari-534.54-branch/Source/_javascript_Core/runtime/JSGlobalData.cpp 2012-01-24 19:28:13 UTC (rev 105763)
+++ branches/safari-534.54-branch/Source/_javascript_Core/runtime/JSGlobalData.cpp 2012-01-24 19:35:36 UTC (rev 105764)
@@ -223,8 +223,6 @@
#endif
{
interpreter = new Interpreter;
- if (globalDataType == Default)
- m_stack = wtfThreadData().stack();
// Need to be careful to keep everything consistent here
IdentifierTable* existingEntryIdentifierTable = wtfThreadData().setCurrentIdentifierTable(identifierTable);
Modified: branches/safari-534.54-branch/Source/_javascript_Core/runtime/JSGlobalData.h (105763 => 105764)
--- branches/safari-534.54-branch/Source/_javascript_Core/runtime/JSGlobalData.h 2012-01-24 19:28:13 UTC (rev 105763)
+++ branches/safari-534.54-branch/Source/_javascript_Core/runtime/JSGlobalData.h 2012-01-24 19:35:36 UTC (rev 105764)
@@ -230,13 +230,6 @@
bool canUseJIT() { return m_canUseJIT; }
#endif
- const StackBounds& stack()
- {
- return (globalDataType == Default)
- ? m_stack
- : wtfThreadData().stack();
- }
-
OwnPtr<ParserArena> parserArena;
OwnPtr<Keywords> keywords;
Interpreter* interpreter;
@@ -362,7 +355,6 @@
#if ENABLE(JIT) && ENABLE(INTERPRETER)
bool m_canUseJIT;
#endif
- StackBounds m_stack;
#if ENABLE(GC_VALIDATION)
bool m_isInitializingObject;
#endif
