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

Unified Diff: src/api.cc

Issue 273383003: v8::TryCatch now works correctly with ASAN's UseAfterReturn mode enabled. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Addressing review notes Created 6 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 | « include/v8.h ('k') | src/base/macros.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 7f1276dee8e634fb9fafc6ef093596f9fc18e389..493c71ce47f8987c4fcc65d5b54b53e68dfd826e 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -6,6 +6,9 @@
#include <string.h> // For memcpy, strlen.
#include <cmath> // For isnan.
+#ifdef V8_USE_ADDRESS_SANITIZER
+#include <sanitizer/asan_interface.h>
+#endif // V8_USE_ADDRESS_SANITIZER
#include "../include/v8-debug.h"
#include "../include/v8-profiler.h"
#include "../include/v8-testing.h"
@@ -1819,6 +1822,16 @@ v8::TryCatch::~TryCatch() {
}
+v8::TryCatch* v8::TryCatch::DesanitizedThis() {
+#ifdef V8_USE_ADDRESS_SANITIZER
+ return TRY_CATCH_FROM_ADDRESS(
+ __asan_addr_is_in_fake_stack(asan_fake_stack_handle_, this, NULL, NULL));
+#else
+ return this;
+#endif
+}
+
+
bool v8::TryCatch::HasCaught() const {
return !reinterpret_cast<i::Object*>(exception_)->IsTheHole();
}
@@ -1893,6 +1906,11 @@ void v8::TryCatch::Reset() {
message_script_ = the_hole;
message_start_pos_ = 0;
message_end_pos_ = 0;
+#ifdef V8_USE_ADDRESS_SANITIZER
+ asan_fake_stack_handle_ = __asan_get_current_fake_stack();
+#else
+ asan_fake_stack_handle_ = NULL;
+#endif
}
« no previous file with comments | « include/v8.h ('k') | src/base/macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698