Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: src/compiler.cc

Issue 1873173002: [compiler] Set expect property count right after parsing. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Addressed comments. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/objects.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/compiler.h" 5 #include "src/compiler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "src/ast/ast-numbering.h" 9 #include "src/ast/ast-numbering.h"
10 #include "src/ast/prettyprinter.h" 10 #include "src/ast/prettyprinter.h"
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 time_taken_to_optimize_, 481 time_taken_to_optimize_,
482 time_taken_to_codegen_); 482 time_taken_to_codegen_);
483 } 483 }
484 } 484 }
485 485
486 // ---------------------------------------------------------------------------- 486 // ----------------------------------------------------------------------------
487 // Local helper methods that make up the compilation pipeline. 487 // Local helper methods that make up the compilation pipeline.
488 488
489 namespace { 489 namespace {
490 490
491 // Sets the expected number of properties based on estimate from compiler.
492 void SetExpectedNofPropertiesFromEstimate(Handle<SharedFunctionInfo> shared,
493 int estimate) {
494 // If no properties are added in the constructor, they are more likely
495 // to be added later.
496 if (estimate == 0) estimate = 2;
497
498 // TODO(yangguo): check whether those heuristics are still up-to-date.
499 // We do not shrink objects that go into a snapshot (yet), so we adjust
500 // the estimate conservatively.
501 if (shared->GetIsolate()->serializer_enabled()) {
502 estimate += 2;
503 } else {
504 // Inobject slack tracking will reclaim redundant inobject space later,
505 // so we can afford to adjust the estimate generously.
506 estimate += 8;
507 }
508
509 shared->set_expected_nof_properties(estimate);
510 }
511
512 void MaybeDisableOptimization(Handle<SharedFunctionInfo> shared_info, 491 void MaybeDisableOptimization(Handle<SharedFunctionInfo> shared_info,
513 BailoutReason bailout_reason) { 492 BailoutReason bailout_reason) {
514 if (bailout_reason != kNoReason) { 493 if (bailout_reason != kNoReason) {
515 shared_info->DisableOptimization(bailout_reason); 494 shared_info->DisableOptimization(bailout_reason);
516 } 495 }
517 } 496 }
518 497
519 void RecordFunctionCompilation(Logger::LogEventsAndTags tag, 498 void RecordFunctionCompilation(Logger::LogEventsAndTags tag,
520 CompilationInfo* info, 499 CompilationInfo* info,
521 Handle<SharedFunctionInfo> shared) { 500 Handle<SharedFunctionInfo> shared) {
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 635
657 MUST_USE_RESULT MaybeHandle<Code> GetUnoptimizedCode(CompilationInfo* info) { 636 MUST_USE_RESULT MaybeHandle<Code> GetUnoptimizedCode(CompilationInfo* info) {
658 VMState<COMPILER> state(info->isolate()); 637 VMState<COMPILER> state(info->isolate());
659 PostponeInterruptsScope postpone(info->isolate()); 638 PostponeInterruptsScope postpone(info->isolate());
660 639
661 // Parse and update CompilationInfo with the results. 640 // Parse and update CompilationInfo with the results.
662 if (!Parser::ParseStatic(info->parse_info())) return MaybeHandle<Code>(); 641 if (!Parser::ParseStatic(info->parse_info())) return MaybeHandle<Code>();
663 Handle<SharedFunctionInfo> shared = info->shared_info(); 642 Handle<SharedFunctionInfo> shared = info->shared_info();
664 FunctionLiteral* lit = info->literal(); 643 FunctionLiteral* lit = info->literal();
665 DCHECK_EQ(shared->language_mode(), lit->language_mode()); 644 DCHECK_EQ(shared->language_mode(), lit->language_mode());
666 SetExpectedNofPropertiesFromEstimate(shared, lit->expected_property_count());
667 MaybeDisableOptimization(shared, lit->dont_optimize_reason()); 645 MaybeDisableOptimization(shared, lit->dont_optimize_reason());
668 646
669 // Compile either unoptimized code or bytecode for the interpreter. 647 // Compile either unoptimized code or bytecode for the interpreter.
670 if (!CompileBaselineCode(info)) return MaybeHandle<Code>(); 648 if (!CompileBaselineCode(info)) return MaybeHandle<Code>();
671 RecordFunctionCompilation(Logger::LAZY_COMPILE_TAG, info, shared); 649 RecordFunctionCompilation(Logger::LAZY_COMPILE_TAG, info, shared);
672 650
673 // Update the shared function info with the scope info. Allocating the 651 // Update the shared function info with the scope info. Allocating the
674 // ScopeInfo object may cause a GC. 652 // ScopeInfo object may cause a GC.
675 Handle<ScopeInfo> scope_info = 653 Handle<ScopeInfo> scope_info =
676 ScopeInfo::Create(info->isolate(), info->zone(), info->scope()); 654 ScopeInfo::Create(info->isolate(), info->zone(), info->scope());
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 script->name()->IsString() 1091 script->name()->IsString()
1114 ? Handle<String>(String::cast(script->name())) 1092 ? Handle<String>(String::cast(script->name()))
1115 : isolate->factory()->empty_string(); 1093 : isolate->factory()->empty_string();
1116 Logger::LogEventsAndTags log_tag = info->is_eval() 1094 Logger::LogEventsAndTags log_tag = info->is_eval()
1117 ? Logger::EVAL_TAG 1095 ? Logger::EVAL_TAG
1118 : Logger::ToNativeByScript(Logger::SCRIPT_TAG, *script); 1096 : Logger::ToNativeByScript(Logger::SCRIPT_TAG, *script);
1119 1097
1120 PROFILE(isolate, CodeCreateEvent(log_tag, *info->abstract_code(), *result, 1098 PROFILE(isolate, CodeCreateEvent(log_tag, *info->abstract_code(), *result,
1121 info, *script_name)); 1099 info, *script_name));
1122 1100
1123 // Hint to the runtime system used when allocating space for initial
1124 // property space by setting the expected number of properties for
1125 // the instances of the function.
1126 SetExpectedNofPropertiesFromEstimate(result,
1127 lit->expected_property_count());
1128
1129 if (!script.is_null()) 1101 if (!script.is_null())
1130 script->set_compilation_state(Script::COMPILATION_STATE_COMPILED); 1102 script->set_compilation_state(Script::COMPILATION_STATE_COMPILED);
1131 1103
1132 live_edit_tracker.RecordFunctionInfo(result, lit, info->zone()); 1104 live_edit_tracker.RecordFunctionInfo(result, lit, info->zone());
1133 } 1105 }
1134 1106
1135 return result; 1107 return result;
1136 } 1108 }
1137 1109
1138 } // namespace 1110 } // namespace
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
1601 if (maybe_existing.is_null()) { 1573 if (maybe_existing.is_null()) {
1602 // If the outer function has been compiled before, we cannot be sure that 1574 // If the outer function has been compiled before, we cannot be sure that
1603 // shared function info for this function literal has been created for the 1575 // shared function info for this function literal has been created for the
1604 // first time. It may have already been compiled previously. 1576 // first time. It may have already been compiled previously.
1605 result->set_never_compiled(outer_info->is_first_compile() && lazy); 1577 result->set_never_compiled(outer_info->is_first_compile() && lazy);
1606 1578
1607 RecordFunctionCompilation(Logger::FUNCTION_TAG, &info, result); 1579 RecordFunctionCompilation(Logger::FUNCTION_TAG, &info, result);
1608 result->set_allows_lazy_compilation(literal->AllowsLazyCompilation()); 1580 result->set_allows_lazy_compilation(literal->AllowsLazyCompilation());
1609 result->set_allows_lazy_compilation_without_context(allow_lazy_without_ctx); 1581 result->set_allows_lazy_compilation_without_context(allow_lazy_without_ctx);
1610 1582
1611 // Set the expected number of properties for instances and return
1612 // the resulting function.
1613 SetExpectedNofPropertiesFromEstimate(result,
1614 literal->expected_property_count());
1615 live_edit_tracker.RecordFunctionInfo(result, literal, info.zone()); 1583 live_edit_tracker.RecordFunctionInfo(result, literal, info.zone());
1616 } 1584 }
1617 1585
1618 return result; 1586 return result;
1619 } 1587 }
1620 1588
1621 Handle<SharedFunctionInfo> Compiler::GetSharedFunctionInfoForNative( 1589 Handle<SharedFunctionInfo> Compiler::GetSharedFunctionInfoForNative(
1622 v8::Extension* extension, Handle<String> name) { 1590 v8::Extension* extension, Handle<String> name) {
1623 Isolate* isolate = name->GetIsolate(); 1591 Isolate* isolate = name->GetIsolate();
1624 v8::Isolate* v8_isolate = reinterpret_cast<v8::Isolate*>(isolate); 1592 v8::Isolate* v8_isolate = reinterpret_cast<v8::Isolate*>(isolate);
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1740 MaybeHandle<Code> code; 1708 MaybeHandle<Code> code;
1741 if (cached.code != nullptr) code = handle(cached.code); 1709 if (cached.code != nullptr) code = handle(cached.code);
1742 Handle<Context> native_context(function->context()->native_context()); 1710 Handle<Context> native_context(function->context()->native_context());
1743 SharedFunctionInfo::AddToOptimizedCodeMap(shared, native_context, code, 1711 SharedFunctionInfo::AddToOptimizedCodeMap(shared, native_context, code,
1744 literals, BailoutId::None()); 1712 literals, BailoutId::None());
1745 } 1713 }
1746 } 1714 }
1747 1715
1748 } // namespace internal 1716 } // namespace internal
1749 } // namespace v8 1717 } // namespace v8
OLDNEW
« no previous file with comments | « no previous file | src/objects.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698