diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
| commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
| tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /JavaScriptCore/parser/JSParser.cpp | |
| parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
| download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 | |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'JavaScriptCore/parser/JSParser.cpp')
| -rw-r--r-- | JavaScriptCore/parser/JSParser.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/JavaScriptCore/parser/JSParser.cpp b/JavaScriptCore/parser/JSParser.cpp index 3baceba..6852de1 100644 --- a/JavaScriptCore/parser/JSParser.cpp +++ b/JavaScriptCore/parser/JSParser.cpp @@ -33,6 +33,7 @@ using namespace JSC; #include "NodeInfo.h" #include "ASTBuilder.h" #include <wtf/HashFunctions.h> +#include <wtf/WTFThreadData.h> #include <utility> using namespace std; @@ -220,12 +221,7 @@ JSParser::JSParser(Lexer* lexer, JSGlobalData* globalData, SourceProvider* provi , m_nonLHSCount(0) , m_syntaxAlreadyValidated(provider->isValid()) { - m_endAddress = *(globalData->stackGuards); - if (!m_endAddress) { - char sample = 0; - m_endAddress = &sample - kMaxParserStackUsage; - *(globalData->stackGuards) = m_endAddress; - } + m_endAddress = wtfThreadData().approximatedStackStart() - kMaxParserStackUsage; next(); m_lexer->setLastLineNumber(tokenLine()); } |