From dda2bd6f4f952c604ab836f04052684722480849 Mon Sep 17 00:00:00 2001 From: verwaest Date: Wed, 18 Mar 2015 12:53:37 -0700 Subject: [PATCH] Load from PropertyCells using PropertyCell::kValueOffset rather than Cell::kValueOffset BUG= Review URL: https://codereview.chromium.org/1019563002 Cr-Commit-Position: refs/heads/master@{#27280} --- src/ic/arm/handler-compiler-arm.cc | 2 +- src/ic/arm64/handler-compiler-arm64.cc | 2 +- src/ic/x64/handler-compiler-x64.cc | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ic/arm/handler-compiler-arm.cc b/src/ic/arm/handler-compiler-arm.cc index 28f3cef840..7f857ca5d9 100644 --- a/src/ic/arm/handler-compiler-arm.cc +++ b/src/ic/arm/handler-compiler-arm.cc @@ -728,7 +728,7 @@ Handle NamedLoadHandlerCompiler::CompileLoadGlobal( Register result = StoreDescriptor::ValueRegister(); Handle weak_cell = factory()->NewWeakCell(cell); __ LoadWeakValue(result, weak_cell, &miss); - __ ldr(result, FieldMemOperand(result, Cell::kValueOffset)); + __ ldr(result, FieldMemOperand(result, PropertyCell::kValueOffset)); // Check for deleted property if property can actually be deleted. if (is_configurable) { diff --git a/src/ic/arm64/handler-compiler-arm64.cc b/src/ic/arm64/handler-compiler-arm64.cc index b15d5a190f..36d88c0a2c 100644 --- a/src/ic/arm64/handler-compiler-arm64.cc +++ b/src/ic/arm64/handler-compiler-arm64.cc @@ -345,7 +345,7 @@ Handle NamedLoadHandlerCompiler::CompileLoadGlobal( Register result = StoreDescriptor::ValueRegister(); Handle weak_cell = factory()->NewWeakCell(cell); __ LoadWeakValue(result, weak_cell, &miss); - __ Ldr(result, FieldMemOperand(result, Cell::kValueOffset)); + __ Ldr(result, FieldMemOperand(result, PropertyCell::kValueOffset)); // Check for deleted property if property can actually be deleted. if (is_configurable) { diff --git a/src/ic/x64/handler-compiler-x64.cc b/src/ic/x64/handler-compiler-x64.cc index 23882dcb5c..b6add9d2bc 100644 --- a/src/ic/x64/handler-compiler-x64.cc +++ b/src/ic/x64/handler-compiler-x64.cc @@ -209,7 +209,8 @@ void PropertyHandlerCompiler::GenerateCheckPropertyCell( Factory* factory = masm->isolate()->factory(); Handle weak_cell = factory->NewWeakCell(cell); __ LoadWeakValue(scratch, weak_cell, miss); - __ Cmp(FieldOperand(scratch, Cell::kValueOffset), factory->the_hole_value()); + __ Cmp(FieldOperand(scratch, PropertyCell::kValueOffset), + factory->the_hole_value()); __ j(not_equal, miss); }