Commit 0959123e authored by jochen's avatar jochen Committed by Commit bot

Remove "extra checks"

Instead, just use DCHECKs. The builders that want them in release mode
should already be useding dcheck_always_on anyways

BUG=none
R=machenbach@chromium.org
LOG=y

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

Cr-Commit-Position: refs/heads/master@{#26001}
parent a417b418
...@@ -18,7 +18,6 @@ v8_interpreted_regexp = false ...@@ -18,7 +18,6 @@ v8_interpreted_regexp = false
v8_object_print = false v8_object_print = false
v8_postmortem_support = false v8_postmortem_support = false
v8_use_snapshot = true v8_use_snapshot = true
v8_enable_extra_checks = is_debug
v8_target_arch = cpu_arch v8_target_arch = cpu_arch
v8_random_seed = "314159265" v8_random_seed = "314159265"
...@@ -82,9 +81,6 @@ config("features") { ...@@ -82,9 +81,6 @@ config("features") {
if (v8_enable_i18n_support == true) { if (v8_enable_i18n_support == true) {
defines += [ "V8_I18N_SUPPORT" ] defines += [ "V8_I18N_SUPPORT" ]
} }
if (v8_enable_extra_checks == true) {
defines += [ "ENABLE_EXTRA_CHECKS" ]
}
if (v8_enable_handle_zapping == true) { if (v8_enable_handle_zapping == true) {
defines += [ "ENABLE_HANDLE_ZAPPING" ] defines += [ "ENABLE_HANDLE_ZAPPING" ]
} }
......
...@@ -85,10 +85,10 @@ ifeq ($(snapshot), external) ...@@ -85,10 +85,10 @@ ifeq ($(snapshot), external)
endif endif
# extrachecks=on/off # extrachecks=on/off
ifeq ($(extrachecks), on) ifeq ($(extrachecks), on)
GYPFLAGS += -Dv8_enable_extra_checks=1 -Dv8_enable_handle_zapping=1 GYPFLAGS += -Ddcheck_always_on=1 -Dv8_enable_handle_zapping=1
endif endif
ifeq ($(extrachecks), off) ifeq ($(extrachecks), off)
GYPFLAGS += -Dv8_enable_extra_checks=0 -Dv8_enable_handle_zapping=0 GYPFLAGS += -Ddcheck_always_on=0 -Dv8_enable_handle_zapping=0
endif endif
# gdbjit=on/off # gdbjit=on/off
ifeq ($(gdbjit), on) ifeq ($(gdbjit), on)
......
...@@ -102,13 +102,9 @@ ...@@ -102,13 +102,9 @@
'DebugBaseCommon': { 'DebugBaseCommon': {
'abstract': 1, 'abstract': 1,
'variables': { 'variables': {
'v8_enable_extra_checks%': 1,
'v8_enable_handle_zapping%': 1, 'v8_enable_handle_zapping%': 1,
}, },
'conditions': [ 'conditions': [
['v8_enable_extra_checks==1', {
'defines': ['ENABLE_EXTRA_CHECKS',],
}],
['v8_enable_handle_zapping==1', { ['v8_enable_handle_zapping==1', {
'defines': ['ENABLE_HANDLE_ZAPPING',], 'defines': ['ENABLE_HANDLE_ZAPPING',],
}], }],
...@@ -116,13 +112,9 @@ ...@@ -116,13 +112,9 @@
}, # Debug }, # Debug
'Release': { 'Release': {
'variables': { 'variables': {
'v8_enable_extra_checks%': 0,
'v8_enable_handle_zapping%': 1, 'v8_enable_handle_zapping%': 1,
}, },
'conditions': [ 'conditions': [
['v8_enable_extra_checks==1', {
'defines': ['ENABLE_EXTRA_CHECKS',],
}],
['v8_enable_handle_zapping==1', { ['v8_enable_handle_zapping==1', {
'defines': ['ENABLE_HANDLE_ZAPPING',], 'defines': ['ENABLE_HANDLE_ZAPPING',],
}], }],
......
...@@ -368,14 +368,14 @@ MAKE_TO_LOCAL(ExternalToLocal, JSObject, External) ...@@ -368,14 +368,14 @@ MAKE_TO_LOCAL(ExternalToLocal, JSObject, External)
// Implementations of OpenHandle // Implementations of OpenHandle
#define MAKE_OPEN_HANDLE(From, To) \ #define MAKE_OPEN_HANDLE(From, To) \
v8::internal::Handle<v8::internal::To> Utils::OpenHandle( \ v8::internal::Handle<v8::internal::To> Utils::OpenHandle( \
const v8::From* that, bool allow_empty_handle) { \ const v8::From* that, bool allow_empty_handle) { \
EXTRA_CHECK(allow_empty_handle || that != NULL); \ DCHECK(allow_empty_handle || that != NULL); \
EXTRA_CHECK(that == NULL || \ DCHECK(that == NULL || \
(*reinterpret_cast<v8::internal::Object* const*>(that))->Is##To()); \ (*reinterpret_cast<v8::internal::Object* const*>(that))->Is##To()); \
return v8::internal::Handle<v8::internal::To>( \ return v8::internal::Handle<v8::internal::To>( \
reinterpret_cast<v8::internal::To**>(const_cast<v8::From*>(that))); \ reinterpret_cast<v8::internal::To**>(const_cast<v8::From*>(that))); \
} }
OPEN_HANDLE_LIST(MAKE_OPEN_HANDLE) OPEN_HANDLE_LIST(MAKE_OPEN_HANDLE)
......
...@@ -214,12 +214,4 @@ void DumpBacktrace(); ...@@ -214,12 +214,4 @@ void DumpBacktrace();
#define DCHECK_NOT_NULL(p) DCHECK_NE(NULL, p) #define DCHECK_NOT_NULL(p) DCHECK_NE(NULL, p)
// "Extra checks" are lightweight checks that are enabled in some release
// builds.
#ifdef ENABLE_EXTRA_CHECKS
#define EXTRA_CHECK(condition) CHECK(condition)
#else
#define EXTRA_CHECK(condition) ((void) 0)
#endif
#endif // V8_BASE_LOGGING_H_ #endif // V8_BASE_LOGGING_H_
...@@ -2183,7 +2183,7 @@ void MacroAssembler::CallApiFunctionAndReturn( ...@@ -2183,7 +2183,7 @@ void MacroAssembler::CallApiFunctionAndReturn(
j(not_equal, &promote_scheduled_exception); j(not_equal, &promote_scheduled_exception);
bind(&exception_handled); bind(&exception_handled);
#if ENABLE_EXTRA_CHECKS #if DEBUG
// Check if the function returned a valid JavaScript value. // Check if the function returned a valid JavaScript value.
Label ok; Label ok;
Register return_value = eax; Register return_value = eax;
......
...@@ -2237,7 +2237,7 @@ bool Object::IsStringObjectWithCharacterAt(uint32_t index) { ...@@ -2237,7 +2237,7 @@ bool Object::IsStringObjectWithCharacterAt(uint32_t index) {
void Object::VerifyApiCallResultType() { void Object::VerifyApiCallResultType() {
#if ENABLE_EXTRA_CHECKS #if DEBUG
if (!(IsSmi() || if (!(IsSmi() ||
IsString() || IsString() ||
IsSymbol() || IsSymbol() ||
...@@ -2249,7 +2249,7 @@ void Object::VerifyApiCallResultType() { ...@@ -2249,7 +2249,7 @@ void Object::VerifyApiCallResultType() {
IsNull())) { IsNull())) {
FATAL("API call returned invalid object"); FATAL("API call returned invalid object");
} }
#endif // ENABLE_EXTRA_CHECKS #endif // DEBUG
} }
......
...@@ -13539,10 +13539,8 @@ MaybeHandle<JSObject> JSObject::GetKeysForNamedInterceptor( ...@@ -13539,10 +13539,8 @@ MaybeHandle<JSObject> JSObject::GetKeysForNamedInterceptor(
result = args.Call(enum_fun); result = args.Call(enum_fun);
} }
if (result.IsEmpty()) return MaybeHandle<JSObject>(); if (result.IsEmpty()) return MaybeHandle<JSObject>();
#if ENABLE_EXTRA_CHECKS DCHECK(v8::Utils::OpenHandle(*result)->IsJSArray() ||
CHECK(v8::Utils::OpenHandle(*result)->IsJSArray() || v8::Utils::OpenHandle(*result)->HasSloppyArgumentsElements());
v8::Utils::OpenHandle(*result)->HasSloppyArgumentsElements());
#endif
// Rebox before returning. // Rebox before returning.
return handle(*v8::Utils::OpenHandle(*result), isolate); return handle(*v8::Utils::OpenHandle(*result), isolate);
} }
...@@ -13564,10 +13562,8 @@ MaybeHandle<JSObject> JSObject::GetKeysForIndexedInterceptor( ...@@ -13564,10 +13562,8 @@ MaybeHandle<JSObject> JSObject::GetKeysForIndexedInterceptor(
result = args.Call(enum_fun); result = args.Call(enum_fun);
} }
if (result.IsEmpty()) return MaybeHandle<JSObject>(); if (result.IsEmpty()) return MaybeHandle<JSObject>();
#if ENABLE_EXTRA_CHECKS DCHECK(v8::Utils::OpenHandle(*result)->IsJSArray() ||
CHECK(v8::Utils::OpenHandle(*result)->IsJSArray() || v8::Utils::OpenHandle(*result)->HasSloppyArgumentsElements());
v8::Utils::OpenHandle(*result)->HasSloppyArgumentsElements());
#endif
// Rebox before returning. // Rebox before returning.
return handle(*v8::Utils::OpenHandle(*result), isolate); return handle(*v8::Utils::OpenHandle(*result), isolate);
} }
......
...@@ -799,7 +799,7 @@ void MacroAssembler::CallApiFunctionAndReturn( ...@@ -799,7 +799,7 @@ void MacroAssembler::CallApiFunctionAndReturn(
j(not_equal, &promote_scheduled_exception); j(not_equal, &promote_scheduled_exception);
bind(&exception_handled); bind(&exception_handled);
#if ENABLE_EXTRA_CHECKS #if DEBUG
// Check if the function returned a valid JavaScript value. // Check if the function returned a valid JavaScript value.
Label ok; Label ok;
Register return_value = rax; Register return_value = rax;
......
...@@ -2147,7 +2147,7 @@ void MacroAssembler::CallApiFunctionAndReturn( ...@@ -2147,7 +2147,7 @@ void MacroAssembler::CallApiFunctionAndReturn(
j(not_equal, &promote_scheduled_exception); j(not_equal, &promote_scheduled_exception);
bind(&exception_handled); bind(&exception_handled);
#if ENABLE_EXTRA_CHECKS #if DEBUG
// Check if the function returned a valid JavaScript value. // Check if the function returned a valid JavaScript value.
Label ok; Label ok;
Register return_value = eax; Register return_value = eax;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment