Revert of Internalize strings in-place

test/cctest/test-code-stub-assembler.cc

 // Copyright 2015 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/base/utils/random-number-generator.h"
 #include "src/builtins/builtins-promise.h"
 #include "src/code-factory.h"
 #include "src/code-stub-assembler.h"
 #include "src/compiler/node.h"
 #include "src/isolate.h"
@@ skipping 221 matching lines @@
   CodeStubAssembler m(data.state());
 
   enum Result { kKeyIsIndex, kKeyIsUnique, kBailout };
   {
     Node* key = m.Parameter(0);
     Node* expected_result = m.Parameter(1);
     Node* expected_arg = m.Parameter(2);
 
     Label passed(&m), failed(&m);
     Label if_keyisindex(&m), if_keyisunique(&m), if_bailout(&m);
-    {
-      Variable var_index(&m, MachineType::PointerRepresentation());
-      Variable var_unique(&m, MachineRepresentation::kTagged);
+    Variable var_index(&m, MachineType::PointerRepresentation());
 
-      m.TryToName(key, &if_keyisindex, &var_index, &if_keyisunique, &var_unique,
-                  &if_bailout);
+    m.TryToName(key, &if_keyisindex, &var_index, &if_keyisunique, &if_bailout);
 
-      m.Bind(&if_keyisindex);
-      m.GotoUnless(m.WordEqual(expected_result,
-                               m.SmiConstant(Smi::FromInt(kKeyIsIndex))),
-                   &failed);
-      m.Branch(m.WordEqual(m.SmiUntag(expected_arg), var_index.value()),
-               &passed, &failed);
+    m.Bind(&if_keyisindex);
+    m.GotoUnless(
+        m.WordEqual(expected_result, m.SmiConstant(Smi::FromInt(kKeyIsIndex))),
+        &failed);
+    m.Branch(m.WordEqual(m.SmiUntag(expected_arg), var_index.value()), &passed,
+             &failed);
 
-      m.Bind(&if_keyisunique);
-      m.GotoUnless(m.WordEqual(expected_result,
-                               m.SmiConstant(Smi::FromInt(kKeyIsUnique))),
-                   &failed);
-      m.Branch(m.WordEqual(expected_arg, var_unique.value()), &passed, &failed);
-    }
+    m.Bind(&if_keyisunique);
+    m.GotoUnless(
+        m.WordEqual(expected_result, m.SmiConstant(Smi::FromInt(kKeyIsUnique))),
+        &failed);
+    m.Branch(m.WordEqual(expected_arg, key), &passed, &failed);
 
     m.Bind(&if_bailout);
     m.Branch(
         m.WordEqual(expected_result, m.SmiConstant(Smi::FromInt(kBailout))),
         &passed, &failed);
 
     m.Bind(&passed);
     m.Return(m.BooleanConstant(true));
 
     m.Bind(&failed);
@@ skipping 75 matching lines @@
     Handle<String> key = isolate->factory()->NewStringFromAsciiChecked("153");
     CHECK(!key->HasHashCode());
     ft.CheckTrue(key, expect_bailout);
   }
 
   {
     // TryToName(<non-internalized string>) => bailout.
     Handle<Object> key = isolate->factory()->NewStringFromAsciiChecked("test");
     ft.CheckTrue(key, expect_bailout);
   }
-
-  {
-    // TryToName(<thin string>) => internalized version.
-    Handle<String> s = isolate->factory()->NewStringFromAsciiChecked("foo");
-    Handle<String> internalized = isolate->factory()->InternalizeString(s);
-    ft.CheckTrue(s, expect_unique, internalized);
-  }
-
-  {
-    // TryToName(<thin two-byte string>) => internalized version.
-    uc16 array1[] = {2001, 2002, 2003};
-    Vector<const uc16> str1(array1);
-    Handle<String> s =
-        isolate->factory()->NewStringFromTwoByte(str1).ToHandleChecked();
-    Handle<String> internalized = isolate->factory()->InternalizeString(s);
-    ft.CheckTrue(s, expect_unique, internalized);
-  }
 }
 
 namespace {
 
 template <typename Dictionary>
 void TestEntryToIndex() {
   Isolate* isolate(CcTest::InitIsolateOnce());
 
   const int kNumParams = 1;
   CodeAssemblerTester data(isolate, kNumParams);
@@ skipping 1866 matching lines @@
               .ToHandleChecked();
     Handle<Object> prop2 =
         JSReceiver::GetProperty(isolate, promise, "rejectedReason")
             .ToHandleChecked();
     CHECK_EQ(*rejected_str, *prop2);
   }
 }
 
 }  // namespace internal
 }  // namespace v8