Fix V8_NORETURN for MSVC

Change-Id: Ie141097c12ad578c752f51393bd5a5df176b3cad
Reviewed-on: https://chromium-review.googlesource.com/504528
Commit-Queue: Wiktor Garbacz <wiktorg@google.com>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Marja Hölttä <marja@chromium.org>
Cr-Commit-Position: refs/heads/master@{#45301}
This commit is contained in:
Wiktor Garbacz 2017-05-12 15:58:08 +02:00 committed by Commit Bot
parent 45d5dc8c02
commit cea359906a
2 changed files with 5 additions and 17 deletions

View File

@ -316,7 +316,7 @@
// V8_NORETURN void MyAbort() { abort(); }
#if V8_HAS_ATTRIBUTE_NORETURN
# define V8_NORETURN __attribute__((noreturn))
#elif HAS_DECLSPEC_NORETURN
#elif V8_HAS_DECLSPEC_NORETURN
# define V8_NORETURN __declspec(noreturn)
#else
# define V8_NORETURN /* NOT SUPPORTED */

View File

@ -1010,10 +1010,7 @@ HandleScope::~HandleScope() {
i::HandleScope::CloseScope(isolate_, prev_next_, prev_limit_);
}
V8_NORETURN void* HandleScope::operator new(size_t) {
base::OS::Abort();
abort();
}
void* HandleScope::operator new(size_t) { base::OS::Abort(); }
void HandleScope::operator delete(void*, size_t) { base::OS::Abort(); }
@ -1054,10 +1051,7 @@ i::Object** EscapableHandleScope::Escape(i::Object** escape_value) {
return escape_slot_;
}
V8_NORETURN void* EscapableHandleScope::operator new(size_t) {
base::OS::Abort();
abort();
}
void* EscapableHandleScope::operator new(size_t) { base::OS::Abort(); }
void EscapableHandleScope::operator delete(void*, size_t) { base::OS::Abort(); }
@ -1079,10 +1073,7 @@ SealHandleScope::~SealHandleScope() {
current->sealed_level = prev_sealed_level_;
}
V8_NORETURN void* SealHandleScope::operator new(size_t) {
base::OS::Abort();
abort();
}
void* SealHandleScope::operator new(size_t) { base::OS::Abort(); }
void SealHandleScope::operator delete(void*, size_t) { base::OS::Abort(); }
@ -2616,10 +2607,7 @@ v8::TryCatch::~TryCatch() {
}
}
V8_NORETURN void* v8::TryCatch::operator new(size_t) {
base::OS::Abort();
abort();
}
void* v8::TryCatch::operator new(size_t) { base::OS::Abort(); }
void v8::TryCatch::operator delete(void*, size_t) { base::OS::Abort(); }