Index: src/arm/stub-cache-arm.cc |
=================================================================== |
--- src/arm/stub-cache-arm.cc (revision 2303) |
+++ src/arm/stub-cache-arm.cc (working copy) |
@@ -496,9 +496,7 @@ |
Object* CallStubCompiler::CompileCallField(Object* object, |
JSObject* holder, |
int index, |
- String* name, |
- Code::Flags flags) { |
- ASSERT_EQ(FIELD, Code::ExtractTypeFromFlags(flags)); |
+ String* name) { |
// ----------- S t a t e ------------- |
// -- lr: return address |
// ----------------------------------- |
@@ -540,16 +538,14 @@ |
__ Jump(ic, RelocInfo::CODE_TARGET); |
// Return the generated code. |
- return GetCodeWithFlags(flags, name); |
+ return GetCode(FIELD, name); |
} |
Object* CallStubCompiler::CompileCallConstant(Object* object, |
JSObject* holder, |
JSFunction* function, |
- CheckType check, |
- Code::Flags flags) { |
- ASSERT_EQ(CONSTANT_FUNCTION, Code::ExtractTypeFromFlags(flags)); |
+ CheckType check) { |
// ----------- S t a t e ------------- |
// -- lr: return address |
// ----------------------------------- |
@@ -664,7 +660,7 @@ |
if (function->shared()->name()->IsString()) { |
function_name = String::cast(function->shared()->name()); |
} |
- return GetCodeWithFlags(flags, function_name); |
+ return GetCode(CONSTANT_FUNCTION, function_name); |
} |
@@ -1018,7 +1014,8 @@ |
Object* LoadStubCompiler::CompileLoadGlobal(JSGlobalObject* object, |
JSGlobalPropertyCell* cell, |
- String* name) { |
+ String* name, |
+ bool is_dont_delete) { |
// ----------- S t a t e ------------- |
// -- r2 : name |
// -- lr : return address |
@@ -1038,9 +1035,11 @@ |
__ mov(r3, Operand(Handle<JSGlobalPropertyCell>(cell))); |
__ ldr(r0, FieldMemOperand(r3, JSGlobalPropertyCell::kValueOffset)); |
- // Check for deleted property. |
- __ cmp(r0, Operand(Factory::the_hole_value())); |
- __ b(eq, &miss); |
+ // Check for deleted property if property can actually be deleted. |
+ if (!is_dont_delete) { |
+ __ cmp(r0, Operand(Factory::the_hole_value())); |
+ __ b(eq, &miss); |
+ } |
__ Ret(); |