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

Unified Diff: src/vm-state.h

Issue 1409993006: Fix external callback logging in profiler. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 2 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/log.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/vm-state.h
diff --git a/src/vm-state.h b/src/vm-state.h
index 81a90e3c080e312481924358386f4547e7ffddfe..7e723a5282b426c16360984900b8feecee7ddc51 100644
--- a/src/vm-state.h
+++ b/src/vm-state.h
@@ -33,7 +33,14 @@ class ExternalCallbackScope BASE_EMBEDDED {
inline ExternalCallbackScope(Isolate* isolate, Address callback);
inline ~ExternalCallbackScope();
Address callback() { return callback_; }
- Address* callback_address() { return &callback_; }
+ Address* callback_entrypoint_address() {
+ if (callback_ == nullptr) return nullptr;
+#if USES_FUNCTION_DESCRIPTORS
+ return FUNCTION_ENTRYPOINT_ADDRESS(callback_);
+#else
+ return &callback_;
+#endif
+ }
ExternalCallbackScope* previous() { return previous_scope_; }
inline Address scope_address();
« no previous file with comments | « src/log.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698