Fix DCHECK on SetBookmark.

src/scanner-character-streams.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/scanner-character-streams.h"
 
 #include "include/v8.h"
 #include "src/handles.h"
@@ skipping 370 matching lines @@
     // Did we use all the data in the data chunk?
     if (current_data_offset_ == current_data_length_) {
       FlushCurrent();
     }
   }
   return data_in_buffer;
 }
 
 
 bool ExternalStreamingStream::SetBookmark() {
-  DCHECK(utf8_split_char_buffer_length_ == 0);  // We can't be within a char.
-
   // Bookmarking for this stream is a bit more complex than expected, since
   // the stream state is distributed over several places:
   // - pos_ (inherited from Utf16CharacterStream)
   // - buffer_cursor_ and buffer_end_ (also from Utf16CharacterStream)
   // - buffer_ (from BufferedUtf16CharacterStream)
   // - current_data_ (+ .._offset_ and .._length) (this class)
+  // - utf8_split_char_buffer_* (a partial utf8 symbol at the block boundary)
   //
   // The underlying source_stream_ instance likely could re-construct this
   // local data for us, but with the given interfaces we have no way of
   // accomplishing this. Thus, we'll have to save all data locally.
   //
   // What gets saved where:
   // - pos_  =>  bookmark_
   // - buffer_[buffer_cursor_ .. buffer_end_]  =>  bookmark_buffer_
   // - current_data_[.._offset_ .. .._length_]  =>  bookmark_data_
+  // - utf8_split_char_buffer_* => bookmark_utf8_split...
 
   bookmark_ = pos_;
 
   size_t buffer_length = buffer_end_ - buffer_cursor_;
   bookmark_buffer_.Dispose();
   bookmark_buffer_ = Vector<uint16_t>::New(static_cast<int>(buffer_length));
   CopyCharsUnsigned(bookmark_buffer_.start(), buffer_cursor_, buffer_length);
 
   size_t data_length = current_data_length_ - current_data_offset_;
   bookmark_data_.Dispose();
   bookmark_data_ = Vector<uint8_t>::New(static_cast<int>(data_length));
   CopyBytes(bookmark_data_.start(), current_data_ + current_data_offset_,
             data_length);
 
+  bookmark_utf8_split_char_buffer_length_ = utf8_split_char_buffer_length_;
+  for (size_t i = 0; i < utf8_split_char_buffer_length_; i++)
+    bookmark_utf8_split_char_buffer_[i] = utf8_split_char_buffer_[i];

[Jakob Kummerow, 2015/05/27 15:10:40]

nit: V8 wants {} (unless header and body fit on the same line). Again below.

[vogelheim, 2015/05/27 15:17:55]

Done.

+
   return source_stream_->SetBookmark();
 }
 
 
 void ExternalStreamingStream::ResetToBookmark() {
   source_stream_->ResetToBookmark();
   FlushCurrent();
 
   pos_ = bookmark_;
 
   // current_data_ can point to bookmark_data_'s buffer.
   current_data_ = bookmark_data_.start();
   current_data_offset_ = 0;
   current_data_length_ = bookmark_data_.length();
 
   // bookmark_buffer_ needs to be copied to buffer_.
   CopyCharsUnsigned(buffer_, bookmark_buffer_.begin(),
                     bookmark_buffer_.length());
   buffer_cursor_ = buffer_;
   buffer_end_ = buffer_ + bookmark_buffer_.length();
+
+  // utf8 split char buffer
+  utf8_split_char_buffer_length_ = bookmark_utf8_split_char_buffer_length_;
+  for (size_t i = 0; i < bookmark_utf8_split_char_buffer_length_; i++)
+    utf8_split_char_buffer_[i] = bookmark_utf8_split_char_buffer_[i];
 }
 
 
 void ExternalStreamingStream::FlushCurrent() {
   delete[] current_data_;
   current_data_ = NULL;
   current_data_length_ = 0;
   current_data_offset_ = 0;
 }
 
@@ skipping 86 matching lines @@
   return true;
 }
 
 
 void ExternalTwoByteStringUtf16CharacterStream::ResetToBookmark() {
   DCHECK(bookmark_ != kNoBookmark);
   pos_ = bookmark_;
   buffer_cursor_ = raw_data_ + bookmark_;
 }
 } }  // namespace v8::internal