| Index: src/full-codegen.cc
|
| diff --git a/src/full-codegen.cc b/src/full-codegen.cc
|
| index 5c7a23d54de942a2f5122f64ef0da65b66ba23d8..0f110b9412bab2d54f9b7674615f96b3517f2b68 100644
|
| --- a/src/full-codegen.cc
|
| +++ b/src/full-codegen.cc
|
| @@ -285,6 +285,7 @@ bool FullCodeGenerator::MakeCode(CompilationInfo* info) {
|
| Handle<Code> code = CodeGenerator::MakeCodeEpilogue(&masm, flags, info);
|
| code->set_optimizable(info->IsOptimizable());
|
| cgen.PopulateDeoptimizationData(code);
|
| + cgen.PopulateCacheCells(code);
|
| code->set_has_deoptimization_support(info->HasDeoptimizationSupport());
|
| code->set_handler_table(*cgen.handler_table());
|
| #ifdef ENABLE_DEBUGGER_SUPPORT
|
| @@ -329,8 +330,7 @@ void FullCodeGenerator::PopulateDeoptimizationData(Handle<Code> code) {
|
| ASSERT(info_->HasDeoptimizationSupport() || bailout_entries_.is_empty());
|
| if (!info_->HasDeoptimizationSupport()) return;
|
| int length = bailout_entries_.length();
|
| - Handle<DeoptimizationOutputData> data =
|
| - isolate()->factory()->
|
| + Handle<DeoptimizationOutputData> data = isolate()->factory()->
|
| NewDeoptimizationOutputData(length, TENURED);
|
| for (int i = 0; i < length; i++) {
|
| data->SetAstId(i, Smi::FromInt(bailout_entries_[i].id));
|
| @@ -340,6 +340,20 @@ void FullCodeGenerator::PopulateDeoptimizationData(Handle<Code> code) {
|
| }
|
|
|
|
|
| +void FullCodeGenerator::PopulateCacheCells(Handle<Code> code) {
|
| + if (cache_cells_.is_empty()) return;
|
| + int length = cache_cells_.length();
|
| + Handle<CacheCells> cache = Handle<CacheCells>::cast(isolate()->factory()->
|
| + NewFixedArray(CacheCells::LengthOfFixedArray(length), TENURED));
|
| + for (int i = 0; i < length; i++) {
|
| + cache->SetAstId(i, Smi::FromInt(cache_cells_[i].id));
|
| + cache->SetCell(i, *cache_cells_[i].cell);
|
| + }
|
| + code->set_cache_cells(*cache);
|
| +}
|
| +
|
| +
|
| +
|
| void FullCodeGenerator::PrepareForBailout(Expression* node, State state) {
|
| PrepareForBailoutForId(node->id(), state);
|
| }
|
| @@ -383,6 +397,13 @@ void FullCodeGenerator::PrepareForBailoutForId(unsigned id, State state) {
|
| }
|
|
|
|
|
| +void FullCodeGenerator::RecordCacheCell(unsigned id,
|
| + Handle<JSGlobalPropertyCell> cell) {
|
| + CacheCellEntry entry = { id, cell };
|
| + cache_cells_.Add(entry);
|
| +}
|
| +
|
| +
|
| void FullCodeGenerator::RecordStackCheck(unsigned ast_id) {
|
| // The pc offset does not need to be encoded and packed together with a
|
| // state.
|
|
|