From b1ded1ce62f4b2351d21acba92fe80d957c5e9d5 Mon Sep 17 00:00:00 2001
From: Michael Hablich <hablich@chromium.org>
Date: Thu, 30 Jun 2016 14:08:31 +0200
Subject: [PATCH] Disable handle zapping on branch 5.3

BUG=chromium:318206
TBR=jochen@chromium.org, machenbach@chromium.org
LOG=n
NOTRY=true
NOPRESUBMIT=true

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

Cr-Commit-Position: refs/branch-heads/5.3@{#5}
Cr-Branched-From: 820a23aade5e74a92d794e05a0c2b3597f0da4b5-refs/heads/5.3.332@{#2}
Cr-Branched-From: 37538cb2c1b4d75c41af386cb4fedbe5566f5608-refs/heads/master@{#37308}
---
 BUILD.gn               | 2 +-
 gypfiles/features.gypi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index c162b824e09..3121dceccf7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -35,7 +35,7 @@ declare_args() {
   v8_enable_gdbjit = false
 
   # Sets -dENABLE_HANDLE_ZAPPING.
-  v8_enable_handle_zapping = true
+  v8_enable_handle_zapping = is_debug
 
   # Enable ECMAScript Internationalization API. Enabling this feature will
   # add a dependency on the ICU library.
diff --git a/gypfiles/features.gypi b/gypfiles/features.gypi
index f82a59f0f82..5a21a63e324 100644
--- a/gypfiles/features.gypi
+++ b/gypfiles/features.gypi
@@ -123,7 +123,7 @@
       },  # Debug
       'Release': {
         'variables': {
-          'v8_enable_handle_zapping%': 1,
+          'v8_enable_handle_zapping%': 0,
         },
         'conditions': [
           ['v8_enable_handle_zapping==1', {