| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 43d7f9d0707ebe870c8803cb13470a52e4e398bd..8cef74d67aa95d79d80e05e8b0d5d5b02d9a5705 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -2579,7 +2579,7 @@ void LCodeGen::EmitLoadFieldOrConstantFunction(Register result,
|
| LookupResult lookup(isolate());
|
| type->LookupInDescriptors(NULL, *name, &lookup);
|
| ASSERT(lookup.IsFound() || lookup.IsCacheable());
|
| - if (lookup.IsFound() && lookup.type() == FIELD) {
|
| + if (lookup.IsField()) {
|
| int index = lookup.GetLocalFieldIndexFromMap(*type);
|
| int offset = index * kPointerSize;
|
| if (index < 0) {
|
| @@ -2591,7 +2591,7 @@ void LCodeGen::EmitLoadFieldOrConstantFunction(Register result,
|
| __ ldr(result, FieldMemOperand(object, JSObject::kPropertiesOffset));
|
| __ ldr(result, FieldMemOperand(result, offset + FixedArray::kHeaderSize));
|
| }
|
| - } else if (lookup.IsFound() && lookup.type() == CONSTANT_FUNCTION) {
|
| + } else if (lookup.IsConstantFunction()) {
|
| Handle<JSFunction> function(lookup.GetConstantFunctionFromMap(*type));
|
| __ LoadHeapObject(result, function);
|
| } else {
|
|
|