Index: src/x64/lithium-codegen-x64.cc |
diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc |
index 5d4316af1c8d4adde1770818d74d367cc52d78be..06d041281fa2ca2af7c51c6196d01ab50788d5e1 100644 |
--- a/src/x64/lithium-codegen-x64.cc |
+++ b/src/x64/lithium-codegen-x64.cc |
@@ -2286,7 +2286,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) { |
@@ -2298,7 +2298,7 @@ void LCodeGen::EmitLoadFieldOrConstantFunction(Register result, |
__ movq(result, FieldOperand(object, JSObject::kPropertiesOffset)); |
__ movq(result, FieldOperand(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 { |
@@ -2326,8 +2326,7 @@ static bool CompactEmit( |
LookupResult lookup(isolate); |
Handle<Map> map = list->at(i); |
map->LookupInDescriptors(NULL, *name, &lookup); |
- return lookup.IsFound() && |
- (lookup.type() == FIELD || lookup.type() == CONSTANT_FUNCTION); |
+ return lookup.IsField() || lookup.IsConstantFunction(); |
} |