Revert of Internalize strings in-place

src/builtins/builtins-object.cc

 // Copyright 2016 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/builtins/builtins-utils.h"
 #include "src/builtins/builtins.h"
 #include "src/code-factory.h"
 #include "src/code-stub-assembler.h"
 #include "src/property-descriptor.h"
 
@@ skipping 19 matching lines @@
 
   // Smi receivers do not have own properties.
   Label if_objectisnotsmi(&assembler);
   assembler.Branch(assembler.TaggedIsSmi(object), &return_false,
                    &if_objectisnotsmi);
   assembler.Bind(&if_objectisnotsmi);
 
   Node* map = assembler.LoadMap(object);
   Node* instance_type = assembler.LoadMapInstanceType(map);
 
-  {
-    Variable var_index(&assembler, MachineType::PointerRepresentation());
-    Variable var_unique(&assembler, MachineRepresentation::kTagged);
+  Variable var_index(&assembler, MachineType::PointerRepresentation());
 
-    Label keyisindex(&assembler), if_iskeyunique(&assembler);
-    assembler.TryToName(key, &keyisindex, &var_index, &if_iskeyunique,
-                        &var_unique, &call_runtime);
+  Label keyisindex(&assembler), if_iskeyunique(&assembler);
+  assembler.TryToName(key, &keyisindex, &var_index, &if_iskeyunique,
+                      &call_runtime);
 
-    assembler.Bind(&if_iskeyunique);
-    assembler.TryHasOwnProperty(object, map, instance_type, var_unique.value(),
-                                &return_true, &return_false, &call_runtime);
+  assembler.Bind(&if_iskeyunique);
+  assembler.TryHasOwnProperty(object, map, instance_type, key, &return_true,
+                              &return_false, &call_runtime);
 
-    assembler.Bind(&keyisindex);
-    // Handle negative keys in the runtime.
-    assembler.GotoIf(assembler.IntPtrLessThan(var_index.value(),
-                                              assembler.IntPtrConstant(0)),
-                     &call_runtime);
-    assembler.TryLookupElement(object, map, instance_type, var_index.value(),
-                               &return_true, &return_false, &call_runtime);
-  }
+  assembler.Bind(&keyisindex);
+  // Handle negative keys in the runtime.
+  assembler.GotoIf(
+      assembler.IntPtrLessThan(var_index.value(), assembler.IntPtrConstant(0)),
+      &call_runtime);
+  assembler.TryLookupElement(object, map, instance_type, var_index.value(),
+                             &return_true, &return_false, &call_runtime);
+
   assembler.Bind(&return_true);
   assembler.Return(assembler.BooleanConstant(true));
 
   assembler.Bind(&return_false);
   assembler.Return(assembler.BooleanConstant(false));
 
   assembler.Bind(&call_runtime);
   assembler.Return(assembler.CallRuntime(Runtime::kObjectHasOwnProperty,
                                          context, object, key));
 }
@@ skipping 917 matching lines @@
   CodeStubAssembler assembler(state);
 
   Node* object = assembler.Parameter(Descriptor::kObject);
   Node* context = assembler.Parameter(Descriptor::kContext);
 
   assembler.Return(assembler.GetSuperConstructor(object, context));
 }
 
 }  // namespace internal
 }  // namespace v8