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

Unified Diff: src/deoptimizer.cc

Issue 1956693002: [compiler] Pass inlining_id via relocation info. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Rebased. Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/deoptimizer.h ('k') | src/disassembler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/deoptimizer.cc
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index 18a1aa01aa77f1079d551de4418ee556c658c887..1eb7d93f93546daf396e8caa6bd910b4eeaac8a2 100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -2752,20 +2752,26 @@ const char* Deoptimizer::GetDeoptReason(DeoptReason deopt_reason) {
Deoptimizer::DeoptInfo Deoptimizer::GetDeoptInfo(Code* code, Address pc) {
SourcePosition last_position = SourcePosition::Unknown();
Deoptimizer::DeoptReason last_reason = Deoptimizer::kNoReason;
+ int last_inlining_id = InlinedFunctionInfo::kNoParentId;
int mask = RelocInfo::ModeMask(RelocInfo::DEOPT_REASON) |
+ RelocInfo::ModeMask(RelocInfo::DEOPT_ID) |
RelocInfo::ModeMask(RelocInfo::POSITION);
for (RelocIterator it(code, mask); !it.done(); it.next()) {
RelocInfo* info = it.rinfo();
- if (info->pc() >= pc) return DeoptInfo(last_position, last_reason);
+ if (info->pc() >= pc) {
+ return DeoptInfo(last_position, last_reason, last_inlining_id);
+ }
if (info->rmode() == RelocInfo::POSITION) {
int raw_position = static_cast<int>(info->data());
last_position = raw_position ? SourcePosition::FromRaw(raw_position)
: SourcePosition::Unknown();
+ } else if (info->rmode() == RelocInfo::DEOPT_ID) {
+ last_inlining_id = static_cast<int>(info->data());
} else if (info->rmode() == RelocInfo::DEOPT_REASON) {
last_reason = static_cast<Deoptimizer::DeoptReason>(info->data());
}
}
- return DeoptInfo(SourcePosition::Unknown(), Deoptimizer::kNoReason);
+ return DeoptInfo(SourcePosition::Unknown(), Deoptimizer::kNoReason, -1);
}
« no previous file with comments | « src/deoptimizer.h ('k') | src/disassembler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698