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

Unified Diff: src/api.cc

Issue 2138643003: Revert three commits due to cpu-profiler failures (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 5 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 | « no previous file | src/log.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index b45cf2543a4cb09c7d813514b49c6344b3608142..fc0cef022bbc34352702370420982499ded9cd93 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -7656,13 +7656,20 @@ bool Isolate::GetHeapCodeAndMetadataStatistics(
void Isolate::GetStackSample(const RegisterState& state, void** frames,
size_t frames_limit, SampleInfo* sample_info) {
- if (TickSample::GetStackSample(this, state, TickSample::kSkipCEntryFrame,
- frames, frames_limit, sample_info)) {
+#if defined(USE_SIMULATOR)
+ RegisterState regs;
+ i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
+ if (!i::SimulatorHelper::FillRegisters(isolate, &regs)) {
+ sample_info->frames_count = 0;
+ sample_info->vm_state = OTHER;
+ sample_info->external_callback_entry = nullptr;
return;
}
- sample_info->frames_count = 0;
- sample_info->vm_state = OTHER;
- sample_info->external_callback_entry = nullptr;
+#else
+ const RegisterState& regs = state;
+#endif
+ TickSample::GetStackSample(this, regs, TickSample::kSkipCEntryFrame, frames,
+ frames_limit, sample_info);
}
size_t Isolate::NumberOfPhantomHandleResetsSinceLastCall() {
« no previous file with comments | « no previous file | src/log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698