Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 33f02b6696760b180894b0ca6a490a7fa3430500..8dd58b4ee4ecc8f7b00c267274f183afe9997139 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -2412,7 +2412,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) { |
@@ -2424,7 +2424,7 @@ void LCodeGen::EmitLoadFieldOrConstantFunction(Register result, |
__ mov(result, FieldOperand(object, JSObject::kPropertiesOffset)); |
__ mov(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 { |
@@ -2469,8 +2469,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(); |
} |