| Index: src/x64/lithium-codegen-x64.cc
|
| diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
|
| index 3c6187d9d41aaccaa95d5788f086b954caf66121..7a07c2937b883b1fa945fdbb64a9819180f73878 100644
|
| --- a/src/x64/lithium-codegen-x64.cc
|
| +++ b/src/x64/lithium-codegen-x64.cc
|
| @@ -4870,7 +4870,7 @@ void LCodeGen::DoCheckInstanceType(LCheckInstanceType* instr) {
|
|
|
| void LCodeGen::DoCheckValue(LCheckValue* instr) {
|
| Register reg = ToRegister(instr->value());
|
| - Handle<HeapObject> object = instr->hydrogen()->object();
|
| + Handle<HeapObject> object = instr->hydrogen()->object().handle();
|
| __ CmpHeapObject(reg, object);
|
| DeoptimizeIf(not_equal, instr->environment());
|
| }
|
| @@ -4911,22 +4911,21 @@ void LCodeGen::DoCheckMaps(LCheckMaps* instr) {
|
| ASSERT(input->IsRegister());
|
| Register reg = ToRegister(input);
|
|
|
| - SmallMapList* map_set = instr->hydrogen()->map_set();
|
| -
|
| DeferredCheckMaps* deferred = NULL;
|
| if (instr->hydrogen()->has_migration_target()) {
|
| deferred = new(zone()) DeferredCheckMaps(this, instr, reg);
|
| __ bind(deferred->check_maps());
|
| }
|
|
|
| + UniqueSet<Map> map_set = instr->hydrogen()->map_set();
|
| Label success;
|
| - for (int i = 0; i < map_set->length() - 1; i++) {
|
| - Handle<Map> map = map_set->at(i);
|
| + for (int i = 0; i < map_set.size() - 1; i++) {
|
| + Handle<Map> map = map_set.at(i).handle();
|
| __ CompareMap(reg, map, &success);
|
| __ j(equal, &success);
|
| }
|
|
|
| - Handle<Map> map = map_set->last();
|
| + Handle<Map> map = map_set.at(map_set.size() - 1).handle();
|
| __ CompareMap(reg, map, &success);
|
| if (instr->hydrogen()->has_migration_target()) {
|
| __ j(not_equal, deferred->entry());
|
|
|