Merge revision 8082 to trunk (fixes crbug 83877)

src/json-parser.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 362 matching lines @@
                                                 NOT_TENURED);
   Handle<SeqTwoByteString> seq_two_byte =
       Handle<SeqTwoByteString>::cast(two_byte);
 
   int allocation_count = 1;
   int count = 0;
 
   while (c0_ != '"') {
     // Create new seq string
     if (count >= kInitialSpecialStringSize * allocation_count) {
-      allocation_count++;
+      allocation_count = allocation_count * 2;
       int new_size = allocation_count * kInitialSpecialStringSize;
       Handle<String> new_two_byte =
           isolate()->factory()->NewRawTwoByteString(new_size,
                                                     NOT_TENURED);
       uc16* char_start =
           Handle<SeqTwoByteString>::cast(new_two_byte)->GetChars();
       String::WriteToFlat(*seq_two_byte, char_start, 0, count);
       seq_two_byte = Handle<SeqTwoByteString>::cast(new_two_byte);
     }
 
@@ skipping 42 matching lines @@
           return Token::ILLEGAL;
       }
       Advance();
     }
   }
   // Advance past the last '"'.
   ASSERT_EQ('"', c0_);
   Advance();
 
   // Shrink the the string to our length.
-  isolate()->heap()->
-      new_space()->
-      ShrinkStringAtAllocationBoundary<SeqTwoByteString>(*seq_two_byte,
-                                                         count);
+  if (isolate()->heap()->InNewSpace(*seq_two_byte)) {
+    isolate()->heap()->new_space()->
+          ShrinkStringAtAllocationBoundary<SeqTwoByteString>(*seq_two_byte,
+                                                             count);
+  } else {
+    int string_size = SeqTwoByteString::SizeFor(count);
+    int allocated_string_size =
+        SeqTwoByteString::SizeFor(kInitialSpecialStringSize * allocation_count);
+    int delta = allocated_string_size - string_size;
+    Address start_filler_object = seq_two_byte->address() + string_size;
+    isolate()->heap()->CreateFillerObjectAt(start_filler_object, delta);
+  }
   string_val_ = isolate()->factory()->NewConsString(ascii, seq_two_byte);
   return Token::STRING;
 }
 
 
 Token::Value JsonParser::ScanJsonString() {
   ASSERT_EQ('"', c0_);
   // Set string_val to null. If string_val is not set we assume an
   // ascii string begining at next_.beg_pos + 1 to next_.end_pos - 1.
   string_val_ = Handle<String>::null();
@@ skipping 35 matching lines @@
     return isolate()->factory()->LookupAsciiSymbol(seq_source_,
                                                    current_.beg_pos + 1,
                                                    length);
   }
   // The current token includes the '"' in both ends.
   return  isolate()->factory()->NewSubString(
       source_, current_.beg_pos + 1, current_.end_pos - 1);
 }
 
 } }  // namespace v8::internal