Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(293)

Unified Diff: src/builtins/builtins-object.cc

Issue 2621913002: Revert of Internalize strings in-place (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/ast/ast-types.cc ('k') | src/code-stub-assembler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/builtins/builtins-object.cc
diff --git a/src/builtins/builtins-object.cc b/src/builtins/builtins-object.cc
index f216508c23c3952d8b67a000f8636cdfff34120a..6b2d5865103005bec4d78e82cdc5debd8ad126f5 100644
--- a/src/builtins/builtins-object.cc
+++ b/src/builtins/builtins-object.cc
@@ -37,26 +37,24 @@
Node* map = assembler.LoadMap(object);
Node* instance_type = assembler.LoadMapInstanceType(map);
- {
- Variable var_index(&assembler, MachineType::PointerRepresentation());
- Variable var_unique(&assembler, MachineRepresentation::kTagged);
-
- Label keyisindex(&assembler), if_iskeyunique(&assembler);
- assembler.TryToName(key, &keyisindex, &var_index, &if_iskeyunique,
- &var_unique, &call_runtime);
-
- assembler.Bind(&if_iskeyunique);
- assembler.TryHasOwnProperty(object, map, instance_type, var_unique.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);
- }
+ Variable var_index(&assembler, MachineType::PointerRepresentation());
+
+ 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, 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(&return_true);
assembler.Return(assembler.BooleanConstant(true));
« no previous file with comments | « src/ast/ast-types.cc ('k') | src/code-stub-assembler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698