Commit 1c49127d authored by bmeurer's avatar bmeurer Committed by Commit bot

Revert of [turbofan] Record the SharedFunctionInfo of ALL inlined functions....

Revert of [turbofan] Record the SharedFunctionInfo of ALL inlined functions. (patchset #2 id:20001 of https://codereview.chromium.org/1175953002/)

Reason for revert:
Breaks Windows debug.

Original issue's description:
> [turbofan] Record the SharedFunctionInfo of ALL inlined functions.
>
> Previously we only recorded the SharedFunctionInfo of inlined functions
> that had at least one (lazy) deopt point left at code generation time.
>
> R=mstarzinger@chromium.org
>
> Committed: https://chromium.googlesource.com/v8/v8/+/ffa0b4007cd7de0cfd6d37079ef360e3beeb5686

TBR=mstarzinger@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1178683004

Cr-Commit-Position: refs/heads/master@{#28920}
parent ffa0b400
...@@ -150,7 +150,6 @@ CompilationInfo::CompilationInfo(ParseInfo* parse_info, CodeStub* code_stub, ...@@ -150,7 +150,6 @@ CompilationInfo::CompilationInfo(ParseInfo* parse_info, CodeStub* code_stub,
: nullptr), : nullptr),
track_positions_(FLAG_hydrogen_track_positions || track_positions_(FLAG_hydrogen_track_positions ||
isolate->cpu_profiler()->is_profiling()), isolate->cpu_profiler()->is_profiling()),
inlined_functions_(zone),
opt_count_(has_shared_info() ? shared_info()->opt_count() : 0), opt_count_(has_shared_info() ? shared_info()->opt_count() : 0),
parameter_count_(0), parameter_count_(0),
optimization_id_(-1), optimization_id_(-1),
......
...@@ -384,14 +384,6 @@ class CompilationInfo { ...@@ -384,14 +384,6 @@ class CompilationInfo {
Handle<Code> GenerateCodeStub(); Handle<Code> GenerateCodeStub();
typedef ZoneVector<Handle<SharedFunctionInfo>> InlinedFunctionList;
InlinedFunctionList const& inlined_functions() const {
return inlined_functions_;
}
void AddInlinedFunction(Handle<SharedFunctionInfo> inlined_function) {
inlined_functions_.push_back(inlined_function);
}
protected: protected:
ParseInfo* parse_info_; ParseInfo* parse_info_;
...@@ -466,8 +458,6 @@ class CompilationInfo { ...@@ -466,8 +458,6 @@ class CompilationInfo {
std::vector<InlinedFunctionInfo> inlined_function_infos_; std::vector<InlinedFunctionInfo> inlined_function_infos_;
bool track_positions_; bool track_positions_;
InlinedFunctionList inlined_functions_;
// A copy of shared_info()->opt_count() to avoid handle deref // A copy of shared_info()->opt_count() to avoid handle deref
// during graph optimization. // during graph optimization.
int opt_count_; int opt_count_;
......
...@@ -76,8 +76,10 @@ Handle<Code> CodeGenerator::GenerateCode() { ...@@ -76,8 +76,10 @@ Handle<Code> CodeGenerator::GenerateCode() {
// Define deoptimization literals for all inlined functions. // Define deoptimization literals for all inlined functions.
DCHECK_EQ(0u, deoptimization_literals_.size()); DCHECK_EQ(0u, deoptimization_literals_.size());
for (auto shared_info : info->inlined_functions()) { for (auto frame_state_descriptor : code()->frame_state_descriptors()) {
if (!shared_info.is_identical_to(info->shared_info())) { Handle<SharedFunctionInfo> shared_info;
if (frame_state_descriptor->shared_info().ToHandle(&shared_info) &&
!shared_info.is_identical_to(info->shared_info())) {
DefineDeoptimizationLiteral(shared_info); DefineDeoptimizationLiteral(shared_info);
} }
} }
......
...@@ -302,9 +302,6 @@ Reduction JSInliner::Reduce(Node* node) { ...@@ -302,9 +302,6 @@ Reduction JSInliner::Reduce(Node* node) {
info.zone()); info.zone());
} }
// Remember that we inlined this function.
info_->AddInlinedFunction(info.shared_info());
return InlineCall(node, frame_state, start, end); return InlineCall(node, frame_state, start, end);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment