AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Revert "v8::TryCatch now works correctly with ASAN's UseAfterReturn mode enabled."

Browse Source 
This reverts commit r21273.

TBR=danno@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21275 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
ishell@chromium.org 2014-05-12 20:10:47 +00:00
parent 6e74578968
commit b94d02888a
5 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/v8.h
View File

@ -5076,8 +5076,6 @@ class V8_EXPORT TryCatch {
void SetCaptureMessage(bool value);
private:
TryCatch* DesanitizedThis();
// Make it hard to create heap-allocated TryCatch blocks.
TryCatch(const TryCatch&);
void operator=(const TryCatch&);
@ -5089,7 +5087,6 @@ class V8_EXPORT TryCatch {
void* exception_;
void* message_obj_;
void* message_script_;
void* asan_fake_stack_handle_;
int message_start_pos_;
int message_end_pos_;
bool is_verbose_ : 1;

18
src/api.cc
View File

@ -6,9 +6,6 @@
#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"
@ -1822,16 +1819,6 @@ 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();
}
@ -1906,11 +1893,6 @@ 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
}

10
src/base/macros.h
View File

@ -54,17 +54,15 @@
#define MUST_USE_RESULT V8_WARN_UNUSED_RESULT
// Define V8_USE_ADDRESS_SANITIZER macros.
// Define DISABLE_ASAN macros.
#if defined(__has_feature)
#if __has_feature(address_sanitizer)
#define V8_USE_ADDRESS_SANITIZER 1
#define DISABLE_ASAN __attribute__((no_sanitize_address))
#endif
#endif
// Define DISABLE_ASAN macros.
#ifdef V8_USE_ADDRESS_SANITIZER
#define DISABLE_ASAN __attribute__((no_sanitize_address))
#else
#ifndef DISABLE_ASAN
#define DISABLE_ASAN
#endif

5
src/isolate.cc
View File

@ -272,14 +272,13 @@ void Isolate::RegisterTryCatchHandler(v8::TryCatch* that) {
// JS stack. When running without the simulator, the address
// returned will be the address of the C++ try catch handler itself.
Address address = reinterpret_cast<Address>(
SimulatorStack::RegisterCTryCatch(reinterpret_cast<uintptr_t>(
that->DesanitizedThis())));
SimulatorStack::RegisterCTryCatch(reinterpret_cast<uintptr_t>(that)));
thread_local_top()->set_try_catch_handler_address(address);
}
void Isolate::UnregisterTryCatchHandler(v8::TryCatch* that) {
ASSERT(thread_local_top()->TryCatchHandler() == that->DesanitizedThis());
ASSERT(thread_local_top()->TryCatchHandler() == that);
thread_local_top()->set_try_catch_handler_address(
reinterpret_cast<Address>(that->next_));
thread_local_top()->catcher_ = NULL;

5
src/zone.h
View File

@ -15,6 +15,11 @@
namespace v8 {
namespace internal {
#if defined(__has_feature)
#if __has_feature(address_sanitizer)
#define V8_USE_ADDRESS_SANITIZER
#endif
#endif
class Segment;
class Isolate;