Version 5.7.442.2 (cherry-pick)

src/builtins/builtins-object.cc

Index: src/builtins/builtins-object.cc
diff --git a/src/builtins/builtins-object.cc b/src/builtins/builtins-object.cc
index 52471a1715e243b73fd8df3e9bdbb79604486740..74e0a208320d30960b54a9c8a8c01bc6f026fe66 100644
--- a/src/builtins/builtins-object.cc
+++ b/src/builtins/builtins-object.cc
@@ -39,24 +39,21 @@ TF_BUILTIN(ObjectHasOwnProperty, ObjectBuiltinsAssembler) {
   Node* map = LoadMap(object);
   Node* instance_type = LoadMapInstanceType(map);
 
-  {
-    Variable var_index(this, MachineType::PointerRepresentation());
-    Variable var_unique(this, MachineRepresentation::kTagged);
-
-    Label keyisindex(this), if_iskeyunique(this);
-    TryToName(key, &keyisindex, &var_index, &if_iskeyunique, &var_unique,
-              &call_runtime);
-
-    Bind(&if_iskeyunique);
-    TryHasOwnProperty(object, map, instance_type, var_unique.value(),
-                      &return_true, &return_false, &call_runtime);
-
-    Bind(&keyisindex);
-    // Handle negative keys in the runtime.
-    GotoIf(IntPtrLessThan(var_index.value(), IntPtrConstant(0)), &call_runtime);
-    TryLookupElement(object, map, instance_type, var_index.value(),
-                     &return_true, &return_false, &call_runtime);
-  }
+  Variable var_index(this, MachineType::PointerRepresentation());
+
+  Label keyisindex(this), if_iskeyunique(this);
+  TryToName(key, &keyisindex, &var_index, &if_iskeyunique, &call_runtime);
+
+  Bind(&if_iskeyunique);
+  TryHasOwnProperty(object, map, instance_type, key, &return_true,
+                    &return_false, &call_runtime);
+
+  Bind(&keyisindex);
+  // Handle negative keys in the runtime.
+  GotoIf(IntPtrLessThan(var_index.value(), IntPtrConstant(0)), &call_runtime);
+  TryLookupElement(object, map, instance_type, var_index.value(), &return_true,
+                   &return_false, &call_runtime);
+
   Bind(&return_true);
   Return(BooleanConstant(true));