- Revision
- 144023
- Author
- commit-qu...@webkit.org
- Date
- 2013-02-26 01:07:57 -0800 (Tue, 26 Feb 2013)
Log Message
Unreviewed, rolling out r144004.
http://trac.webkit.org/changeset/144004
https://bugs.webkit.org/show_bug.cgi?id=110858
This iOS change is outdated (Requested by notbenjamin on
#webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2013-02-26
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
* bytecompiler/BytecodeGenerator.h:
(JSC::BytecodeGenerator::emitNode):
(JSC::BytecodeGenerator::emitNodeInConditionContext):
(BytecodeGenerator):
* parser/Parser.cpp:
(JSC::::Parser):
* parser/Parser.h:
(JSC::Parser::canRecurse):
(Parser):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (144022 => 144023)
--- trunk/Source/_javascript_Core/ChangeLog 2013-02-26 09:06:12 UTC (rev 144022)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-02-26 09:07:57 UTC (rev 144023)
@@ -1,3 +1,24 @@
+2013-02-26 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r144004.
+ http://trac.webkit.org/changeset/144004
+ https://bugs.webkit.org/show_bug.cgi?id=110858
+
+ This iOS change is outdated (Requested by notbenjamin on
+ #webkit).
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ * bytecompiler/BytecodeGenerator.h:
+ (JSC::BytecodeGenerator::emitNode):
+ (JSC::BytecodeGenerator::emitNodeInConditionContext):
+ (BytecodeGenerator):
+ * parser/Parser.cpp:
+ (JSC::::Parser):
+ * parser/Parser.h:
+ (JSC::Parser::canRecurse):
+ (Parser):
+
2013-02-25 Filip Pizlo <fpi...@apple.com>
REGRESSION(r143654): some jquery test asserts on 32 bit debug build
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (144022 => 144023)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2013-02-26 09:06:12 UTC (rev 144022)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2013-02-26 09:07:57 UTC (rev 144023)
@@ -248,9 +248,7 @@
#ifndef NDEBUG
, m_lastOpcodePosition(0)
#endif
-#if !USE(WEB_THREAD)
, m_stack(wtfThreadData().stack())
-#endif
, m_usesExceptions(false)
, m_expressionTooDeep(false)
{
@@ -297,9 +295,7 @@
#ifndef NDEBUG
, m_lastOpcodePosition(0)
#endif
-#if !USE(WEB_THREAD)
, m_stack(wtfThreadData().stack())
-#endif
, m_usesExceptions(false)
, m_expressionTooDeep(false)
{
@@ -494,9 +490,7 @@
#ifndef NDEBUG
, m_lastOpcodePosition(0)
#endif
-#if !USE(WEB_THREAD)
, m_stack(wtfThreadData().stack())
-#endif
, m_usesExceptions(false)
, m_expressionTooDeep(false)
{
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h (144022 => 144023)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2013-02-26 09:06:12 UTC (rev 144022)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2013-02-26 09:07:57 UTC (rev 144023)
@@ -47,7 +47,6 @@
#include <wtf/PassRefPtr.h>
#include <wtf/SegmentedVector.h>
#include <wtf/Vector.h>
-#include <wtf/WTFThreadData.h>
namespace JSC {
@@ -312,12 +311,9 @@
// Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary.
ASSERT(!dst || dst == ignoredResult() || !dst->isTemporary() || dst->refCount());
addLineInfo(n->lineNo());
-#if USE(WEB_THREAD)
- bool isSafeToRecurse = wtfThreadData().stack().isSafeToRecurse();
-#else
- bool isSafeToRecurse = m_stack.isSafeToRecurse();
-#endif
- return isSafeToRecurse ? n->emitBytecode(*this, dst) : emitThrowExpressionTooDeepException();
+ return m_stack.isSafeToRecurse()
+ ? n->emitBytecode(*this, dst)
+ : emitThrowExpressionTooDeepException();
}
RegisterID* emitNode(Node* n)
@@ -328,12 +324,7 @@
void emitNodeInConditionContext(ExpressionNode* n, Label* trueTarget, Label* falseTarget, bool fallThroughMeansTrue)
{
addLineInfo(n->lineNo());
-#if USE(WEB_THREAD)
- bool isSafeToRecurse = wtfThreadData().stack().isSafeToRecurse();
-#else
- bool isSafeToRecurse = m_stack.isSafeToRecurse();
-#endif
- if (isSafeToRecurse)
+ if (m_stack.isSafeToRecurse())
n->emitBytecodeInConditionContext(*this, trueTarget, falseTarget, fallThroughMeansTrue);
else
emitThrowExpressionTooDeepException();
@@ -783,9 +774,8 @@
#ifndef NDEBUG
size_t m_lastOpcodePosition;
#endif
-#if !USE(WEB_THREAD)
+
StackBounds m_stack;
-#endif
bool m_usesExceptions;
bool m_expressionTooDeep;
Modified: trunk/Source/_javascript_Core/parser/Parser.cpp (144022 => 144023)
--- trunk/Source/_javascript_Core/parser/Parser.cpp 2013-02-26 09:06:12 UTC (rev 144022)
+++ trunk/Source/_javascript_Core/parser/Parser.cpp 2013-02-26 09:07:57 UTC (rev 144023)
@@ -33,6 +33,7 @@
#include <utility>
#include <wtf/HashFunctions.h>
#include <wtf/OwnPtr.h>
+#include <wtf/WTFThreadData.h>
#define fail() do { if (!m_error) updateErrorMessage(); return 0; } while (0)
#define failWithToken(tok) do { if (!m_error) updateErrorMessage(tok); return 0; } while (0)
@@ -64,9 +65,7 @@
Parser<LexerType>::Parser(JSGlobalData* globalData, const SourceCode& source, FunctionParameters* parameters, const Identifier& name, JSParserStrictness strictness, JSParserMode parserMode)
: m_globalData(globalData)
, m_source(&source)
-#if !USE(WEB_THREAD)
, m_stack(wtfThreadData().stack())
-#endif
, m_hasStackOverflow(false)
, m_error(false)
, m_errorMessage("Parse error")
Modified: trunk/Source/_javascript_Core/parser/Parser.h (144022 => 144023)
--- trunk/Source/_javascript_Core/parser/Parser.h 2013-02-26 09:06:12 UTC (rev 144022)
+++ trunk/Source/_javascript_Core/parser/Parser.h 2013-02-26 09:07:57 UTC (rev 144023)
@@ -39,7 +39,6 @@
#include <wtf/Noncopyable.h>
#include <wtf/OwnPtr.h>
#include <wtf/RefPtr.h>
-#include <wtf/WTFThreadData.h>
namespace JSC {
struct Scope;
}
@@ -882,11 +881,7 @@
bool canRecurse()
{
-#if USE(WEB_THREAD)
- return wtfThreadData().stack().isSafeToRecurse();
-#else
return m_stack.isSafeToRecurse();
-#endif
}
int lastTokenEnd() const
@@ -898,10 +893,8 @@
const SourceCode* m_source;
ParserArena* m_arena;
OwnPtr<LexerType> m_lexer;
-
-#if !USE(WEB_THREAD)
+
StackBounds m_stack;
-#endif
bool m_hasStackOverflow;
bool m_error;
String m_errorMessage;
