| Index: src/hydrogen.cc
|
| diff --git a/src/hydrogen.cc b/src/hydrogen.cc
|
| index d759b657bab40f89a6053be6809f5dc18d4f68d9..40343fa5f0c0bbc8b2da129c5e1ed0758753e674 100644
|
| --- a/src/hydrogen.cc
|
| +++ b/src/hydrogen.cc
|
| @@ -4926,7 +4926,7 @@ void HOptimizedGraphBuilder::VisitVariableProxy(VariableProxy* expr) {
|
| Handle<PropertyCell> cell(global->GetPropertyCell(&lookup));
|
| if (cell->type()->IsConstant()) {
|
| cell->AddDependentCompilationInfo(top_info());
|
| - Handle<Object> constant_object = cell->type()->AsConstant();
|
| + Handle<Object> constant_object = cell->type()->AsConstant()->Value();
|
| if (constant_object->IsConsString()) {
|
| constant_object =
|
| String::Flatten(Handle<String>::cast(constant_object));
|
| @@ -4999,7 +4999,7 @@ void HOptimizedGraphBuilder::VisitRegExpLiteral(RegExpLiteral* expr) {
|
| static bool CanInlinePropertyAccess(Type* type) {
|
| if (type->Is(Type::NumberOrString())) return true;
|
| if (!type->IsClass()) return false;
|
| - Handle<Map> map = type->AsClass();
|
| + Handle<Map> map = type->AsClass()->Map();
|
| return map->IsJSObjectMap() &&
|
| !map->is_dictionary_map() &&
|
| !map->has_named_interceptor();
|
| @@ -5896,7 +5896,7 @@ void HOptimizedGraphBuilder::HandleGlobalVariableAssignment(
|
| Handle<GlobalObject> global(current_info()->global_object());
|
| Handle<PropertyCell> cell(global->GetPropertyCell(&lookup));
|
| if (cell->type()->IsConstant()) {
|
| - Handle<Object> constant = cell->type()->AsConstant();
|
| + Handle<Object> constant = cell->type()->AsConstant()->Value();
|
| if (value->IsConstant()) {
|
| HConstant* c_value = HConstant::cast(value);
|
| if (!constant.is_identical_to(c_value->handle(isolate()))) {
|
| @@ -9823,7 +9823,7 @@ HControlInstruction* HOptimizedGraphBuilder::BuildCompareInstruction(
|
| HValue* operand_to_check =
|
| left->block()->block_id() < right->block()->block_id() ? left : right;
|
| if (combined_type->IsClass()) {
|
| - Handle<Map> map = combined_type->AsClass();
|
| + Handle<Map> map = combined_type->AsClass()->Map();
|
| AddCheckMap(operand_to_check, map);
|
| HCompareObjectEqAndBranch* result =
|
| New<HCompareObjectEqAndBranch>(left, right);
|
|
|