diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-10-01 10:11:11 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-10-01 10:18:00 (GMT) |
| commit | a9d47220b9f0936550522d9a34748692701a2acf (patch) | |
| tree | 5060375b70f3d7b3f9a34d595647a94acd67df40 /src/3rdparty | |
| parent | 4ba85ab41513851236d62225b244b4364b825eaf (diff) | |
| download | Qt-a9d47220b9f0936550522d9a34748692701a2acf.zip Qt-a9d47220b9f0936550522d9a34748692701a2acf.tar.gz Qt-a9d47220b9f0936550522d9a34748692701a2acf.tar.bz2 | |
Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-staging-01102009 ( 79e88e90aab6674098b6d73b1b41998117164499 )
Diffstat (limited to 'src/3rdparty')
6 files changed, 22 insertions, 15 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog index 20bfc23..84a2935 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog @@ -2,6 +2,19 @@ Reviewed by Gavin Barraclough. + Reduce heap size on Symbian from 64MB to 8MB. + + This is not a perfect fix, it requires more fine tuning. + But this makes it possible again to debug in the emulator, + which is more important in order to be able to fix other + run-time issues. + + * runtime/Collector.h: + +2009-09-30 Janne Koskinen <janne.p.koskinen@digia.com> + + Reviewed by Simon Hausmann. + Avoid __clear_cache built-in function if DISABLE_BUILTIN_CLEAR_CACHE define is set https://bugs.webkit.org/show_bug.cgi?id=28886 diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/generated/Grammar.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/generated/Grammar.cpp index 44559a8..f1fa708 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/generated/Grammar.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/generated/Grammar.cpp @@ -432,7 +432,7 @@ typedef struct YYLTYPE template <typename T> inline void setStatementLocation(StatementNode* statement, const T& start, const T& end) { - statement->setLoc(start.first_line, end.last_line, start.first_column + 1); + statement->setLoc(start.first_line, end.last_line, start.first_column); } static inline void setExceptionLocation(ThrowableExpressionData* node, unsigned start, unsigned divot, unsigned end) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/parser/Grammar.y b/src/3rdparty/javascriptcore/JavaScriptCore/parser/Grammar.y index ffed3bb..fa4ffd0 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/parser/Grammar.y +++ b/src/3rdparty/javascriptcore/JavaScriptCore/parser/Grammar.y @@ -179,7 +179,7 @@ static inline void appendToVarDeclarationList(JSGlobalData* globalData, ParserAr template <typename T> inline void setStatementLocation(StatementNode* statement, const T& start, const T& end) { - statement->setLoc(start.first_line, end.last_line, start.first_column + 1); + statement->setLoc(start.first_line, end.last_line, start.first_column); } static inline void setExceptionLocation(ThrowableExpressionData* node, unsigned start, unsigned divot, unsigned end) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/parser/Lexer.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/parser/Lexer.cpp index ec700bd..a85ed3d 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/parser/Lexer.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/parser/Lexer.cpp @@ -59,7 +59,6 @@ static const UChar byteOrderMark = 0xFEFF; Lexer::Lexer(JSGlobalData* globalData) : m_isReparsing(false) , m_globalData(globalData) - , m_startColumnNumberCorrection(0) , m_keywordTable(JSC::mainTable) { m_buffer8.reserveInitialCapacity(initialReadBufferCapacity); @@ -204,7 +203,6 @@ void Lexer::shiftLineTerminator() else shift1(); - m_startColumnNumberCorrection = currentOffset(); ++m_lineNumber; } @@ -900,11 +898,11 @@ doneString: // Fall through into returnToken. returnToken: { - llocp->first_line = m_lineNumber; - llocp->last_line = m_lineNumber; - - llocp->first_column = startOffset - m_startColumnNumberCorrection; - llocp->last_column = currentOffset() - m_startColumnNumberCorrection; + int lineNumber = m_lineNumber; + llocp->first_line = lineNumber; + llocp->last_line = lineNumber; + llocp->first_column = startOffset; + llocp->last_column = currentOffset(); m_lastToken = token; return token; diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/parser/Lexer.h b/src/3rdparty/javascriptcore/JavaScriptCore/parser/Lexer.h index 885e4d9..174e05a 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/parser/Lexer.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/parser/Lexer.h @@ -86,10 +86,6 @@ namespace JSC { static const size_t initialReadBufferCapacity = 32; int m_lineNumber; - // this variable is supposed to keep index of last new line character ('\n' or '\r\n'or '\n\r'...) - // it is importent to calculate correct first_column in parser - int m_startColumnNumberCorrection; - Vector<char> m_buffer8; Vector<UChar> m_buffer16; diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION index edcf898..3d9c27c 100644 --- a/src/3rdparty/javascriptcore/VERSION +++ b/src/3rdparty/javascriptcore/VERSION @@ -4,8 +4,8 @@ This is a snapshot of JavaScriptCore from The commit imported was from the - jsc-for-qtscript-4.6-staging-30092009 branch/tag + jsc-for-qtscript-4.6-staging-01102009 branch/tag and has the sha1 checksum - e8f42cf0203bee0ba89a05e0e773d713782129b4 + 79e88e90aab6674098b6d73b1b41998117164499 |