1 files changed, 18 insertions, 18 deletions

diff --git a/deps/v8/src/string-builder.cc b/deps/v8/src/string-builder.cc
index 66ccb77184..57571a11a1 100644
--- a/deps/v8/src/string-builder.cc
+++ b/deps/v8/src/string-builder.cc
@@ -12,12 +12,12 @@ namespace v8 {
 namespace internal {
 
 template <typename sinkchar>
-void StringBuilderConcatHelper(String* special, sinkchar* sink,
-                               FixedArray* fixed_array, int array_length) {
+void StringBuilderConcatHelper(String special, sinkchar* sink,
+                               FixedArray fixed_array, int array_length) {
   DisallowHeapAllocation no_gc;
   int position = 0;
   for (int i = 0; i < array_length; i++) {
-    Object* element = fixed_array->get(i);
+    Object element = fixed_array->get(i);
     if (element->IsSmi()) {
       // Smi encoding of position and length.
       int encoded_slice = Smi::ToInt(element);
@@ -29,7 +29,7 @@ void StringBuilderConcatHelper(String* special, sinkchar* sink,
         len = StringBuilderSubstringLength::decode(encoded_slice);
       } else {
         // Position and length encoded in two smis.
-        Object* obj = fixed_array->get(++i);
+        Object obj = fixed_array->get(++i);
         DCHECK(obj->IsSmi());
         pos = Smi::ToInt(obj);
         len = -encoded_slice;
@@ -37,7 +37,7 @@ void StringBuilderConcatHelper(String* special, sinkchar* sink,
       String::WriteToFlat(special, sink + position, pos, pos + len);
       position += len;
     } else {
-      String* string = String::cast(element);
+      String string = String::cast(element);
       int element_length = string->length();
       String::WriteToFlat(string, sink + position, 0, element_length);
       position += element_length;
@@ -45,21 +45,21 @@ void StringBuilderConcatHelper(String* special, sinkchar* sink,
   }
 }
 
-template void StringBuilderConcatHelper<uint8_t>(String* special, uint8_t* sink,
-                                                 FixedArray* fixed_array,
+template void StringBuilderConcatHelper<uint8_t>(String special, uint8_t* sink,
+                                                 FixedArray fixed_array,
                                                  int array_length);
 
-template void StringBuilderConcatHelper<uc16>(String* special, uc16* sink,
-                                              FixedArray* fixed_array,
+template void StringBuilderConcatHelper<uc16>(String special, uc16* sink,
+                                              FixedArray fixed_array,
                                               int array_length);
 
-int StringBuilderConcatLength(int special_length, FixedArray* fixed_array,
+int StringBuilderConcatLength(int special_length, FixedArray fixed_array,
                               int array_length, bool* one_byte) {
   DisallowHeapAllocation no_gc;
   int position = 0;
   for (int i = 0; i < array_length; i++) {
     int increment = 0;
-    Object* elt = fixed_array->get(i);
+    Object elt = fixed_array->get(i);
     if (elt->IsSmi()) {
       // Smi encoding of position and length.
       int smi_value = Smi::ToInt(elt);
@@ -75,7 +75,7 @@ int StringBuilderConcatLength(int special_length, FixedArray* fixed_array,
         // Get the position and check that it is a positive smi.
         i++;
         if (i >= array_length) return -1;
-        Object* next_smi = fixed_array->get(i);
+        Object next_smi = fixed_array->get(i);
         if (!next_smi->IsSmi()) return -1;
         pos = Smi::ToInt(next_smi);
         if (pos < 0) return -1;
@@ -85,7 +85,7 @@ int StringBuilderConcatLength(int special_length, FixedArray* fixed_array,
       if (pos > special_length || len > special_length - pos) return -1;
       increment = len;
     } else if (elt->IsString()) {
-      String* element = String::cast(elt);
+      String element = String::cast(elt);
       int element_length = element->length();
       increment = element_length;
       if (*one_byte && !element->HasOnlyOneByteChars()) {
@@ -139,7 +139,7 @@ void FixedArrayBuilder::EnsureCapacity(Isolate* isolate, int elements) {
   }
 }
 
-void FixedArrayBuilder::Add(Object* value) {
+void FixedArrayBuilder::Add(Object value) {
   DCHECK(!value->IsSmi());
   DCHECK(length_ < capacity());
   array_->set(length_, value);
@@ -147,7 +147,7 @@ void FixedArrayBuilder::Add(Object* value) {
   has_non_smi_elements_ = true;
 }
 
-void FixedArrayBuilder::Add(Smi* value) {
+void FixedArrayBuilder::Add(Smi value) {
   DCHECK(value->IsSmi());
   DCHECK(length_ < capacity());
   array_->set(length_, value);
@@ -203,7 +203,7 @@ MaybeHandle<String> ReplacementStringBuilder::ToString() {
         String);
 
     DisallowHeapAllocation no_gc;
-    uint8_t* char_buffer = seq->GetChars();
+    uint8_t* char_buffer = seq->GetChars(no_gc);
     StringBuilderConcatHelper(*subject_, char_buffer, *array_builder_.array(),
                               array_builder_.length());
     joined_string = Handle<String>::cast(seq);
@@ -215,7 +215,7 @@ MaybeHandle<String> ReplacementStringBuilder::ToString() {
         String);
 
     DisallowHeapAllocation no_gc;
-    uc16* char_buffer = seq->GetChars();
+    uc16* char_buffer = seq->GetChars(no_gc);
     StringBuilderConcatHelper(*subject_, char_buffer, *array_builder_.array(),
                               array_builder_.length());
     joined_string = Handle<String>::cast(seq);
@@ -223,7 +223,7 @@ MaybeHandle<String> ReplacementStringBuilder::ToString() {
   return joined_string;
 }
 
-void ReplacementStringBuilder::AddElement(Object* element) {
+void ReplacementStringBuilder::AddElement(Object element) {
   DCHECK(element->IsSmi() || element->IsString());
   DCHECK(array_builder_.capacity() > array_builder_.length());
   array_builder_.Add(element);