| Index: src/ia32/lithium-codegen-ia32.cc
|
| diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc
|
| index 48cd780c6a43ec3a4ebb57f0fc4a54663d8896ac..b307512d673bb92db1df7781c132264b927b0f9f 100644
|
| --- a/src/ia32/lithium-codegen-ia32.cc
|
| +++ b/src/ia32/lithium-codegen-ia32.cc
|
| @@ -2410,7 +2410,7 @@ void LCodeGen::EmitLoadFieldOrConstantFunction(Register result,
|
| Handle<String> name,
|
| LEnvironment* env) {
|
| LookupResult lookup(isolate());
|
| - type->LookupInDescriptors(NULL, *name, &lookup);
|
| + type->LookupTransitionOrDescriptor(NULL, *name, &lookup);
|
| ASSERT(lookup.IsFound() || lookup.IsCacheable());
|
| if (lookup.IsField()) {
|
| int index = lookup.GetLocalFieldIndexFromMap(*type);
|
| @@ -2471,9 +2471,9 @@ static bool CompactEmit(SmallMapList* list,
|
| Handle<Map> map = list->at(i);
|
| // If the map has ElementsKind transitions, we will generate map checks
|
| // for each kind in __ CompareMap(..., ALLOW_ELEMENTS_TRANSITION_MAPS).
|
| - if (map->elements_transition_map() != NULL) return false;
|
| + if (map->HasElementsTransition()) return false;
|
| LookupResult lookup(isolate);
|
| - map->LookupInDescriptors(NULL, *name, &lookup);
|
| + map->LookupDescriptor(NULL, *name, &lookup);
|
| return lookup.IsField() || lookup.IsConstantFunction();
|
| }
|
|
|
|
|