From 5ea819f80c6840c492386bfafbffb059c7e2091f Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Tue, 23 Oct 2012 10:25:11 +0200
Subject: Imported WebKit commit 20434eb8eb95065803473139d8794e98a7672f75
 (http://svn.webkit.org/repository/webkit/trunk@132191)

New snapshot that should fix build with latest qtbase and the QPlastiqueStyle removal
---
 Source/JavaScriptCore/parser/Parser.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Source/JavaScriptCore/parser/Parser.h')

diff --git a/Source/JavaScriptCore/parser/Parser.h b/Source/JavaScriptCore/parser/Parser.h
index dc42d36ba..3b0316f81 100644
--- a/Source/JavaScriptCore/parser/Parser.h
+++ b/Source/JavaScriptCore/parser/Parser.h
@@ -896,6 +896,7 @@ private:
     OwnPtr<LexerType> m_lexer;
     
     StackBounds m_stack;
+    bool m_hasStackOverflow;
     bool m_error;
     String m_errorMessage;
     JSToken m_token;
@@ -987,7 +988,7 @@ PassRefPtr<ParsedNode> Parser<LexerType>::parse(JSGlobalObject* lexicalGlobalObj
         // we ran out of stack while parsing. If we see an error while parsing eval or program
         // code we assume that it was a syntax error since running out of stack is much less
         // likely, and we are currently unable to distinguish between the two cases.
-        if (isFunctionBodyNode(static_cast<ParsedNode*>(0)))
+        if (isFunctionBodyNode(static_cast<ParsedNode*>(0)) || m_hasStackOverflow)
             *exception = createStackOverflowError(lexicalGlobalObject);
         else if (isEvalNode<ParsedNode>())
             *exception = createSyntaxError(lexicalGlobalObject, errMsg);
-- 
cgit v1.2.1