Chromium Code Reviews| Index: src/hydrogen.cc |
| diff --git a/src/hydrogen.cc b/src/hydrogen.cc |
| index 36632374e1ec7d1c00ccc511b9b4b5b98b9f7484..54288bca13b2e9cf7d2e4ae472a108e48ba7f7c5 100644 |
| --- a/src/hydrogen.cc |
| +++ b/src/hydrogen.cc |
| @@ -3467,14 +3467,19 @@ void HGraphBuilder::VisitArrayLiteral(ArrayLiteral* expr) { |
| Handle<FixedArray> literals(environment()->closure()->literals()); |
| Handle<Object> raw_boilerplate(literals->get(expr->literal_index())); |
| - // For now, no boilerplate causes a deopt. |
| if (raw_boilerplate->IsUndefined()) { |
| - AddInstruction(new(zone()) HSoftDeoptimize); |
| - return ast_context()->ReturnValue(graph()->GetConstantUndefined()); |
| + raw_boilerplate = Runtime::CreateArrayLiteralBoilerplate( |
|
ricow1
2011/12/14 12:53:09
Check return value from runtime call, could be nul
Jakob Kummerow
2011/12/14 13:00:20
Done.
|
| + isolate(), literals, expr->constant_elements()); |
| + literals->set(expr->literal_index(), *raw_boilerplate); |
| + if (JSObject::cast(*raw_boilerplate)->elements()->map() == |
| + isolate()->heap()->fixed_cow_array_map()) { |
| + isolate()->counters()->cow_arrays_created_runtime()->Increment(); |
| + } |
| } |
| - Handle<JSObject> boilerplate(Handle<JSObject>::cast(raw_boilerplate)); |
| - ElementsKind boilerplate_elements_kind = boilerplate->GetElementsKind(); |
| + Handle<JSObject> boilerplate = Handle<JSObject>::cast(raw_boilerplate); |
| + ElementsKind boilerplate_elements_kind = |
| + Handle<JSObject>::cast(boilerplate)->GetElementsKind(); |
| HArrayLiteral* literal = new(zone()) HArrayLiteral( |
| context, |