JavaScriptCore-621.1.tar.gz

[apple/javascriptcore.git] / parser / Lexer.cpp

diff --git a/parser/Lexer.cpp b/parser/Lexer.cpp
index 682edb6a03ef039a25730acc4d8342162cde2996..bdeb04936c2b1d4af970ea7482b7e55d9c093e22 100644 (file)
--- a/parser/Lexer.cpp
+++ b/parser/Lexer.cpp
@@ -52,8 +52,6 @@ Lexer::Lexer(JSGlobalData* globalData)
     , m_globalData(globalData)
     , m_keywordTable(JSC::mainTable)
 {
     , m_globalData(globalData)
     , m_keywordTable(JSC::mainTable)
 {

-    m_buffer8.reserveInitialCapacity(initialReadBufferCapacity);
-    m_buffer16.reserveInitialCapacity(initialReadBufferCapacity);

 }
 
 Lexer::~Lexer()
 }
 
 Lexer::~Lexer()


@@ -149,6 +147,9 @@ void Lexer::setCode(const SourceCode& source, ParserArena& arena)
     m_error = false;
     m_atLineStart = true;
 
     m_error = false;
     m_atLineStart = true;
 

+    m_buffer8.reserveInitialCapacity(initialReadBufferCapacity);
+    m_buffer16.reserveInitialCapacity((m_codeEnd - m_code) / 2);
+

     // ECMA-262 calls for stripping all Cf characters, but we only strip BOM characters.
     // See <https://bugs.webkit.org/show_bug.cgi?id=4931> for details.
     if (source.provider()->hasBOMs()) {
     // ECMA-262 calls for stripping all Cf characters, but we only strip BOM characters.
     // See <https://bugs.webkit.org/show_bug.cgi?id=4931> for details.
     if (source.provider()->hasBOMs()) {


@@ -1009,11 +1010,9 @@ void Lexer::clear()
     m_codeWithoutBOMs.clear();
 
     Vector<char> newBuffer8;
     m_codeWithoutBOMs.clear();
 
     Vector<char> newBuffer8;

-    newBuffer8.reserveInitialCapacity(initialReadBufferCapacity);

     m_buffer8.swap(newBuffer8);
 
     Vector<UChar> newBuffer16;
     m_buffer8.swap(newBuffer8);
 
     Vector<UChar> newBuffer16;

-    newBuffer16.reserveInitialCapacity(initialReadBufferCapacity);

     m_buffer16.swap(newBuffer16);
 
     m_isReparsing = false;
     m_buffer16.swap(newBuffer16);
 
     m_isReparsing = false;