-- cgit v1.2.3 From ca39d836d353ba00c29d6260fda046d406c0571b Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Tue, 24 Jun 2014 09:47:59 +0000 Subject: Disable handle zapping on 3.27 branch BUG=318206 R=jkummerow@chromium.org LOG=y Review URL: https://codereview.chromium.org/350853002 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@21962 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- build/features.gypi | 2 +- src/version.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/features.gypi b/build/features.gypi index e8f5b2f08..d542d05bb 100644 --- a/build/features.gypi +++ b/build/features.gypi @@ -111,7 +111,7 @@ 'Release': { 'variables': { 'v8_enable_extra_checks%': 0, - 'v8_enable_handle_zapping%': 1, + 'v8_enable_handle_zapping%': 0, }, 'conditions': [ ['v8_enable_extra_checks==1', { diff --git a/src/version.cc b/src/version.cc index 0d26e221b..2ae3ae6e9 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 0 +#define PATCH_LEVEL 1 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- cgit v1.2.3 From 84b86472bb519c85690c1cc7996b02ab618c0d16 Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Tue, 24 Jun 2014 14:13:26 +0000 Subject: Version 3.27.34.2 (merged r21903) Array.concat: properly go to dictionary mode when required BUG=chromium:387031 LOG=N R=danno@chromium.org Review URL: https://codereview.chromium.org/354623002 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@21976 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/runtime.cc | 12 ++++++++++-- src/version.cc | 2 +- test/mjsunit/regress/regress-crbug-387031.js | 15 +++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 test/mjsunit/regress/regress-crbug-387031.js diff --git a/src/runtime.cc b/src/runtime.cc index b97af64f8..15e1adaf0 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -10034,7 +10034,7 @@ class ArrayConcatVisitor { // getters on the arrays increasing the length of later arrays // during iteration. // This shouldn't happen in anything but pathological cases. - SetDictionaryMode(index); + SetDictionaryMode(); // Fall-through to dictionary mode. } ASSERT(!fast_elements_); @@ -10055,6 +10055,14 @@ class ArrayConcatVisitor { } else { index_offset_ += delta; } + // If the initial length estimate was off (see special case in visit()), + // but the array blowing the limit didn't contain elements beyond the + // provided-for index range, go to dictionary mode now. + if (fast_elements_ && + index_offset_ >= static_cast( + FixedArrayBase::cast(*storage_)->length())) { + SetDictionaryMode(); + } } bool exceeds_array_limit() { @@ -10076,7 +10084,7 @@ class ArrayConcatVisitor { private: // Convert storage to dictionary mode. - void SetDictionaryMode(uint32_t index) { + void SetDictionaryMode() { ASSERT(fast_elements_); Handle current_storage(*storage_); Handle slow_storage( diff --git a/src/version.cc b/src/version.cc index 2ae3ae6e9..a17db9c8d 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 1 +#define PATCH_LEVEL 2 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/mjsunit/regress/regress-crbug-387031.js b/test/mjsunit/regress/regress-crbug-387031.js new file mode 100644 index 000000000..77f52a9d3 --- /dev/null +++ b/test/mjsunit/regress/regress-crbug-387031.js @@ -0,0 +1,15 @@ +// Copyright 2014 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Flags: --allow-natives-syntax + +a = [1]; +b = []; +a.__defineGetter__(0, function () { + b.length = 0xffffffff; +}); +c = a.concat(b); +for (var i = 0; i < 20; i++) { + assertEquals(undefined, (c[i])); +} -- cgit v1.2.3 From d6a645f11c0b869f97961ce290c1d44bd4488e24 Mon Sep 17 00:00:00 2001 From: "ulan@chromium.org" Date: Mon, 30 Jun 2014 07:20:01 +0000 Subject: Version 3.27.34.3 (merged r22037) Keep CodeRange::current_allocation_block_index_ in range after r21869. BUG=305878,388328 LOG=N R=yangguo@chromium.org Review URL: https://codereview.chromium.org/332983006 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@22075 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/spaces.cc | 2 +- src/version.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/spaces.cc b/src/spaces.cc index 22233d9b3..1ffc31411 100644 --- a/src/spaces.cc +++ b/src/spaces.cc @@ -193,7 +193,7 @@ bool CodeRange::GetNextAllocationBlock(size_t requested) { return true; // Found a large enough allocation block. } } - + current_allocation_block_index_ = 0; // Code range is full or too fragmented. return false; } diff --git a/src/version.cc b/src/version.cc index a17db9c8d..cc52a0df7 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 2 +#define PATCH_LEVEL 3 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- cgit v1.2.3 From 70aa50bc4b052ffa5637e27e5d77126e3059fd06 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Tue, 1 Jul 2014 14:18:51 +0100 Subject: Update makefiles after merge of Chromium at 37.0.2062.10 This commit was generated by merge_from_chromium.py. Change-Id: I8c1e034c1674e24c2bb69aaf83756623ab8945f4 --- tools/gyp/mksnapshot.host.darwin-arm.mk | 3 +-- tools/gyp/mksnapshot.host.darwin-arm64.mk | 3 +-- tools/gyp/mksnapshot.host.darwin-mips.mk | 3 +-- tools/gyp/mksnapshot.host.darwin-x86.mk | 3 +-- tools/gyp/mksnapshot.host.darwin-x86_64.mk | 3 +-- tools/gyp/mksnapshot.host.linux-arm.mk | 3 +-- tools/gyp/mksnapshot.host.linux-arm64.mk | 3 +-- tools/gyp/mksnapshot.host.linux-mips.mk | 3 +-- tools/gyp/mksnapshot.host.linux-x86.mk | 3 +-- tools/gyp/mksnapshot.host.linux-x86_64.mk | 3 +-- tools/gyp/v8_base.host.darwin-arm.mk | 3 +-- tools/gyp/v8_base.host.darwin-arm64.mk | 3 +-- tools/gyp/v8_base.host.darwin-mips.mk | 3 +-- tools/gyp/v8_base.host.darwin-x86.mk | 3 +-- tools/gyp/v8_base.host.darwin-x86_64.mk | 3 +-- tools/gyp/v8_base.host.linux-arm.mk | 3 +-- tools/gyp/v8_base.host.linux-arm64.mk | 3 +-- tools/gyp/v8_base.host.linux-mips.mk | 3 +-- tools/gyp/v8_base.host.linux-x86.mk | 3 +-- tools/gyp/v8_base.host.linux-x86_64.mk | 3 +-- tools/gyp/v8_base.target.darwin-arm.mk | 3 +-- tools/gyp/v8_base.target.darwin-arm64.mk | 3 +-- tools/gyp/v8_base.target.darwin-mips.mk | 3 +-- tools/gyp/v8_base.target.darwin-x86.mk | 3 +-- tools/gyp/v8_base.target.darwin-x86_64.mk | 3 +-- tools/gyp/v8_base.target.linux-arm.mk | 3 +-- tools/gyp/v8_base.target.linux-arm64.mk | 3 +-- tools/gyp/v8_base.target.linux-mips.mk | 3 +-- tools/gyp/v8_base.target.linux-x86.mk | 3 +-- tools/gyp/v8_base.target.linux-x86_64.mk | 3 +-- tools/gyp/v8_libbase.host.darwin-arm.mk | 3 +-- tools/gyp/v8_libbase.host.darwin-arm64.mk | 3 +-- tools/gyp/v8_libbase.host.darwin-mips.mk | 3 +-- tools/gyp/v8_libbase.host.darwin-x86.mk | 3 +-- tools/gyp/v8_libbase.host.darwin-x86_64.mk | 3 +-- tools/gyp/v8_libbase.host.linux-arm.mk | 3 +-- tools/gyp/v8_libbase.host.linux-arm64.mk | 3 +-- tools/gyp/v8_libbase.host.linux-mips.mk | 3 +-- tools/gyp/v8_libbase.host.linux-x86.mk | 3 +-- tools/gyp/v8_libbase.host.linux-x86_64.mk | 3 +-- tools/gyp/v8_libbase.target.darwin-arm.mk | 3 +-- tools/gyp/v8_libbase.target.darwin-arm64.mk | 3 +-- tools/gyp/v8_libbase.target.darwin-mips.mk | 3 +-- tools/gyp/v8_libbase.target.darwin-x86.mk | 3 +-- tools/gyp/v8_libbase.target.darwin-x86_64.mk | 3 +-- tools/gyp/v8_libbase.target.linux-arm.mk | 3 +-- tools/gyp/v8_libbase.target.linux-arm64.mk | 3 +-- tools/gyp/v8_libbase.target.linux-mips.mk | 3 +-- tools/gyp/v8_libbase.target.linux-x86.mk | 3 +-- tools/gyp/v8_libbase.target.linux-x86_64.mk | 3 +-- tools/gyp/v8_nosnapshot.host.darwin-arm.mk | 3 +-- tools/gyp/v8_nosnapshot.host.darwin-arm64.mk | 3 +-- tools/gyp/v8_nosnapshot.host.darwin-mips.mk | 3 +-- tools/gyp/v8_nosnapshot.host.darwin-x86.mk | 3 +-- tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk | 3 +-- tools/gyp/v8_nosnapshot.host.linux-arm.mk | 3 +-- tools/gyp/v8_nosnapshot.host.linux-arm64.mk | 3 +-- tools/gyp/v8_nosnapshot.host.linux-mips.mk | 3 +-- tools/gyp/v8_nosnapshot.host.linux-x86.mk | 3 +-- tools/gyp/v8_nosnapshot.host.linux-x86_64.mk | 3 +-- tools/gyp/v8_snapshot.target.darwin-arm.mk | 3 +-- tools/gyp/v8_snapshot.target.darwin-arm64.mk | 3 +-- tools/gyp/v8_snapshot.target.darwin-mips.mk | 3 +-- tools/gyp/v8_snapshot.target.darwin-x86.mk | 3 +-- tools/gyp/v8_snapshot.target.darwin-x86_64.mk | 3 +-- tools/gyp/v8_snapshot.target.linux-arm.mk | 3 +-- tools/gyp/v8_snapshot.target.linux-arm64.mk | 3 +-- tools/gyp/v8_snapshot.target.linux-mips.mk | 3 +-- tools/gyp/v8_snapshot.target.linux-x86.mk | 3 +-- tools/gyp/v8_snapshot.target.linux-x86_64.mk | 3 +-- 70 files changed, 70 insertions(+), 140 deletions(-) diff --git a/tools/gyp/mksnapshot.host.darwin-arm.mk b/tools/gyp/mksnapshot.host.darwin-arm.mk index 1d9f06660..a2cb1d2d5 100644 --- a/tools/gyp/mksnapshot.host.darwin-arm.mk +++ b/tools/gyp/mksnapshot.host.darwin-arm.mk @@ -168,8 +168,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.darwin-arm64.mk b/tools/gyp/mksnapshot.host.darwin-arm64.mk index c720b61c0..f7c2c328a 100644 --- a/tools/gyp/mksnapshot.host.darwin-arm64.mk +++ b/tools/gyp/mksnapshot.host.darwin-arm64.mk @@ -164,8 +164,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.darwin-mips.mk b/tools/gyp/mksnapshot.host.darwin-mips.mk index fccd75cd2..03fba33ea 100644 --- a/tools/gyp/mksnapshot.host.darwin-mips.mk +++ b/tools/gyp/mksnapshot.host.darwin-mips.mk @@ -172,8 +172,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.darwin-x86.mk b/tools/gyp/mksnapshot.host.darwin-x86.mk index 0b1f83601..ae830feb0 100644 --- a/tools/gyp/mksnapshot.host.darwin-x86.mk +++ b/tools/gyp/mksnapshot.host.darwin-x86.mk @@ -164,8 +164,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.darwin-x86_64.mk b/tools/gyp/mksnapshot.host.darwin-x86_64.mk index 7999ffc4e..01a297280 100644 --- a/tools/gyp/mksnapshot.host.darwin-x86_64.mk +++ b/tools/gyp/mksnapshot.host.darwin-x86_64.mk @@ -164,8 +164,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.linux-arm.mk b/tools/gyp/mksnapshot.host.linux-arm.mk index 6ca1bedbf..c36cb4974 100644 --- a/tools/gyp/mksnapshot.host.linux-arm.mk +++ b/tools/gyp/mksnapshot.host.linux-arm.mk @@ -170,8 +170,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.linux-arm64.mk b/tools/gyp/mksnapshot.host.linux-arm64.mk index c294369ce..85bb90b8b 100644 --- a/tools/gyp/mksnapshot.host.linux-arm64.mk +++ b/tools/gyp/mksnapshot.host.linux-arm64.mk @@ -166,8 +166,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.linux-mips.mk b/tools/gyp/mksnapshot.host.linux-mips.mk index 3b45fb4ac..0de76a448 100644 --- a/tools/gyp/mksnapshot.host.linux-mips.mk +++ b/tools/gyp/mksnapshot.host.linux-mips.mk @@ -174,8 +174,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.linux-x86.mk b/tools/gyp/mksnapshot.host.linux-x86.mk index db2967e66..dd86e8b95 100644 --- a/tools/gyp/mksnapshot.host.linux-x86.mk +++ b/tools/gyp/mksnapshot.host.linux-x86.mk @@ -166,8 +166,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.linux-x86_64.mk b/tools/gyp/mksnapshot.host.linux-x86_64.mk index f59d483a9..8464ad7a9 100644 --- a/tools/gyp/mksnapshot.host.linux-x86_64.mk +++ b/tools/gyp/mksnapshot.host.linux-x86_64.mk @@ -166,8 +166,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.darwin-arm.mk b/tools/gyp/v8_base.host.darwin-arm.mk index 7eaaf334b..79110eb35 100644 --- a/tools/gyp/v8_base.host.darwin-arm.mk +++ b/tools/gyp/v8_base.host.darwin-arm.mk @@ -339,8 +339,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.darwin-arm64.mk b/tools/gyp/v8_base.host.darwin-arm64.mk index 2fe403f3a..84c2f9a2a 100644 --- a/tools/gyp/v8_base.host.darwin-arm64.mk +++ b/tools/gyp/v8_base.host.darwin-arm64.mk @@ -338,8 +338,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.darwin-mips.mk b/tools/gyp/v8_base.host.darwin-mips.mk index fba800fb2..08c2b928c 100644 --- a/tools/gyp/v8_base.host.darwin-mips.mk +++ b/tools/gyp/v8_base.host.darwin-mips.mk @@ -343,8 +343,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.darwin-x86.mk b/tools/gyp/v8_base.host.darwin-x86.mk index 22e79d663..272b8c6d4 100644 --- a/tools/gyp/v8_base.host.darwin-x86.mk +++ b/tools/gyp/v8_base.host.darwin-x86.mk @@ -333,8 +333,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.darwin-x86_64.mk b/tools/gyp/v8_base.host.darwin-x86_64.mk index 837bd686c..ccccf5a6b 100644 --- a/tools/gyp/v8_base.host.darwin-x86_64.mk +++ b/tools/gyp/v8_base.host.darwin-x86_64.mk @@ -333,8 +333,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.linux-arm.mk b/tools/gyp/v8_base.host.linux-arm.mk index 823c2bd7e..32631ad83 100644 --- a/tools/gyp/v8_base.host.linux-arm.mk +++ b/tools/gyp/v8_base.host.linux-arm.mk @@ -343,8 +343,7 @@ MY_DEFS_Release := \ '-DV8_LIBRT_NOT_AVAILABLE=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.linux-arm64.mk b/tools/gyp/v8_base.host.linux-arm64.mk index ac09f8212..7b87295ee 100644 --- a/tools/gyp/v8_base.host.linux-arm64.mk +++ b/tools/gyp/v8_base.host.linux-arm64.mk @@ -342,8 +342,7 @@ MY_DEFS_Release := \ '-DV8_LIBRT_NOT_AVAILABLE=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.linux-mips.mk b/tools/gyp/v8_base.host.linux-mips.mk index d91197a26..35b56cfb0 100644 --- a/tools/gyp/v8_base.host.linux-mips.mk +++ b/tools/gyp/v8_base.host.linux-mips.mk @@ -347,8 +347,7 @@ MY_DEFS_Release := \ '-DV8_LIBRT_NOT_AVAILABLE=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.linux-x86.mk b/tools/gyp/v8_base.host.linux-x86.mk index 100037ff9..7bddd1825 100644 --- a/tools/gyp/v8_base.host.linux-x86.mk +++ b/tools/gyp/v8_base.host.linux-x86.mk @@ -337,8 +337,7 @@ MY_DEFS_Release := \ '-DV8_LIBRT_NOT_AVAILABLE=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.linux-x86_64.mk b/tools/gyp/v8_base.host.linux-x86_64.mk index 9f56f23ae..846c5dbf6 100644 --- a/tools/gyp/v8_base.host.linux-x86_64.mk +++ b/tools/gyp/v8_base.host.linux-x86_64.mk @@ -337,8 +337,7 @@ MY_DEFS_Release := \ '-DV8_LIBRT_NOT_AVAILABLE=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.darwin-arm.mk b/tools/gyp/v8_base.target.darwin-arm.mk index a5fdf0039..8393a9cac 100644 --- a/tools/gyp/v8_base.target.darwin-arm.mk +++ b/tools/gyp/v8_base.target.darwin-arm.mk @@ -403,8 +403,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.darwin-arm64.mk b/tools/gyp/v8_base.target.darwin-arm64.mk index 23a96edbd..52ce047df 100644 --- a/tools/gyp/v8_base.target.darwin-arm64.mk +++ b/tools/gyp/v8_base.target.darwin-arm64.mk @@ -381,8 +381,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.darwin-mips.mk b/tools/gyp/v8_base.target.darwin-mips.mk index 873d97c25..f0831b96f 100644 --- a/tools/gyp/v8_base.target.darwin-mips.mk +++ b/tools/gyp/v8_base.target.darwin-mips.mk @@ -395,8 +395,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.darwin-x86.mk b/tools/gyp/v8_base.target.darwin-x86.mk index 8b5178688..6a83c4b13 100644 --- a/tools/gyp/v8_base.target.darwin-x86.mk +++ b/tools/gyp/v8_base.target.darwin-x86.mk @@ -386,8 +386,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.darwin-x86_64.mk b/tools/gyp/v8_base.target.darwin-x86_64.mk index 703894b4a..a7185b0aa 100644 --- a/tools/gyp/v8_base.target.darwin-x86_64.mk +++ b/tools/gyp/v8_base.target.darwin-x86_64.mk @@ -384,8 +384,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.linux-arm.mk b/tools/gyp/v8_base.target.linux-arm.mk index a5fdf0039..8393a9cac 100644 --- a/tools/gyp/v8_base.target.linux-arm.mk +++ b/tools/gyp/v8_base.target.linux-arm.mk @@ -403,8 +403,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.linux-arm64.mk b/tools/gyp/v8_base.target.linux-arm64.mk index 23a96edbd..52ce047df 100644 --- a/tools/gyp/v8_base.target.linux-arm64.mk +++ b/tools/gyp/v8_base.target.linux-arm64.mk @@ -381,8 +381,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.linux-mips.mk b/tools/gyp/v8_base.target.linux-mips.mk index 873d97c25..f0831b96f 100644 --- a/tools/gyp/v8_base.target.linux-mips.mk +++ b/tools/gyp/v8_base.target.linux-mips.mk @@ -395,8 +395,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.linux-x86.mk b/tools/gyp/v8_base.target.linux-x86.mk index 8b5178688..6a83c4b13 100644 --- a/tools/gyp/v8_base.target.linux-x86.mk +++ b/tools/gyp/v8_base.target.linux-x86.mk @@ -386,8 +386,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.linux-x86_64.mk b/tools/gyp/v8_base.target.linux-x86_64.mk index 703894b4a..a7185b0aa 100644 --- a/tools/gyp/v8_base.target.linux-x86_64.mk +++ b/tools/gyp/v8_base.target.linux-x86_64.mk @@ -384,8 +384,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.darwin-arm.mk b/tools/gyp/v8_libbase.host.darwin-arm.mk index d7055251b..088ba06a9 100644 --- a/tools/gyp/v8_libbase.host.darwin-arm.mk +++ b/tools/gyp/v8_libbase.host.darwin-arm.mk @@ -160,8 +160,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.darwin-arm64.mk b/tools/gyp/v8_libbase.host.darwin-arm64.mk index e19f14e32..a9d0f57a3 100644 --- a/tools/gyp/v8_libbase.host.darwin-arm64.mk +++ b/tools/gyp/v8_libbase.host.darwin-arm64.mk @@ -156,8 +156,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.darwin-mips.mk b/tools/gyp/v8_libbase.host.darwin-mips.mk index 132e77ea3..1de53086a 100644 --- a/tools/gyp/v8_libbase.host.darwin-mips.mk +++ b/tools/gyp/v8_libbase.host.darwin-mips.mk @@ -164,8 +164,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.darwin-x86.mk b/tools/gyp/v8_libbase.host.darwin-x86.mk index c796fc0e2..183365c07 100644 --- a/tools/gyp/v8_libbase.host.darwin-x86.mk +++ b/tools/gyp/v8_libbase.host.darwin-x86.mk @@ -156,8 +156,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.darwin-x86_64.mk b/tools/gyp/v8_libbase.host.darwin-x86_64.mk index be9ff47ca..32554a059 100644 --- a/tools/gyp/v8_libbase.host.darwin-x86_64.mk +++ b/tools/gyp/v8_libbase.host.darwin-x86_64.mk @@ -156,8 +156,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.linux-arm.mk b/tools/gyp/v8_libbase.host.linux-arm.mk index 6edd27e47..ebb02923a 100644 --- a/tools/gyp/v8_libbase.host.linux-arm.mk +++ b/tools/gyp/v8_libbase.host.linux-arm.mk @@ -162,8 +162,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.linux-arm64.mk b/tools/gyp/v8_libbase.host.linux-arm64.mk index b0cbe856c..8685a404f 100644 --- a/tools/gyp/v8_libbase.host.linux-arm64.mk +++ b/tools/gyp/v8_libbase.host.linux-arm64.mk @@ -158,8 +158,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.linux-mips.mk b/tools/gyp/v8_libbase.host.linux-mips.mk index f43bc3395..5105f8bd0 100644 --- a/tools/gyp/v8_libbase.host.linux-mips.mk +++ b/tools/gyp/v8_libbase.host.linux-mips.mk @@ -166,8 +166,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.linux-x86.mk b/tools/gyp/v8_libbase.host.linux-x86.mk index 45dfca88a..81a4984d4 100644 --- a/tools/gyp/v8_libbase.host.linux-x86.mk +++ b/tools/gyp/v8_libbase.host.linux-x86.mk @@ -158,8 +158,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.linux-x86_64.mk b/tools/gyp/v8_libbase.host.linux-x86_64.mk index b97b6e557..f4ef63904 100644 --- a/tools/gyp/v8_libbase.host.linux-x86_64.mk +++ b/tools/gyp/v8_libbase.host.linux-x86_64.mk @@ -158,8 +158,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.darwin-arm.mk b/tools/gyp/v8_libbase.target.darwin-arm.mk index 1622462a4..ca1c27cbb 100644 --- a/tools/gyp/v8_libbase.target.darwin-arm.mk +++ b/tools/gyp/v8_libbase.target.darwin-arm.mk @@ -222,8 +222,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.darwin-arm64.mk b/tools/gyp/v8_libbase.target.darwin-arm64.mk index 5edb048ba..f3f0c23f7 100644 --- a/tools/gyp/v8_libbase.target.darwin-arm64.mk +++ b/tools/gyp/v8_libbase.target.darwin-arm64.mk @@ -197,8 +197,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.darwin-mips.mk b/tools/gyp/v8_libbase.target.darwin-mips.mk index 354477ef8..9d5845c65 100644 --- a/tools/gyp/v8_libbase.target.darwin-mips.mk +++ b/tools/gyp/v8_libbase.target.darwin-mips.mk @@ -214,8 +214,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.darwin-x86.mk b/tools/gyp/v8_libbase.target.darwin-x86.mk index 8ee6ed004..655f092ec 100644 --- a/tools/gyp/v8_libbase.target.darwin-x86.mk +++ b/tools/gyp/v8_libbase.target.darwin-x86.mk @@ -207,8 +207,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.darwin-x86_64.mk b/tools/gyp/v8_libbase.target.darwin-x86_64.mk index c376c9666..737d1c468 100644 --- a/tools/gyp/v8_libbase.target.darwin-x86_64.mk +++ b/tools/gyp/v8_libbase.target.darwin-x86_64.mk @@ -205,8 +205,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.linux-arm.mk b/tools/gyp/v8_libbase.target.linux-arm.mk index 1622462a4..ca1c27cbb 100644 --- a/tools/gyp/v8_libbase.target.linux-arm.mk +++ b/tools/gyp/v8_libbase.target.linux-arm.mk @@ -222,8 +222,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.linux-arm64.mk b/tools/gyp/v8_libbase.target.linux-arm64.mk index 5edb048ba..f3f0c23f7 100644 --- a/tools/gyp/v8_libbase.target.linux-arm64.mk +++ b/tools/gyp/v8_libbase.target.linux-arm64.mk @@ -197,8 +197,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.linux-mips.mk b/tools/gyp/v8_libbase.target.linux-mips.mk index 354477ef8..9d5845c65 100644 --- a/tools/gyp/v8_libbase.target.linux-mips.mk +++ b/tools/gyp/v8_libbase.target.linux-mips.mk @@ -214,8 +214,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.linux-x86.mk b/tools/gyp/v8_libbase.target.linux-x86.mk index 8ee6ed004..655f092ec 100644 --- a/tools/gyp/v8_libbase.target.linux-x86.mk +++ b/tools/gyp/v8_libbase.target.linux-x86.mk @@ -207,8 +207,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.linux-x86_64.mk b/tools/gyp/v8_libbase.target.linux-x86_64.mk index c376c9666..737d1c468 100644 --- a/tools/gyp/v8_libbase.target.linux-x86_64.mk +++ b/tools/gyp/v8_libbase.target.linux-x86_64.mk @@ -205,8 +205,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk index 5b51a1539..ef4324fbd 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk @@ -171,8 +171,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk index 07e962673..3c55699f1 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk @@ -167,8 +167,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk index 1c30b529f..0d70563cd 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk @@ -175,8 +175,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk index 5dc42a517..01e83bee2 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk @@ -167,8 +167,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk index 3b48330f1..af29e5243 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk @@ -167,8 +167,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm.mk b/tools/gyp/v8_nosnapshot.host.linux-arm.mk index 5fb3cfa51..67db23e16 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-arm.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-arm.mk @@ -173,8 +173,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk index 63e5afd18..7760a775d 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk @@ -169,8 +169,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.linux-mips.mk b/tools/gyp/v8_nosnapshot.host.linux-mips.mk index 6fd58beb3..ff115d21b 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-mips.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-mips.mk @@ -177,8 +177,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86.mk b/tools/gyp/v8_nosnapshot.host.linux-x86.mk index f42532523..d4a27aa25 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-x86.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-x86.mk @@ -169,8 +169,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk index cf8988dcd..41883c9d0 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk @@ -169,8 +169,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.darwin-arm.mk b/tools/gyp/v8_snapshot.target.darwin-arm.mk index 199a4b43c..2e48f6de3 100644 --- a/tools/gyp/v8_snapshot.target.darwin-arm.mk +++ b/tools/gyp/v8_snapshot.target.darwin-arm.mk @@ -249,8 +249,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.darwin-arm64.mk b/tools/gyp/v8_snapshot.target.darwin-arm64.mk index 28fa8f388..88784354c 100644 --- a/tools/gyp/v8_snapshot.target.darwin-arm64.mk +++ b/tools/gyp/v8_snapshot.target.darwin-arm64.mk @@ -224,8 +224,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.darwin-mips.mk b/tools/gyp/v8_snapshot.target.darwin-mips.mk index bc76dd14b..2bda27624 100644 --- a/tools/gyp/v8_snapshot.target.darwin-mips.mk +++ b/tools/gyp/v8_snapshot.target.darwin-mips.mk @@ -241,8 +241,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.darwin-x86.mk b/tools/gyp/v8_snapshot.target.darwin-x86.mk index d89b4c49a..b8172f318 100644 --- a/tools/gyp/v8_snapshot.target.darwin-x86.mk +++ b/tools/gyp/v8_snapshot.target.darwin-x86.mk @@ -234,8 +234,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk index 435528490..227d258aa 100644 --- a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk +++ b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk @@ -232,8 +232,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.linux-arm.mk b/tools/gyp/v8_snapshot.target.linux-arm.mk index 199a4b43c..2e48f6de3 100644 --- a/tools/gyp/v8_snapshot.target.linux-arm.mk +++ b/tools/gyp/v8_snapshot.target.linux-arm.mk @@ -249,8 +249,7 @@ MY_DEFS_Release := \ '-DCAN_USE_ARMV7_INSTRUCTIONS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.linux-arm64.mk b/tools/gyp/v8_snapshot.target.linux-arm64.mk index 28fa8f388..88784354c 100644 --- a/tools/gyp/v8_snapshot.target.linux-arm64.mk +++ b/tools/gyp/v8_snapshot.target.linux-arm64.mk @@ -224,8 +224,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.linux-mips.mk b/tools/gyp/v8_snapshot.target.linux-mips.mk index bc76dd14b..2bda27624 100644 --- a/tools/gyp/v8_snapshot.target.linux-mips.mk +++ b/tools/gyp/v8_snapshot.target.linux-mips.mk @@ -241,8 +241,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.linux-x86.mk b/tools/gyp/v8_snapshot.target.linux-x86.mk index d89b4c49a..b8172f318 100644 --- a/tools/gyp/v8_snapshot.target.linux-x86.mk +++ b/tools/gyp/v8_snapshot.target.linux-x86.mk @@ -234,8 +234,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.linux-x86_64.mk b/tools/gyp/v8_snapshot.target.linux-x86_64.mk index 435528490..227d258aa 100644 --- a/tools/gyp/v8_snapshot.target.linux-x86_64.mk +++ b/tools/gyp/v8_snapshot.target.linux-x86_64.mk @@ -232,8 +232,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS -- cgit v1.2.3 From b650062a08d43684a58ae310a372be623fdf0b3c Mon Sep 17 00:00:00 2001 From: "ulan@chromium.org" Date: Wed, 2 Jul 2014 12:53:18 +0000 Subject: Version 3.27.34.4 (merged r22003) Grow heap slower if GC freed many global handles. BUG=263503,305878 LOG=N R=yangguo@chromium.org Review URL: https://codereview.chromium.org/362993002 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@22157 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/global-handles.cc | 18 +++++++------- src/global-handles.h | 6 ++--- src/heap.cc | 67 +++++++++++++++++++++++++++++++++++++++------------ src/heap.h | 19 ++------------- src/version.cc | 2 +- 5 files changed, 66 insertions(+), 46 deletions(-) diff --git a/src/global-handles.cc b/src/global-handles.cc index ba19fe167..a5ae2d562 100644 --- a/src/global-handles.cc +++ b/src/global-handles.cc @@ -611,21 +611,21 @@ bool GlobalHandles::IterateObjectGroups(ObjectVisitor* v, } -bool GlobalHandles::PostGarbageCollectionProcessing( +int GlobalHandles::PostGarbageCollectionProcessing( GarbageCollector collector, GCTracer* tracer) { // Process weak global handle callbacks. This must be done after the // GC is completely done, because the callbacks may invoke arbitrary // API functions. ASSERT(isolate_->heap()->gc_state() == Heap::NOT_IN_GC); const int initial_post_gc_processing_count = ++post_gc_processing_count_; - bool next_gc_likely_to_collect_more = false; + int freed_nodes = 0; if (collector == SCAVENGER) { for (int i = 0; i < new_space_nodes_.length(); ++i) { Node* node = new_space_nodes_[i]; ASSERT(node->is_in_new_space_list()); if (!node->IsRetainer()) { // Free nodes do not have weak callbacks. Do not use them to compute - // the next_gc_likely_to_collect_more. + // the freed_nodes. continue; } // Skip dependent handles. Their weak callbacks might expect to be @@ -641,29 +641,29 @@ bool GlobalHandles::PostGarbageCollectionProcessing( // PostGarbageCollection processing. The current node might // have been deleted in that round, so we need to bail out (or // restart the processing). - return next_gc_likely_to_collect_more; + return freed_nodes; } } if (!node->IsRetainer()) { - next_gc_likely_to_collect_more = true; + freed_nodes++; } } } else { for (NodeIterator it(this); !it.done(); it.Advance()) { if (!it.node()->IsRetainer()) { // Free nodes do not have weak callbacks. Do not use them to compute - // the next_gc_likely_to_collect_more. + // the freed_nodes. continue; } it.node()->clear_partially_dependent(); if (it.node()->PostGarbageCollectionProcessing(isolate_)) { if (initial_post_gc_processing_count != post_gc_processing_count_) { // See the comment above. - return next_gc_likely_to_collect_more; + return freed_nodes; } } if (!it.node()->IsRetainer()) { - next_gc_likely_to_collect_more = true; + freed_nodes++; } } } @@ -686,7 +686,7 @@ bool GlobalHandles::PostGarbageCollectionProcessing( } } new_space_nodes_.Rewind(last); - return next_gc_likely_to_collect_more; + return freed_nodes; } diff --git a/src/global-handles.h b/src/global-handles.h index a8631f07a..2f5afc934 100644 --- a/src/global-handles.h +++ b/src/global-handles.h @@ -155,9 +155,9 @@ class GlobalHandles { static bool IsWeak(Object** location); // Process pending weak handles. - // Returns true if next major GC is likely to collect more garbage. - bool PostGarbageCollectionProcessing(GarbageCollector collector, - GCTracer* tracer); + // Returns the number of freed nodes. + int PostGarbageCollectionProcessing(GarbageCollector collector, + GCTracer* tracer); // Iterates over all strong handles. void IterateStrongRoots(ObjectVisitor* v); diff --git a/src/heap.cc b/src/heap.cc index 7260e7a27..513757085 100644 --- a/src/heap.cc +++ b/src/heap.cc @@ -60,7 +60,6 @@ Heap::Heap() // Will be 4 * reserved_semispace_size_ to ensure that young // generation can be aligned to its size. maximum_committed_(0), - old_space_growing_factor_(4), survived_since_last_expansion_(0), sweep_generation_(0), always_allocate_scope_depth_(0), @@ -87,7 +86,6 @@ Heap::Heap() allocation_timeout_(0), #endif // DEBUG old_generation_allocation_limit_(kMinimumOldGenerationAllocationLimit), - size_of_old_gen_at_last_old_space_gc_(0), old_gen_exhausted_(false), inline_allocation_disabled_(false), store_buffer_rebuilder_(store_buffer()), @@ -1053,7 +1051,7 @@ bool Heap::PerformGarbageCollection( GarbageCollector collector, GCTracer* tracer, const v8::GCCallbackFlags gc_callback_flags) { - bool next_gc_likely_to_collect_more = false; + int freed_global_handles = 0; if (collector != SCAVENGER) { PROFILE(isolate_, CodeMovingGCEvent()); @@ -1093,12 +1091,11 @@ bool Heap::PerformGarbageCollection( // Perform mark-sweep with optional compaction. MarkCompact(tracer); sweep_generation_++; - - size_of_old_gen_at_last_old_space_gc_ = PromotedSpaceSizeOfObjects(); - + // Temporarily set the limit for case when PostGarbageCollectionProcessing + // allocates and triggers GC. The real limit is set at after + // PostGarbageCollectionProcessing. old_generation_allocation_limit_ = - OldGenerationAllocationLimit(size_of_old_gen_at_last_old_space_gc_); - + OldGenerationAllocationLimit(PromotedSpaceSizeOfObjects(), 0); old_gen_exhausted_ = false; } else { tracer_ = tracer; @@ -1117,7 +1114,7 @@ bool Heap::PerformGarbageCollection( gc_post_processing_depth_++; { AllowHeapAllocation allow_allocation; GCTracer::Scope scope(tracer, GCTracer::Scope::EXTERNAL); - next_gc_likely_to_collect_more = + freed_global_handles = isolate_->global_handles()->PostGarbageCollectionProcessing( collector, tracer); } @@ -1132,6 +1129,9 @@ bool Heap::PerformGarbageCollection( // Register the amount of external allocated memory. amount_of_external_allocated_memory_at_last_global_gc_ = amount_of_external_allocated_memory_; + old_generation_allocation_limit_ = + OldGenerationAllocationLimit(PromotedSpaceSizeOfObjects(), + freed_global_handles); } { GCCallbacksScope scope(this); @@ -1150,7 +1150,7 @@ bool Heap::PerformGarbageCollection( } #endif - return next_gc_likely_to_collect_more; + return freed_global_handles > 0; } @@ -4965,12 +4965,6 @@ bool Heap::ConfigureHeap(int max_semi_space_size, code_range_size_ = code_range_size * MB; - // We set the old generation growing factor to 2 to grow the heap slower on - // memory-constrained devices. - if (max_old_generation_size_ <= kMaxOldSpaceSizeMediumMemoryDevice) { - old_space_growing_factor_ = 2; - } - configured_ = true; return true; } @@ -5039,6 +5033,47 @@ int64_t Heap::PromotedExternalMemorySize() { } +intptr_t Heap::OldGenerationAllocationLimit(intptr_t old_gen_size, + int freed_global_handles) { + const int kMaxHandles = 1000; + const int kMinHandles = 100; + double min_factor = 1.1; + double max_factor = 4; + // We set the old generation growing factor to 2 to grow the heap slower on + // memory-constrained devices. + if (max_old_generation_size_ <= kMaxOldSpaceSizeMediumMemoryDevice) { + max_factor = 2; + } + // If there are many freed global handles, then the next full GC will + // likely collect a lot of garbage. Choose the heap growing factor + // depending on freed global handles. + // TODO(ulan, hpayer): Take into account mutator utilization. + double factor; + if (freed_global_handles <= kMinHandles) { + factor = max_factor; + } else if (freed_global_handles >= kMaxHandles) { + factor = min_factor; + } else { + // Compute factor using linear interpolation between points + // (kMinHandles, max_factor) and (kMaxHandles, min_factor). + factor = max_factor - + (freed_global_handles - kMinHandles) * (max_factor - min_factor) / + (kMaxHandles - kMinHandles); + } + + if (FLAG_stress_compaction || + mark_compact_collector()->reduce_memory_footprint_) { + factor = min_factor; + } + + intptr_t limit = static_cast(old_gen_size * factor); + limit = Max(limit, kMinimumOldGenerationAllocationLimit); + limit += new_space_.Capacity(); + intptr_t halfway_to_the_max = (old_gen_size + max_old_generation_size_) / 2; + return Min(limit, halfway_to_the_max); +} + + void Heap::EnableInlineAllocation() { if (!inline_allocation_disabled_) return; inline_allocation_disabled_ = false; diff --git a/src/heap.h b/src/heap.h index 97de93eab..b5f42b431 100644 --- a/src/heap.h +++ b/src/heap.h @@ -1085,15 +1085,8 @@ class Heap { static const int kMaxExecutableSizeHugeMemoryDevice = 700 * kPointerMultiplier; - intptr_t OldGenerationAllocationLimit(intptr_t old_gen_size) { - intptr_t limit = FLAG_stress_compaction - ? old_gen_size + old_gen_size / 10 - : old_gen_size * old_space_growing_factor_; - limit = Max(limit, kMinimumOldGenerationAllocationLimit); - limit += new_space_.Capacity(); - intptr_t halfway_to_the_max = (old_gen_size + max_old_generation_size_) / 2; - return Min(limit, halfway_to_the_max); - } + intptr_t OldGenerationAllocationLimit(intptr_t old_gen_size, + int freed_global_handles); // Indicates whether inline bump-pointer allocation has been disabled. bool inline_allocation_disabled() { return inline_allocation_disabled_; } @@ -1513,11 +1506,6 @@ class Heap { intptr_t max_executable_size_; intptr_t maximum_committed_; - // The old space growing factor is used in the old space heap growing - // strategy. The new old space size is the current old space size times - // old_space_growing_factor_. - int old_space_growing_factor_; - // For keeping track of how much data has survived // scavenge since last new space expansion. int survived_since_last_expansion_; @@ -1586,9 +1574,6 @@ class Heap { // generation and on every allocation in large object space. intptr_t old_generation_allocation_limit_; - // Used to adjust the limits that control the timing of the next GC. - intptr_t size_of_old_gen_at_last_old_space_gc_; - // Indicates that an allocation has failed in the old generation since the // last GC. bool old_gen_exhausted_; diff --git a/src/version.cc b/src/version.cc index cc52a0df7..59aab6aa4 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 3 +#define PATCH_LEVEL 4 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- cgit v1.2.3 From dc9b14d0e5f039213f6644c9ec2ffab31ad27a5c Mon Sep 17 00:00:00 2001 From: "jarin@chromium.org" Date: Tue, 8 Jul 2014 08:50:03 +0000 Subject: Version 3.27.34.5 (merged r21907) Add missing map check to optimized f.apply(...) BUG=386034 LOG=N R=machenbach@chromium.org Review URL: https://codereview.chromium.org/373003003 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@22272 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/hydrogen.cc | 6 ++++-- src/version.cc | 2 +- test/mjsunit/regress/regress-386034.js | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 test/mjsunit/regress/regress-386034.js diff --git a/src/hydrogen.cc b/src/hydrogen.cc index 8be2c6717..6e5ea741b 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -8563,10 +8563,12 @@ bool HOptimizedGraphBuilder::TryCallApply(Call* expr) { HValue* function = Pop(); // f Drop(1); // apply + HValue* checked_function = AddCheckMap(function, function_map); + if (function_state()->outer() == NULL) { HInstruction* elements = Add(false); HInstruction* length = Add(elements); - HValue* wrapped_receiver = BuildWrapReceiver(receiver, function); + HValue* wrapped_receiver = BuildWrapReceiver(receiver, checked_function); HInstruction* result = New(function, wrapped_receiver, length, @@ -8582,7 +8584,7 @@ bool HOptimizedGraphBuilder::TryCallApply(Call* expr) { const ZoneList* arguments_values = args->arguments_values(); int arguments_count = arguments_values->length(); Push(function); - Push(BuildWrapReceiver(receiver, function)); + Push(BuildWrapReceiver(receiver, checked_function)); for (int i = 1; i < arguments_count; i++) { Push(arguments_values->at(i)); } diff --git a/src/version.cc b/src/version.cc index 59aab6aa4..b46825b36 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 4 +#define PATCH_LEVEL 5 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/mjsunit/regress/regress-386034.js b/test/mjsunit/regress/regress-386034.js new file mode 100644 index 000000000..d770ce91b --- /dev/null +++ b/test/mjsunit/regress/regress-386034.js @@ -0,0 +1,19 @@ +// Copyright 2014 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Flags: --allow-natives-syntax + +function f(x) { + var v = x; + for (i = 0; i < 1; i++) { + v.apply(this, arguments); + } +} + +function g() {} + +f(g); +f(g); +%OptimizeFunctionOnNextCall(f); +assertThrows(function() { f('----'); }, TypeError); -- cgit v1.2.3 From 0ce8f0b69763279bcd71f5766eeab4b1cf1eb72c Mon Sep 17 00:00:00 2001 From: "yangguo@chromium.org" Date: Mon, 14 Jul 2014 13:13:41 +0000 Subject: Version 3.27.34.6 (merged r22029) Compile optimized code with active debugger but no break points. BUG=386492 LOG=N R=machenbach@chromium.org Review URL: https://codereview.chromium.org/388233002 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@22375 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/codegen.cc | 2 +- src/compiler.cc | 6 ++++-- src/objects.h | 2 +- src/version.cc | 2 +- test/cctest/cctest.status | 3 +++ test/mjsunit/debug-compile-optimized.js | 18 ++++++++++++++++++ 6 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 test/mjsunit/debug-compile-optimized.js diff --git a/src/codegen.cc b/src/codegen.cc index 753d522d6..c039e40c9 100644 --- a/src/codegen.cc +++ b/src/codegen.cc @@ -151,7 +151,7 @@ Handle CodeGenerator::MakeCodeEpilogue(MacroAssembler* masm, isolate->factory()->NewCode(desc, flags, masm->CodeObject(), false, is_crankshafted, info->prologue_offset(), - info->is_debug()); + info->is_debug() && !is_crankshafted); isolate->counters()->total_compiled_code_size()->Increment( code->instruction_size()); isolate->heap()->IncrementCodeGeneratedBytes(is_crankshafted, diff --git a/src/compiler.cc b/src/compiler.cc index 42fcc7840..0d3f146ab 100644 --- a/src/compiler.cc +++ b/src/compiler.cc @@ -297,8 +297,10 @@ OptimizedCompileJob::Status OptimizedCompileJob::CreateGraph() { // generated code for this from the shared function object. if (FLAG_always_full_compiler) return AbortOptimization(); - // Do not use crankshaft if compiling for debugging. - if (info()->is_debug()) return AbortOptimization(kDebuggerIsActive); + // Do not use crankshaft if we need to be able to set break points. + if (isolate()->DebuggerHasBreakPoints()) { + return AbortOptimization(kDebuggerHasBreakPoints); + } // Limit the number of times we re-compile a functions with // the optimizing compiler. diff --git a/src/objects.h b/src/objects.h index 46661b681..73566d885 100644 --- a/src/objects.h +++ b/src/objects.h @@ -1036,7 +1036,7 @@ template inline bool Is(Object* obj); V(kCopyBuffersOverlap, "Copy buffers overlap") \ V(kCouldNotGenerateZero, "Could not generate +0.0") \ V(kCouldNotGenerateNegativeZero, "Could not generate -0.0") \ - V(kDebuggerIsActive, "Debugger is active") \ + V(kDebuggerHasBreakPoints, "Debugger has break points") \ V(kDebuggerStatement, "DebuggerStatement") \ V(kDeclarationInCatchContext, "Declaration in catch context") \ V(kDeclarationInWithContext, "Declaration in with context") \ diff --git a/src/version.cc b/src/version.cc index b46825b36..1f2191728 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 5 +#define PATCH_LEVEL 6 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status index f4fadb320..3dd25abd1 100644 --- a/test/cctest/cctest.status +++ b/test/cctest/cctest.status @@ -75,6 +75,9 @@ # BUG(3287). (test-cpu-profiler/SampleWhenFrameIsNotSetup) 'test-cpu-profiler/*': [PASS, FLAKY], + # BUG(crbug/386492). This will be fixed by r22029. + 'test-debug/ThreadedDebugging': [PASS, FAIL], + ############################################################################ # Slow tests. 'test-api/Threading1': [PASS, ['mode == debug', SLOW]], diff --git a/test/mjsunit/debug-compile-optimized.js b/test/mjsunit/debug-compile-optimized.js new file mode 100644 index 000000000..468605aba --- /dev/null +++ b/test/mjsunit/debug-compile-optimized.js @@ -0,0 +1,18 @@ +// Copyright 2014 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Flags: --expose-debug-as debug --allow-natives-syntax --crankshaft + +Debug = debug.Debug; + +Debug.setListener(function() {}); + +function f() {} +f(); +f(); +%OptimizeFunctionOnNextCall(f); +f(); +assertOptimized(f); + +Debug.setListener(null); -- cgit v1.2.3 From d4205b7f94e015214bb2fdd95bb32342c5b62f4b Mon Sep 17 00:00:00 2001 From: Bo Liu Date: Tue, 15 Jul 2014 14:01:39 -0700 Subject: Update makefiles after merge of Chromium at 37.0.2062.21 This commit was generated by merge_from_chromium.py. Change-Id: I7a0c35d35e9af8d2978d9e9b7e055a9fc89dfe49 --- tools/gyp/mksnapshot.host.darwin-arm.mk | 2 +- tools/gyp/mksnapshot.host.darwin-arm64.mk | 2 -- tools/gyp/mksnapshot.host.darwin-mips.mk | 2 +- tools/gyp/mksnapshot.host.darwin-x86.mk | 2 +- tools/gyp/mksnapshot.host.darwin-x86_64.mk | 2 +- tools/gyp/mksnapshot.host.linux-arm.mk | 2 +- tools/gyp/mksnapshot.host.linux-arm64.mk | 2 -- tools/gyp/mksnapshot.host.linux-mips.mk | 2 +- tools/gyp/mksnapshot.host.linux-x86.mk | 2 +- tools/gyp/mksnapshot.host.linux-x86_64.mk | 2 +- tools/gyp/v8_base.host.darwin-arm.mk | 2 +- tools/gyp/v8_base.host.darwin-arm64.mk | 2 -- tools/gyp/v8_base.host.darwin-mips.mk | 2 +- tools/gyp/v8_base.host.darwin-x86.mk | 2 +- tools/gyp/v8_base.host.darwin-x86_64.mk | 2 +- tools/gyp/v8_base.host.linux-arm.mk | 2 +- tools/gyp/v8_base.host.linux-arm64.mk | 2 -- tools/gyp/v8_base.host.linux-mips.mk | 2 +- tools/gyp/v8_base.host.linux-x86.mk | 2 +- tools/gyp/v8_base.host.linux-x86_64.mk | 2 +- tools/gyp/v8_base.target.darwin-arm.mk | 2 +- tools/gyp/v8_base.target.darwin-arm64.mk | 2 -- tools/gyp/v8_base.target.darwin-mips.mk | 2 +- tools/gyp/v8_base.target.darwin-x86.mk | 2 +- tools/gyp/v8_base.target.darwin-x86_64.mk | 2 +- tools/gyp/v8_base.target.linux-arm.mk | 2 +- tools/gyp/v8_base.target.linux-arm64.mk | 2 -- tools/gyp/v8_base.target.linux-mips.mk | 2 +- tools/gyp/v8_base.target.linux-x86.mk | 2 +- tools/gyp/v8_base.target.linux-x86_64.mk | 2 +- tools/gyp/v8_libbase.host.darwin-arm.mk | 2 +- tools/gyp/v8_libbase.host.darwin-arm64.mk | 2 -- tools/gyp/v8_libbase.host.darwin-mips.mk | 2 +- tools/gyp/v8_libbase.host.darwin-x86.mk | 2 +- tools/gyp/v8_libbase.host.darwin-x86_64.mk | 2 +- tools/gyp/v8_libbase.host.linux-arm.mk | 2 +- tools/gyp/v8_libbase.host.linux-arm64.mk | 2 -- tools/gyp/v8_libbase.host.linux-mips.mk | 2 +- tools/gyp/v8_libbase.host.linux-x86.mk | 2 +- tools/gyp/v8_libbase.host.linux-x86_64.mk | 2 +- tools/gyp/v8_libbase.target.darwin-arm.mk | 2 +- tools/gyp/v8_libbase.target.darwin-arm64.mk | 2 -- tools/gyp/v8_libbase.target.darwin-mips.mk | 2 +- tools/gyp/v8_libbase.target.darwin-x86.mk | 2 +- tools/gyp/v8_libbase.target.darwin-x86_64.mk | 2 +- tools/gyp/v8_libbase.target.linux-arm.mk | 2 +- tools/gyp/v8_libbase.target.linux-arm64.mk | 2 -- tools/gyp/v8_libbase.target.linux-mips.mk | 2 +- tools/gyp/v8_libbase.target.linux-x86.mk | 2 +- tools/gyp/v8_libbase.target.linux-x86_64.mk | 2 +- tools/gyp/v8_nosnapshot.host.darwin-arm.mk | 2 +- tools/gyp/v8_nosnapshot.host.darwin-arm64.mk | 2 -- tools/gyp/v8_nosnapshot.host.darwin-mips.mk | 2 +- tools/gyp/v8_nosnapshot.host.darwin-x86.mk | 2 +- tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk | 2 +- tools/gyp/v8_nosnapshot.host.linux-arm.mk | 2 +- tools/gyp/v8_nosnapshot.host.linux-arm64.mk | 2 -- tools/gyp/v8_nosnapshot.host.linux-mips.mk | 2 +- tools/gyp/v8_nosnapshot.host.linux-x86.mk | 2 +- tools/gyp/v8_nosnapshot.host.linux-x86_64.mk | 2 +- tools/gyp/v8_snapshot.target.darwin-arm.mk | 2 +- tools/gyp/v8_snapshot.target.darwin-arm64.mk | 2 -- tools/gyp/v8_snapshot.target.darwin-mips.mk | 2 +- tools/gyp/v8_snapshot.target.darwin-x86.mk | 2 +- tools/gyp/v8_snapshot.target.darwin-x86_64.mk | 2 +- tools/gyp/v8_snapshot.target.linux-arm.mk | 2 +- tools/gyp/v8_snapshot.target.linux-arm64.mk | 2 -- tools/gyp/v8_snapshot.target.linux-mips.mk | 2 +- tools/gyp/v8_snapshot.target.linux-x86.mk | 2 +- tools/gyp/v8_snapshot.target.linux-x86_64.mk | 2 +- 70 files changed, 56 insertions(+), 84 deletions(-) diff --git a/tools/gyp/mksnapshot.host.darwin-arm.mk b/tools/gyp/mksnapshot.host.darwin-arm.mk index a2cb1d2d5..1364b2f84 100644 --- a/tools/gyp/mksnapshot.host.darwin-arm.mk +++ b/tools/gyp/mksnapshot.host.darwin-arm.mk @@ -53,9 +53,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/mksnapshot.host.darwin-arm64.mk b/tools/gyp/mksnapshot.host.darwin-arm64.mk index f7c2c328a..012194e9e 100644 --- a/tools/gyp/mksnapshot.host.darwin-arm64.mk +++ b/tools/gyp/mksnapshot.host.darwin-arm64.mk @@ -53,7 +53,6 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -128,7 +127,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/mksnapshot.host.darwin-mips.mk b/tools/gyp/mksnapshot.host.darwin-mips.mk index 03fba33ea..eb9c2a03e 100644 --- a/tools/gyp/mksnapshot.host.darwin-mips.mk +++ b/tools/gyp/mksnapshot.host.darwin-mips.mk @@ -54,9 +54,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/mksnapshot.host.darwin-x86.mk b/tools/gyp/mksnapshot.host.darwin-x86.mk index ae830feb0..b93eb275a 100644 --- a/tools/gyp/mksnapshot.host.darwin-x86.mk +++ b/tools/gyp/mksnapshot.host.darwin-x86.mk @@ -53,9 +53,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/mksnapshot.host.darwin-x86_64.mk b/tools/gyp/mksnapshot.host.darwin-x86_64.mk index 01a297280..3aefdd6aa 100644 --- a/tools/gyp/mksnapshot.host.darwin-x86_64.mk +++ b/tools/gyp/mksnapshot.host.darwin-x86_64.mk @@ -53,9 +53,9 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/mksnapshot.host.linux-arm.mk b/tools/gyp/mksnapshot.host.linux-arm.mk index c36cb4974..c393a00de 100644 --- a/tools/gyp/mksnapshot.host.linux-arm.mk +++ b/tools/gyp/mksnapshot.host.linux-arm.mk @@ -54,9 +54,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/mksnapshot.host.linux-arm64.mk b/tools/gyp/mksnapshot.host.linux-arm64.mk index 85bb90b8b..e6223af4e 100644 --- a/tools/gyp/mksnapshot.host.linux-arm64.mk +++ b/tools/gyp/mksnapshot.host.linux-arm64.mk @@ -54,7 +54,6 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -130,7 +129,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/mksnapshot.host.linux-mips.mk b/tools/gyp/mksnapshot.host.linux-mips.mk index 0de76a448..19904df26 100644 --- a/tools/gyp/mksnapshot.host.linux-mips.mk +++ b/tools/gyp/mksnapshot.host.linux-mips.mk @@ -55,9 +55,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/mksnapshot.host.linux-x86.mk b/tools/gyp/mksnapshot.host.linux-x86.mk index dd86e8b95..8f7044431 100644 --- a/tools/gyp/mksnapshot.host.linux-x86.mk +++ b/tools/gyp/mksnapshot.host.linux-x86.mk @@ -54,9 +54,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/mksnapshot.host.linux-x86_64.mk b/tools/gyp/mksnapshot.host.linux-x86_64.mk index 8464ad7a9..ddb827a5c 100644 --- a/tools/gyp/mksnapshot.host.linux-x86_64.mk +++ b/tools/gyp/mksnapshot.host.linux-x86_64.mk @@ -54,9 +54,9 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.host.darwin-arm.mk b/tools/gyp/v8_base.host.darwin-arm.mk index 79110eb35..d884d8497 100644 --- a/tools/gyp/v8_base.host.darwin-arm.mk +++ b/tools/gyp/v8_base.host.darwin-arm.mk @@ -214,9 +214,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.host.darwin-arm64.mk b/tools/gyp/v8_base.host.darwin-arm64.mk index 84c2f9a2a..0aa1477af 100644 --- a/tools/gyp/v8_base.host.darwin-arm64.mk +++ b/tools/gyp/v8_base.host.darwin-arm64.mk @@ -217,7 +217,6 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -298,7 +297,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_base.host.darwin-mips.mk b/tools/gyp/v8_base.host.darwin-mips.mk index 08c2b928c..9fe0e393f 100644 --- a/tools/gyp/v8_base.host.darwin-mips.mk +++ b/tools/gyp/v8_base.host.darwin-mips.mk @@ -215,9 +215,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.host.darwin-x86.mk b/tools/gyp/v8_base.host.darwin-x86.mk index 272b8c6d4..a3de46d22 100644 --- a/tools/gyp/v8_base.host.darwin-x86.mk +++ b/tools/gyp/v8_base.host.darwin-x86.mk @@ -212,9 +212,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.host.darwin-x86_64.mk b/tools/gyp/v8_base.host.darwin-x86_64.mk index ccccf5a6b..94f88e080 100644 --- a/tools/gyp/v8_base.host.darwin-x86_64.mk +++ b/tools/gyp/v8_base.host.darwin-x86_64.mk @@ -212,9 +212,9 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.host.linux-arm.mk b/tools/gyp/v8_base.host.linux-arm.mk index 32631ad83..5689f5b07 100644 --- a/tools/gyp/v8_base.host.linux-arm.mk +++ b/tools/gyp/v8_base.host.linux-arm.mk @@ -215,9 +215,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.host.linux-arm64.mk b/tools/gyp/v8_base.host.linux-arm64.mk index 7b87295ee..21050ec9f 100644 --- a/tools/gyp/v8_base.host.linux-arm64.mk +++ b/tools/gyp/v8_base.host.linux-arm64.mk @@ -218,7 +218,6 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -301,7 +300,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_base.host.linux-mips.mk b/tools/gyp/v8_base.host.linux-mips.mk index 35b56cfb0..bf538431e 100644 --- a/tools/gyp/v8_base.host.linux-mips.mk +++ b/tools/gyp/v8_base.host.linux-mips.mk @@ -216,9 +216,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.host.linux-x86.mk b/tools/gyp/v8_base.host.linux-x86.mk index 7bddd1825..ef4c95960 100644 --- a/tools/gyp/v8_base.host.linux-x86.mk +++ b/tools/gyp/v8_base.host.linux-x86.mk @@ -213,9 +213,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.host.linux-x86_64.mk b/tools/gyp/v8_base.host.linux-x86_64.mk index 846c5dbf6..d1854ced4 100644 --- a/tools/gyp/v8_base.host.linux-x86_64.mk +++ b/tools/gyp/v8_base.host.linux-x86_64.mk @@ -213,9 +213,9 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.target.darwin-arm.mk b/tools/gyp/v8_base.target.darwin-arm.mk index 8393a9cac..0b6991b24 100644 --- a/tools/gyp/v8_base.target.darwin-arm.mk +++ b/tools/gyp/v8_base.target.darwin-arm.mk @@ -238,9 +238,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.target.darwin-arm64.mk b/tools/gyp/v8_base.target.darwin-arm64.mk index 52ce047df..3bf85e6a1 100644 --- a/tools/gyp/v8_base.target.darwin-arm64.mk +++ b/tools/gyp/v8_base.target.darwin-arm64.mk @@ -231,7 +231,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -337,7 +336,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_base.target.darwin-mips.mk b/tools/gyp/v8_base.target.darwin-mips.mk index f0831b96f..848edfa1f 100644 --- a/tools/gyp/v8_base.target.darwin-mips.mk +++ b/tools/gyp/v8_base.target.darwin-mips.mk @@ -233,9 +233,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.target.darwin-x86.mk b/tools/gyp/v8_base.target.darwin-x86.mk index 6a83c4b13..f1e190ec9 100644 --- a/tools/gyp/v8_base.target.darwin-x86.mk +++ b/tools/gyp/v8_base.target.darwin-x86.mk @@ -231,9 +231,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.target.darwin-x86_64.mk b/tools/gyp/v8_base.target.darwin-x86_64.mk index a7185b0aa..58dc19c4c 100644 --- a/tools/gyp/v8_base.target.darwin-x86_64.mk +++ b/tools/gyp/v8_base.target.darwin-x86_64.mk @@ -230,9 +230,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.target.linux-arm.mk b/tools/gyp/v8_base.target.linux-arm.mk index 8393a9cac..0b6991b24 100644 --- a/tools/gyp/v8_base.target.linux-arm.mk +++ b/tools/gyp/v8_base.target.linux-arm.mk @@ -238,9 +238,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.target.linux-arm64.mk b/tools/gyp/v8_base.target.linux-arm64.mk index 52ce047df..3bf85e6a1 100644 --- a/tools/gyp/v8_base.target.linux-arm64.mk +++ b/tools/gyp/v8_base.target.linux-arm64.mk @@ -231,7 +231,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -337,7 +336,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_base.target.linux-mips.mk b/tools/gyp/v8_base.target.linux-mips.mk index f0831b96f..848edfa1f 100644 --- a/tools/gyp/v8_base.target.linux-mips.mk +++ b/tools/gyp/v8_base.target.linux-mips.mk @@ -233,9 +233,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.target.linux-x86.mk b/tools/gyp/v8_base.target.linux-x86.mk index 6a83c4b13..f1e190ec9 100644 --- a/tools/gyp/v8_base.target.linux-x86.mk +++ b/tools/gyp/v8_base.target.linux-x86.mk @@ -231,9 +231,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_base.target.linux-x86_64.mk b/tools/gyp/v8_base.target.linux-x86_64.mk index a7185b0aa..58dc19c4c 100644 --- a/tools/gyp/v8_base.target.linux-x86_64.mk +++ b/tools/gyp/v8_base.target.linux-x86_64.mk @@ -230,9 +230,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.host.darwin-arm.mk b/tools/gyp/v8_libbase.host.darwin-arm.mk index 088ba06a9..573109323 100644 --- a/tools/gyp/v8_libbase.host.darwin-arm.mk +++ b/tools/gyp/v8_libbase.host.darwin-arm.mk @@ -45,9 +45,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.host.darwin-arm64.mk b/tools/gyp/v8_libbase.host.darwin-arm64.mk index a9d0f57a3..273920f2f 100644 --- a/tools/gyp/v8_libbase.host.darwin-arm64.mk +++ b/tools/gyp/v8_libbase.host.darwin-arm64.mk @@ -45,7 +45,6 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -120,7 +119,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_libbase.host.darwin-mips.mk b/tools/gyp/v8_libbase.host.darwin-mips.mk index 1de53086a..92b85112b 100644 --- a/tools/gyp/v8_libbase.host.darwin-mips.mk +++ b/tools/gyp/v8_libbase.host.darwin-mips.mk @@ -46,9 +46,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.host.darwin-x86.mk b/tools/gyp/v8_libbase.host.darwin-x86.mk index 183365c07..38ec6b656 100644 --- a/tools/gyp/v8_libbase.host.darwin-x86.mk +++ b/tools/gyp/v8_libbase.host.darwin-x86.mk @@ -45,9 +45,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.host.darwin-x86_64.mk b/tools/gyp/v8_libbase.host.darwin-x86_64.mk index 32554a059..29a5aff03 100644 --- a/tools/gyp/v8_libbase.host.darwin-x86_64.mk +++ b/tools/gyp/v8_libbase.host.darwin-x86_64.mk @@ -45,9 +45,9 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.host.linux-arm.mk b/tools/gyp/v8_libbase.host.linux-arm.mk index ebb02923a..b65517ea7 100644 --- a/tools/gyp/v8_libbase.host.linux-arm.mk +++ b/tools/gyp/v8_libbase.host.linux-arm.mk @@ -46,9 +46,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.host.linux-arm64.mk b/tools/gyp/v8_libbase.host.linux-arm64.mk index 8685a404f..9aa44970c 100644 --- a/tools/gyp/v8_libbase.host.linux-arm64.mk +++ b/tools/gyp/v8_libbase.host.linux-arm64.mk @@ -46,7 +46,6 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -122,7 +121,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_libbase.host.linux-mips.mk b/tools/gyp/v8_libbase.host.linux-mips.mk index 5105f8bd0..331e36e04 100644 --- a/tools/gyp/v8_libbase.host.linux-mips.mk +++ b/tools/gyp/v8_libbase.host.linux-mips.mk @@ -47,9 +47,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.host.linux-x86.mk b/tools/gyp/v8_libbase.host.linux-x86.mk index 81a4984d4..7dc39e719 100644 --- a/tools/gyp/v8_libbase.host.linux-x86.mk +++ b/tools/gyp/v8_libbase.host.linux-x86.mk @@ -46,9 +46,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.host.linux-x86_64.mk b/tools/gyp/v8_libbase.host.linux-x86_64.mk index f4ef63904..4f24e1f25 100644 --- a/tools/gyp/v8_libbase.host.linux-x86_64.mk +++ b/tools/gyp/v8_libbase.host.linux-x86_64.mk @@ -46,9 +46,9 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.target.darwin-arm.mk b/tools/gyp/v8_libbase.target.darwin-arm.mk index ca1c27cbb..5a299a972 100644 --- a/tools/gyp/v8_libbase.target.darwin-arm.mk +++ b/tools/gyp/v8_libbase.target.darwin-arm.mk @@ -67,9 +67,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.target.darwin-arm64.mk b/tools/gyp/v8_libbase.target.darwin-arm64.mk index f3f0c23f7..00cfc57b5 100644 --- a/tools/gyp/v8_libbase.target.darwin-arm64.mk +++ b/tools/gyp/v8_libbase.target.darwin-arm64.mk @@ -57,7 +57,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -156,7 +155,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_libbase.target.darwin-mips.mk b/tools/gyp/v8_libbase.target.darwin-mips.mk index 9d5845c65..289cc4614 100644 --- a/tools/gyp/v8_libbase.target.darwin-mips.mk +++ b/tools/gyp/v8_libbase.target.darwin-mips.mk @@ -62,9 +62,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.target.darwin-x86.mk b/tools/gyp/v8_libbase.target.darwin-x86.mk index 655f092ec..59b0efefb 100644 --- a/tools/gyp/v8_libbase.target.darwin-x86.mk +++ b/tools/gyp/v8_libbase.target.darwin-x86.mk @@ -62,9 +62,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.target.darwin-x86_64.mk b/tools/gyp/v8_libbase.target.darwin-x86_64.mk index 737d1c468..8fa4f94c5 100644 --- a/tools/gyp/v8_libbase.target.darwin-x86_64.mk +++ b/tools/gyp/v8_libbase.target.darwin-x86_64.mk @@ -61,9 +61,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.target.linux-arm.mk b/tools/gyp/v8_libbase.target.linux-arm.mk index ca1c27cbb..5a299a972 100644 --- a/tools/gyp/v8_libbase.target.linux-arm.mk +++ b/tools/gyp/v8_libbase.target.linux-arm.mk @@ -67,9 +67,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.target.linux-arm64.mk b/tools/gyp/v8_libbase.target.linux-arm64.mk index f3f0c23f7..00cfc57b5 100644 --- a/tools/gyp/v8_libbase.target.linux-arm64.mk +++ b/tools/gyp/v8_libbase.target.linux-arm64.mk @@ -57,7 +57,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -156,7 +155,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_libbase.target.linux-mips.mk b/tools/gyp/v8_libbase.target.linux-mips.mk index 9d5845c65..289cc4614 100644 --- a/tools/gyp/v8_libbase.target.linux-mips.mk +++ b/tools/gyp/v8_libbase.target.linux-mips.mk @@ -62,9 +62,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.target.linux-x86.mk b/tools/gyp/v8_libbase.target.linux-x86.mk index 655f092ec..59b0efefb 100644 --- a/tools/gyp/v8_libbase.target.linux-x86.mk +++ b/tools/gyp/v8_libbase.target.linux-x86.mk @@ -62,9 +62,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_libbase.target.linux-x86_64.mk b/tools/gyp/v8_libbase.target.linux-x86_64.mk index 737d1c468..8fa4f94c5 100644 --- a/tools/gyp/v8_libbase.target.linux-x86_64.mk +++ b/tools/gyp/v8_libbase.target.linux-x86_64.mk @@ -61,9 +61,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk index ef4324fbd..98d5f02f9 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk @@ -56,9 +56,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk index 3c55699f1..ccd7d3e50 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk @@ -56,7 +56,6 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -131,7 +130,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk index 0d70563cd..9cb296779 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk @@ -57,9 +57,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk index 01e83bee2..6ed73a02d 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk @@ -56,9 +56,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk index af29e5243..a8991411b 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk @@ -56,9 +56,9 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm.mk b/tools/gyp/v8_nosnapshot.host.linux-arm.mk index 67db23e16..ef16fa9dc 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-arm.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-arm.mk @@ -57,9 +57,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk index 7760a775d..b5abe386c 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk @@ -57,7 +57,6 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -133,7 +132,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_nosnapshot.host.linux-mips.mk b/tools/gyp/v8_nosnapshot.host.linux-mips.mk index ff115d21b..079ffcbda 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-mips.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-mips.mk @@ -58,9 +58,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86.mk b/tools/gyp/v8_nosnapshot.host.linux-x86.mk index d4a27aa25..243ceadb8 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-x86.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-x86.mk @@ -57,9 +57,9 @@ MY_CFLAGS_Debug := \ -m32 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk index 41883c9d0..28dab34fd 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk @@ -57,9 +57,9 @@ MY_CFLAGS_Debug := \ -m64 \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_snapshot.target.darwin-arm.mk b/tools/gyp/v8_snapshot.target.darwin-arm.mk index 2e48f6de3..84270fa1b 100644 --- a/tools/gyp/v8_snapshot.target.darwin-arm.mk +++ b/tools/gyp/v8_snapshot.target.darwin-arm.mk @@ -92,9 +92,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_snapshot.target.darwin-arm64.mk b/tools/gyp/v8_snapshot.target.darwin-arm64.mk index 88784354c..c50ac9586 100644 --- a/tools/gyp/v8_snapshot.target.darwin-arm64.mk +++ b/tools/gyp/v8_snapshot.target.darwin-arm64.mk @@ -82,7 +82,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -183,7 +182,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_snapshot.target.darwin-mips.mk b/tools/gyp/v8_snapshot.target.darwin-mips.mk index 2bda27624..6434ebb5e 100644 --- a/tools/gyp/v8_snapshot.target.darwin-mips.mk +++ b/tools/gyp/v8_snapshot.target.darwin-mips.mk @@ -87,9 +87,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_snapshot.target.darwin-x86.mk b/tools/gyp/v8_snapshot.target.darwin-x86.mk index b8172f318..b8e085728 100644 --- a/tools/gyp/v8_snapshot.target.darwin-x86.mk +++ b/tools/gyp/v8_snapshot.target.darwin-x86.mk @@ -87,9 +87,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk index 227d258aa..e637f2222 100644 --- a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk +++ b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk @@ -86,9 +86,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_snapshot.target.linux-arm.mk b/tools/gyp/v8_snapshot.target.linux-arm.mk index 2e48f6de3..84270fa1b 100644 --- a/tools/gyp/v8_snapshot.target.linux-arm.mk +++ b/tools/gyp/v8_snapshot.target.linux-arm.mk @@ -92,9 +92,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_snapshot.target.linux-arm64.mk b/tools/gyp/v8_snapshot.target.linux-arm64.mk index 88784354c..c50ac9586 100644 --- a/tools/gyp/v8_snapshot.target.linux-arm64.mk +++ b/tools/gyp/v8_snapshot.target.linux-arm64.mk @@ -82,7 +82,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -183,7 +182,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables \ -fdata-sections \ -ffunction-sections \ diff --git a/tools/gyp/v8_snapshot.target.linux-mips.mk b/tools/gyp/v8_snapshot.target.linux-mips.mk index 2bda27624..6434ebb5e 100644 --- a/tools/gyp/v8_snapshot.target.linux-mips.mk +++ b/tools/gyp/v8_snapshot.target.linux-mips.mk @@ -87,9 +87,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_snapshot.target.linux-x86.mk b/tools/gyp/v8_snapshot.target.linux-x86.mk index b8172f318..b8e085728 100644 --- a/tools/gyp/v8_snapshot.target.linux-x86.mk +++ b/tools/gyp/v8_snapshot.target.linux-x86.mk @@ -87,9 +87,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/tools/gyp/v8_snapshot.target.linux-x86_64.mk b/tools/gyp/v8_snapshot.target.linux-x86_64.mk index 227d258aa..e637f2222 100644 --- a/tools/gyp/v8_snapshot.target.linux-x86_64.mk +++ b/tools/gyp/v8_snapshot.target.linux-x86_64.mk @@ -86,9 +86,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ -- cgit v1.2.3 From fdc3c5570b34908e22f3fe48be77846ca995a64f Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Wed, 23 Jul 2014 11:31:33 +0000 Subject: Version 3.27.34.7 (merged r22223) Remove a bunch of Isolate::UncheckedCurrent calls R=danno@chromium.org BUG= Review URL: https://codereview.chromium.org/412513003 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@22555 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- include/v8.h | 22 ++++++++++++++++++++++ src/api.cc | 24 ++++++++++++++++++++++++ src/counters.cc | 32 ++++++++++++++++++++++++++++++++ src/counters.h | 4 ++++ src/d8.cc | 10 +++++----- src/d8.h | 2 +- src/version.cc | 2 +- test/cctest/test-api.cc | 15 +++++++++------ 8 files changed, 98 insertions(+), 13 deletions(-) diff --git a/include/v8.h b/include/v8.h index 1db14733a..4e8556162 100644 --- a/include/v8.h +++ b/include/v8.h @@ -4391,6 +4391,21 @@ class V8_EXPORT Isolate { */ bool WillAutorunMicrotasks() const; + /** + * Enables the host application to provide a mechanism for recording + * statistics counters. + */ + void SetCounterFunction(CounterLookupCallback); + + /** + * Enables the host application to provide a mechanism for recording + * histograms. The CreateHistogram function returns a + * histogram which will later be passed to the AddHistogramSample + * function. + */ + void SetCreateHistogramFunction(CreateHistogramCallback); + void SetAddHistogramSampleFunction(AddHistogramSampleCallback); + private: template friend class PersistentValueMap; @@ -4687,6 +4702,8 @@ class V8_EXPORT V8 { /** * Enables the host application to provide a mechanism for recording * statistics counters. + * + * Deprecated, use Isolate::SetCounterFunction instead. */ static void SetCounterFunction(CounterLookupCallback); @@ -4695,8 +4712,13 @@ class V8_EXPORT V8 { * histograms. The CreateHistogram function returns a * histogram which will later be passed to the AddHistogramSample * function. + * + * Deprecated, use Isolate::SetCreateHistogramFunction instead. + * Isolate::SetAddHistogramSampleFunction instead. */ static void SetCreateHistogramFunction(CreateHistogramCallback); + + /** Deprecated, use Isolate::SetAddHistogramSampleFunction instead. */ static void SetAddHistogramSampleFunction(AddHistogramSampleCallback); /** Callback function for reporting failed access checks.*/ diff --git a/src/api.cc b/src/api.cc index 9758228b2..bf54d0b25 100644 --- a/src/api.cc +++ b/src/api.cc @@ -6707,6 +6707,30 @@ bool Isolate::WillAutorunMicrotasks() const { } +void Isolate::SetCounterFunction(CounterLookupCallback callback) { + i::Isolate* isolate = reinterpret_cast(this); + isolate->stats_table()->SetCounterFunction(callback); + isolate->InitializeLoggingAndCounters(); + isolate->counters()->ResetCounters(); +} + + +void Isolate::SetCreateHistogramFunction(CreateHistogramCallback callback) { + i::Isolate* isolate = reinterpret_cast(this); + isolate->stats_table()->SetCreateHistogramFunction(callback); + isolate->InitializeLoggingAndCounters(); + isolate->counters()->ResetHistograms(); +} + + +void Isolate::SetAddHistogramSampleFunction( + AddHistogramSampleCallback callback) { + reinterpret_cast(this) + ->stats_table() + ->SetAddHistogramSampleFunction(callback); +} + + String::Utf8Value::Utf8Value(v8::Handle obj) : str_(NULL), length_(0) { i::Isolate* isolate = i::Isolate::Current(); diff --git a/src/counters.cc b/src/counters.cc index 42b0574b3..cdff8877d 100644 --- a/src/counters.cc +++ b/src/counters.cc @@ -109,6 +109,38 @@ Counters::Counters(Isolate* isolate) { } +void Counters::ResetCounters() { +#define SC(name, caption) name##_.Reset(); + STATS_COUNTER_LIST_1(SC) + STATS_COUNTER_LIST_2(SC) +#undef SC + +#define SC(name) \ + count_of_##name##_.Reset(); \ + size_of_##name##_.Reset(); + INSTANCE_TYPE_LIST(SC) +#undef SC + +#define SC(name) \ + count_of_CODE_TYPE_##name##_.Reset(); \ + size_of_CODE_TYPE_##name##_.Reset(); + CODE_KIND_LIST(SC) +#undef SC + +#define SC(name) \ + count_of_FIXED_ARRAY_##name##_.Reset(); \ + size_of_FIXED_ARRAY_##name##_.Reset(); + FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(SC) +#undef SC + +#define SC(name) \ + count_of_CODE_AGE_##name##_.Reset(); \ + size_of_CODE_AGE_##name##_.Reset(); + CODE_AGE_LIST_COMPLETE(SC) +#undef SC +} + + void Counters::ResetHistograms() { #define HT(name, caption) name##_.Reset(); HISTOGRAM_TIMER_LIST(HT) diff --git a/src/counters.h b/src/counters.h index f7ff36b75..a7d00dcc8 100644 --- a/src/counters.h +++ b/src/counters.h @@ -143,6 +143,9 @@ class StatsCounter { return loc; } + // Reset the cached internal pointer. + void Reset() { lookup_done_ = false; } + protected: // Returns the cached address of this counter location. int* GetPtr() { @@ -629,6 +632,7 @@ class Counters { stats_counter_count }; + void ResetCounters(); void ResetHistograms(); private: diff --git a/src/d8.cc b/src/d8.cc index 03356e15a..661307f0d 100644 --- a/src/d8.cc +++ b/src/d8.cc @@ -665,7 +665,7 @@ Counter* CounterCollection::GetNextCounter() { } -void Shell::MapCounters(const char* name) { +void Shell::MapCounters(v8::Isolate* isolate, const char* name) { counters_file_ = i::OS::MemoryMappedFile::create( name, sizeof(CounterCollection), &local_counters_); void* memory = (counters_file_ == NULL) ? @@ -675,9 +675,9 @@ void Shell::MapCounters(const char* name) { Exit(1); } counters_ = static_cast(memory); - V8::SetCounterFunction(LookupCounter); - V8::SetCreateHistogramFunction(CreateHistogram); - V8::SetAddHistogramSampleFunction(AddHistogramSample); + isolate->SetCounterFunction(LookupCounter); + isolate->SetCreateHistogramFunction(CreateHistogram); + isolate->SetAddHistogramSampleFunction(AddHistogramSample); } @@ -887,7 +887,7 @@ void Shell::Initialize(Isolate* isolate) { Shell::counter_map_ = new CounterMap(); // Set up counters if (i::StrLength(i::FLAG_map_counters) != 0) - MapCounters(i::FLAG_map_counters); + MapCounters(isolate, i::FLAG_map_counters); if (i::FLAG_dump_counters || i::FLAG_track_gc_object_stats) { V8::SetCounterFunction(LookupCounter); V8::SetCreateHistogramFunction(CreateHistogram); diff --git a/src/d8.h b/src/d8.h index bd70c8e78..143eabb8a 100644 --- a/src/d8.h +++ b/src/d8.h @@ -265,7 +265,7 @@ class Shell : public i::AllStatic { int max, size_t buckets); static void AddHistogramSample(void* histogram, int sample); - static void MapCounters(const char* name); + static void MapCounters(v8::Isolate* isolate, const char* name); static Local DebugMessageDetails(Isolate* isolate, Handle message); diff --git a/src/version.cc b/src/version.cc index 1f2191728..21200e71c 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 6 +#define PATCH_LEVEL 7 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc index d1f25def5..7fc80b3a9 100644 --- a/test/cctest/test-api.cc +++ b/test/cctest/test-api.cc @@ -19545,15 +19545,15 @@ class InitDefaultIsolateThread : public v8::internal::Thread { break; case SetCounterFunction: - v8::V8::SetCounterFunction(NULL); + CcTest::isolate()->SetCounterFunction(NULL); break; case SetCreateHistogramFunction: - v8::V8::SetCreateHistogramFunction(NULL); + CcTest::isolate()->SetCreateHistogramFunction(NULL); break; case SetAddHistogramSampleFunction: - v8::V8::SetAddHistogramSampleFunction(NULL); + CcTest::isolate()->SetAddHistogramSampleFunction(NULL); break; } isolate->Exit(); @@ -20904,6 +20904,7 @@ TEST(RunMicrotasksWithoutEnteringContext) { } +#ifdef DEBUG static int probes_counter = 0; static int misses_counter = 0; static int updates_counter = 0; @@ -20933,11 +20934,10 @@ static const char* kMegamorphicTestProgram = " fooify(a);" " fooify(b);" "}"; +#endif static void StubCacheHelper(bool primary) { - V8::SetCounterFunction(LookupCounter); - USE(kMegamorphicTestProgram); #ifdef DEBUG i::FLAG_native_code_counters = true; if (primary) { @@ -20947,6 +20947,7 @@ static void StubCacheHelper(bool primary) { } i::FLAG_crankshaft = false; LocalContext env; + env->GetIsolate()->SetCounterFunction(LookupCounter); v8::HandleScope scope(env->GetIsolate()); int initial_probes = probes_counter; int initial_misses = misses_counter; @@ -20976,6 +20977,7 @@ TEST(PrimaryStubCache) { } +#ifdef DEBUG static int cow_arrays_created_runtime = 0; @@ -20985,13 +20987,14 @@ static int* LookupCounterCOWArrays(const char* name) { } return NULL; } +#endif TEST(CheckCOWArraysCreatedRuntimeCounter) { - V8::SetCounterFunction(LookupCounterCOWArrays); #ifdef DEBUG i::FLAG_native_code_counters = true; LocalContext env; + env->GetIsolate()->SetCounterFunction(LookupCounterCOWArrays); v8::HandleScope scope(env->GetIsolate()); int initial_cow_arrays = cow_arrays_created_runtime; CompileRun("var o = [1, 2, 3];"); -- cgit v1.2.3 From 804712e3d40723ca745704121c814fe52e8e6158 Mon Sep 17 00:00:00 2001 From: "verwaest@chromium.org" Date: Thu, 31 Jul 2014 08:35:41 +0000 Subject: Version 3.27.34.8 (merged r22616, r22617) In GrowMode, force the value to the right representation to avoid deopts between storing the length and storing the value. Smi arrays are only guaranteed to be initialized in non-holey case BUG=16459193 LOG=y R=ishell@chromium.org Review URL: https://codereview.chromium.org/424623003 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@22736 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/hydrogen-instructions.h | 40 ++++++++++++++---------------- src/hydrogen.cc | 7 +++--- src/version.cc | 2 +- test/mjsunit/regress/regress-grow-deopt.js | 16 ++++++++++++ 4 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 test/mjsunit/regress/regress-grow-deopt.js diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h index f1720f444..47ce49948 100644 --- a/src/hydrogen-instructions.h +++ b/src/hydrogen-instructions.h @@ -6906,19 +6906,28 @@ class HStoreKeyed V8_FINAL } ASSERT_EQ(index, 2); - if (IsDoubleOrFloatElementsKind(elements_kind())) { + return RequiredValueRepresentation(elements_kind_, store_mode_); + } + + static Representation RequiredValueRepresentation( + ElementsKind kind, StoreFieldOrKeyedMode mode) { + if (IsDoubleOrFloatElementsKind(kind)) { return Representation::Double(); } - if (SmiValuesAre32Bits() && store_mode_ == STORE_TO_INITIALIZED_ENTRY) { + + if (kind == FAST_SMI_ELEMENTS && SmiValuesAre32Bits() && + mode == STORE_TO_INITIALIZED_ENTRY) { return Representation::Integer32(); } - if (IsFastSmiElementsKind(elements_kind())) { + + if (IsFastSmiElementsKind(kind)) { return Representation::Smi(); } - return is_external() || is_fixed_typed_array() - ? Representation::Integer32() - : Representation::Tagged(); + return IsExternalArrayElementsKind(kind) || + IsFixedTypedArrayElementsKind(kind) + ? Representation::Integer32() + : Representation::Tagged(); } bool is_external() const { @@ -6938,20 +6947,10 @@ class HStoreKeyed V8_FINAL if (IsUninitialized()) { return Representation::None(); } - if (IsDoubleOrFloatElementsKind(elements_kind())) { - return Representation::Double(); - } - if (SmiValuesAre32Bits() && store_mode_ == STORE_TO_INITIALIZED_ENTRY) { - return Representation::Integer32(); - } - if (IsFastSmiElementsKind(elements_kind())) { - return Representation::Smi(); - } - if (is_typed_elements()) { - return Representation::Integer32(); - } + Representation r = RequiredValueRepresentation(elements_kind_, store_mode_); // For fast object elements kinds, don't assume anything. - return Representation::None(); + if (r.IsTagged()) return Representation::None(); + return r; } HValue* elements() const { return OperandAt(0); } @@ -7031,9 +7030,6 @@ class HStoreKeyed V8_FINAL SetOperandAt(1, key); SetOperandAt(2, val); - ASSERT(store_mode != STORE_TO_INITIALIZED_ENTRY || - elements_kind == FAST_SMI_ELEMENTS); - if (IsFastObjectElementsKind(elements_kind)) { SetFlag(kTrackSideEffectDominators); SetDependsOnFlag(kNewSpacePromotion); diff --git a/src/hydrogen.cc b/src/hydrogen.cc index 6e5ea741b..8fff497ee 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -2405,6 +2405,9 @@ HInstruction* HGraphBuilder::BuildUncheckedMonomorphicElementAccess( if (IsGrowStoreMode(store_mode)) { NoObservableSideEffectsScope no_effects(this); + Representation representation = HStoreKeyed::RequiredValueRepresentation( + elements_kind, STORE_TO_INITIALIZED_ENTRY); + val = AddUncasted(val, representation); elements = BuildCheckForCapacityGrow(checked_object, elements, elements_kind, length, key, is_js_array, access_type); @@ -2601,9 +2604,7 @@ HInstruction* HGraphBuilder::AddElementAccess( val = Add(val); } return Add(elements, checked_key, val, elements_kind, - elements_kind == FAST_SMI_ELEMENTS - ? STORE_TO_INITIALIZED_ENTRY - : INITIALIZING_STORE); + STORE_TO_INITIALIZED_ENTRY); } ASSERT(access_type == LOAD); diff --git a/src/version.cc b/src/version.cc index 21200e71c..2e972ba8d 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 7 +#define PATCH_LEVEL 8 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/mjsunit/regress/regress-grow-deopt.js b/test/mjsunit/regress/regress-grow-deopt.js new file mode 100644 index 000000000..df3a83fe8 --- /dev/null +++ b/test/mjsunit/regress/regress-grow-deopt.js @@ -0,0 +1,16 @@ +// Copyright 2014 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Flags: --allow-natives-syntax + +function f(a, v) { + a[a.length] = v; +} + +var a = [1.4]; +f(a, 1); +f(a, 2); +%OptimizeFunctionOnNextCall(f); +f(a, {}); +assertEquals(4, a.length); -- cgit v1.2.3 From 3bd7d9d16f722c8e4ab6219bb0e9091abc040e82 Mon Sep 17 00:00:00 2001 From: "hpayer@chromium.org" Date: Thu, 31 Jul 2014 11:34:43 +0000 Subject: Version 3.27.34.9 (merged r22667) Reduce max executable size limit. BUG=395679 LOG=N R=ishell@chromium.org Review URL: https://codereview.chromium.org/433823003 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@22750 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/heap.h | 9 ++++----- src/version.cc | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/heap.h b/src/heap.h index b5f42b431..d05e35025 100644 --- a/src/heap.h +++ b/src/heap.h @@ -1076,14 +1076,13 @@ class Heap { // The executable size has to be a multiple of Page::kPageSize. // Sizes are in MB. - static const int kMaxExecutableSizeLowMemoryDevice = - 128 * kPointerMultiplier; + static const int kMaxExecutableSizeLowMemoryDevice = 96 * kPointerMultiplier; static const int kMaxExecutableSizeMediumMemoryDevice = - 256 * kPointerMultiplier; + 192 * kPointerMultiplier; static const int kMaxExecutableSizeHighMemoryDevice = - 512 * kPointerMultiplier; + 256 * kPointerMultiplier; static const int kMaxExecutableSizeHugeMemoryDevice = - 700 * kPointerMultiplier; + 256 * kPointerMultiplier; intptr_t OldGenerationAllocationLimit(intptr_t old_gen_size, int freed_global_handles); diff --git a/src/version.cc b/src/version.cc index 2e972ba8d..1ad51c7f8 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 8 +#define PATCH_LEVEL 9 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- cgit v1.2.3 From c62ef8e847c395f9d153819774af3b01119c671e Mon Sep 17 00:00:00 2001 From: "ishell@chromium.org" Date: Mon, 4 Aug 2014 11:23:46 +0000 Subject: Version 3.27.34.10 (merged r22494) Fix off-by-one error in Array.concat slow mode check BUG=chromium:395499 LOG=N R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/439263002 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@22810 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/runtime.cc | 4 ++-- src/version.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/runtime.cc b/src/runtime.cc index 15e1adaf0..36b3177b7 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -10059,8 +10059,8 @@ class ArrayConcatVisitor { // but the array blowing the limit didn't contain elements beyond the // provided-for index range, go to dictionary mode now. if (fast_elements_ && - index_offset_ >= static_cast( - FixedArrayBase::cast(*storage_)->length())) { + index_offset_ > + static_cast(FixedArrayBase::cast(*storage_)->length())) { SetDictionaryMode(); } } diff --git a/src/version.cc b/src/version.cc index 1ad51c7f8..f4b46640f 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 9 +#define PATCH_LEVEL 10 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- cgit v1.2.3 From ac35710f20ba71b05020c2423785c79a39f70d58 Mon Sep 17 00:00:00 2001 From: "hpayer@chromium.org" Date: Mon, 4 Aug 2014 14:18:05 +0000 Subject: Version 3.27.34.11 (merged r22007, r22019, r22090) Wait for sweeper threads when expansion of old generation fails. Collect garbage with kReduceMemoryFootprintMask in IdleNotification. Waiting for sweeper threads is last resort in SlowAllocateRaw. BUG=350720 LOG=N R=machenbach@chromium.org Review URL: https://codereview.chromium.org/419743003 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@22822 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/heap.cc | 3 ++- src/spaces.cc | 41 ++++++++++++++++++++++++++--------------- src/spaces.h | 5 ++++- src/version.cc | 2 +- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/src/heap.cc b/src/heap.cc index 513757085..dd3946f18 100644 --- a/src/heap.cc +++ b/src/heap.cc @@ -4245,7 +4245,8 @@ void Heap::AdvanceIdleIncrementalMarking(intptr_t step_size) { isolate_->compilation_cache()->Clear(); uncommit = true; } - CollectAllGarbage(kNoGCFlags, "idle notification: finalize incremental"); + CollectAllGarbage(kReduceMemoryFootprintMask, + "idle notification: finalize incremental"); mark_sweeps_since_idle_round_started_++; gc_count_at_last_idle_gc_ = gc_count_; if (uncommit) { diff --git a/src/spaces.cc b/src/spaces.cc index 1ffc31411..69a01451b 100644 --- a/src/spaces.cc +++ b/src/spaces.cc @@ -2577,6 +2577,22 @@ void PagedSpace::EvictEvacuationCandidatesFromFreeLists() { } +HeapObject* PagedSpace::WaitForSweeperThreadsAndRetryAllocation( + int size_in_bytes) { + MarkCompactCollector* collector = heap()->mark_compact_collector(); + + // If sweeper threads are still running, wait for them. + if (collector->IsConcurrentSweepingInProgress()) { + collector->WaitUntilSweepingCompleted(); + + // After waiting for the sweeper threads, there may be new free-list + // entries. + return free_list_.Allocate(size_in_bytes); + } + return NULL; +} + + HeapObject* PagedSpace::SlowAllocateRaw(int size_in_bytes) { // Allocation in this space has failed. @@ -2593,9 +2609,12 @@ HeapObject* PagedSpace::SlowAllocateRaw(int size_in_bytes) { // Free list allocation failed and there is no next page. Fail if we have // hit the old generation size limit that should cause a garbage // collection. - if (!heap()->always_allocate() && - heap()->OldGenerationAllocationLimitReached()) { - return NULL; + if (!heap()->always_allocate() + && heap()->OldGenerationAllocationLimitReached()) { + // If sweeper threads are active, wait for them at that point and steal + // elements form their free-lists. + HeapObject* object = WaitForSweeperThreadsAndRetryAllocation(size_in_bytes); + if (object != NULL) return object; } // Try to expand the space and allocate in the new next page. @@ -2604,18 +2623,10 @@ HeapObject* PagedSpace::SlowAllocateRaw(int size_in_bytes) { return free_list_.Allocate(size_in_bytes); } - // If sweeper threads are active, wait for them at that point. - if (collector->IsConcurrentSweepingInProgress()) { - collector->WaitUntilSweepingCompleted(); - - // After waiting for the sweeper threads, there may be new free-list - // entries. - HeapObject* object = free_list_.Allocate(size_in_bytes); - if (object != NULL) return object; - } - - // Finally, fail. - return NULL; + // If sweeper threads are active, wait for them at that point and steal + // elements form their free-lists. Allocation may still fail their which + // would indicate that there is not enough memory for the given allocation. + return WaitForSweeperThreadsAndRetryAllocation(size_in_bytes); } diff --git a/src/spaces.h b/src/spaces.h index 96a1a9042..a8c981d38 100644 --- a/src/spaces.h +++ b/src/spaces.h @@ -2003,8 +2003,11 @@ class PagedSpace : public Space { // address denoted by top in allocation_info_. inline HeapObject* AllocateLinearly(int size_in_bytes); + MUST_USE_RESULT HeapObject* + WaitForSweeperThreadsAndRetryAllocation(int size_in_bytes); + // Slow path of AllocateRaw. This function is space-dependent. - MUST_USE_RESULT virtual HeapObject* SlowAllocateRaw(int size_in_bytes); + MUST_USE_RESULT HeapObject* SlowAllocateRaw(int size_in_bytes); friend class PageIterator; friend class MarkCompactCollector; diff --git a/src/version.cc b/src/version.cc index f4b46640f..c11fb5a34 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 10 +#define PATCH_LEVEL 11 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- cgit v1.2.3 From 644e49bdbb46608c3292d19df9145c0793927e54 Mon Sep 17 00:00:00 2001 From: "mvstanton@chromium.org" Date: Wed, 6 Aug 2014 09:48:04 +0000 Subject: Version 3.27.34.12 (merged r22693) CallIC customization stubs must accept that a vector slot is cleared. (also x87 and mips ports) R=hpayer@chromium.org BUG=392114 Review URL: https://codereview.chromium.org/443903002 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@22914 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm/code-stubs-arm.cc | 17 ++++++--- src/arm64/code-stubs-arm64.cc | 17 ++++++--- src/ia32/code-stubs-ia32.cc | 16 +++++++-- src/ic.cc | 23 +++++++++--- src/mips/code-stubs-mips.cc | 17 ++++++--- src/version.cc | 2 +- src/x64/code-stubs-x64.cc | 18 +++++++--- src/x87/code-stubs-x87.cc | 16 +++++++-- test/mjsunit/regress/regress-392114.js | 66 ++++++++++++++++++++++++++++++++++ 9 files changed, 162 insertions(+), 30 deletions(-) create mode 100644 test/mjsunit/regress/regress-392114.js diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc index 033413ba7..56a34e713 100644 --- a/src/arm/code-stubs-arm.cc +++ b/src/arm/code-stubs-arm.cc @@ -3081,9 +3081,14 @@ void CallIC_ArrayStub::Generate(MacroAssembler* masm) { __ mov(r0, Operand(arg_count())); __ add(r4, r2, Operand::PointerOffsetFromSmiKey(r3)); - __ ldr(r2, FieldMemOperand(r4, FixedArray::kHeaderSize)); - // Verify that r2 contains an AllocationSite - __ AssertUndefinedOrAllocationSite(r2, r4); + __ ldr(r4, FieldMemOperand(r4, FixedArray::kHeaderSize)); + + // Verify that r4 contains an AllocationSite + __ ldr(r5, FieldMemOperand(r4, HeapObject::kMapOffset)); + __ CompareRoot(r5, Heap::kAllocationSiteMapRootIndex); + __ b(ne, &miss); + + __ mov(r2, r4); ArrayConstructorStub stub(masm->isolate(), arg_count()); __ TailCallStub(&stub); @@ -3150,7 +3155,11 @@ void CallICStub::Generate(MacroAssembler* masm) { __ b(eq, &miss); if (!FLAG_trace_ic) { - // We are going megamorphic, and we don't want to visit the runtime. + // We are going megamorphic. If the feedback is a JSFunction, it is fine + // to handle it here. More complex cases are dealt with in the runtime. + __ AssertNotSmi(r4); + __ CompareObjectType(r4, r5, r5, JS_FUNCTION_TYPE); + __ b(ne, &miss); __ add(r4, r2, Operand::PointerOffsetFromSmiKey(r3)); __ LoadRoot(ip, Heap::kMegamorphicSymbolRootIndex); __ str(ip, FieldMemOperand(r4, FixedArray::kHeaderSize)); diff --git a/src/arm64/code-stubs-arm64.cc b/src/arm64/code-stubs-arm64.cc index 70ead443f..fc8d91b90 100644 --- a/src/arm64/code-stubs-arm64.cc +++ b/src/arm64/code-stubs-arm64.cc @@ -3374,15 +3374,19 @@ void CallIC_ArrayStub::Generate(MacroAssembler* masm) { __ Cmp(function, scratch); __ B(ne, &miss); - Register allocation_site = feedback_vector; __ Mov(x0, Operand(arg_count())); __ Add(scratch, feedback_vector, Operand::UntagSmiAndScale(index, kPointerSizeLog2)); - __ Ldr(allocation_site, FieldMemOperand(scratch, FixedArray::kHeaderSize)); + __ Ldr(scratch, FieldMemOperand(scratch, FixedArray::kHeaderSize)); + + // Verify that scratch contains an AllocationSite + Register map = x5; + __ Ldr(map, FieldMemOperand(scratch, HeapObject::kMapOffset)); + __ JumpIfNotRoot(map, Heap::kAllocationSiteMapRootIndex, &miss); - // Verify that x2 contains an AllocationSite - __ AssertUndefinedOrAllocationSite(allocation_site, scratch); + Register allocation_site = feedback_vector; + __ Mov(allocation_site, scratch); ArrayConstructorStub stub(masm->isolate(), arg_count()); __ TailCallStub(&stub); @@ -3458,7 +3462,10 @@ void CallICStub::Generate(MacroAssembler* masm) { __ JumpIfRoot(x4, Heap::kUninitializedSymbolRootIndex, &miss); if (!FLAG_trace_ic) { - // We are going megamorphic, and we don't want to visit the runtime. + // We are going megamorphic. If the feedback is a JSFunction, it is fine + // to handle it here. More complex cases are dealt with in the runtime. + __ AssertNotSmi(x4); + __ JumpIfNotObjectType(x4, x5, x5, JS_FUNCTION_TYPE, &miss); __ Add(x4, feedback_vector, Operand::UntagSmiAndScale(index, kPointerSizeLog2)); __ LoadRoot(x5, Heap::kMegamorphicSymbolRootIndex); diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc index e61d22138..9e925b04a 100644 --- a/src/ia32/code-stubs-ia32.cc +++ b/src/ia32/code-stubs-ia32.cc @@ -2484,10 +2484,16 @@ void CallIC_ArrayStub::Generate(MacroAssembler* masm) { __ j(not_equal, &miss); __ mov(eax, arg_count()); - __ mov(ebx, FieldOperand(ebx, edx, times_half_pointer_size, + __ mov(ecx, FieldOperand(ebx, edx, times_half_pointer_size, FixedArray::kHeaderSize)); + // Verify that ecx contains an AllocationSite - __ AssertUndefinedOrAllocationSite(ebx); + Factory* factory = masm->isolate()->factory(); + __ cmp(FieldOperand(ecx, HeapObject::kMapOffset), + factory->allocation_site_map()); + __ j(not_equal, &miss); + + __ mov(ebx, ecx); ArrayConstructorStub stub(masm->isolate(), arg_count()); __ TailCallStub(&stub); @@ -2558,7 +2564,11 @@ void CallICStub::Generate(MacroAssembler* masm) { __ j(equal, &miss); if (!FLAG_trace_ic) { - // We are going megamorphic, and we don't want to visit the runtime. + // We are going megamorphic. If the feedback is a JSFunction, it is fine + // to handle it here. More complex cases are dealt with in the runtime. + __ AssertNotSmi(ecx); + __ CmpObjectType(ecx, JS_FUNCTION_TYPE, ecx); + __ j(not_equal, &miss); __ mov(FieldOperand(ebx, edx, times_half_pointer_size, FixedArray::kHeaderSize), Immediate(TypeFeedbackInfo::MegamorphicSentinel(isolate))); diff --git a/src/ic.cc b/src/ic.cc index cd92af118..c76472050 100644 --- a/src/ic.cc +++ b/src/ic.cc @@ -1855,8 +1855,13 @@ bool CallIC::DoCustomHandler(Handle receiver, isolate()->context()->native_context()->array_function(), isolate()); if (array_function.is_identical_to(Handle::cast(function))) { // Alter the slot. - Handle new_site = isolate()->factory()->NewAllocationSite(); - vector->set(slot->value(), *new_site); + Object* feedback = vector->get(slot->value()); + if (!feedback->IsAllocationSite()) { + Handle new_site = + isolate()->factory()->NewAllocationSite(); + vector->set(slot->value(), *new_site); + } + CallIC_ArrayStub stub(isolate(), state); set_target(*stub.GetCode()); Handle name; @@ -1896,6 +1901,9 @@ void CallIC::HandleMiss(Handle receiver, State state(target()->extra_ic_state()); Object* feedback = vector->get(slot->value()); + // Hand-coded MISS handling is easier if CallIC slots don't contain smis. + ASSERT(!feedback->IsSmi()); + if (feedback->IsJSFunction() || !function->IsJSFunction()) { // We are going generic. vector->set(slot->value(), @@ -1904,9 +1912,14 @@ void CallIC::HandleMiss(Handle receiver, TRACE_GENERIC_IC(isolate(), "CallIC", "megamorphic"); } else { - // If we came here feedback must be the uninitialized sentinel, - // and we are going monomorphic. - ASSERT(feedback == *TypeFeedbackInfo::UninitializedSentinel(isolate())); + // The feedback is either uninitialized or an allocation site. + // It might be an allocation site because if we re-compile the full code + // to add deoptimization support, we call with the default call-ic, and + // merely need to patch the target to match the feedback. + // TODO(mvstanton): the better approach is to dispense with patching + // altogether, which is in progress. + ASSERT(feedback == *TypeFeedbackInfo::UninitializedSentinel(isolate()) || + feedback->IsAllocationSite()); // Do we want to install a custom handler? if (FLAG_use_ic && diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc index 0287a9a61..b8f565b0b 100644 --- a/src/mips/code-stubs-mips.cc +++ b/src/mips/code-stubs-mips.cc @@ -3240,9 +3240,14 @@ void CallIC_ArrayStub::Generate(MacroAssembler* masm) { __ li(a0, Operand(arg_count())); __ sll(at, a3, kPointerSizeLog2 - kSmiTagSize); __ Addu(at, a2, Operand(at)); - __ lw(a2, FieldMemOperand(at, FixedArray::kHeaderSize)); - // Verify that a2 contains an AllocationSite - __ AssertUndefinedOrAllocationSite(a2, at); + __ lw(t0, FieldMemOperand(at, FixedArray::kHeaderSize)); + + // Verify that t0 contains an AllocationSite + __ lw(t1, FieldMemOperand(t0, HeapObject::kMapOffset)); + __ LoadRoot(at, Heap::kAllocationSiteMapRootIndex); + __ Branch(&miss, ne, t1, Operand(at)); + + __ mov(a2, t0); ArrayConstructorStub stub(masm->isolate(), arg_count()); __ TailCallStub(&stub); @@ -3309,7 +3314,11 @@ void CallICStub::Generate(MacroAssembler* masm) { __ Branch(&miss, eq, t0, Operand(at)); if (!FLAG_trace_ic) { - // We are going megamorphic, and we don't want to visit the runtime. + // We are going megamorphic. If the feedback is a JSFunction, it is fine + // to handle it here. More complex cases are dealt with in the runtime. + __ AssertNotSmi(t0); + __ GetObjectType(t0, t1, t1); + __ Branch(&miss, ne, t1, Operand(JS_FUNCTION_TYPE)); __ sll(t0, a3, kPointerSizeLog2 - kSmiTagSize); __ Addu(t0, a2, Operand(t0)); __ LoadRoot(at, Heap::kMegamorphicSymbolRootIndex); diff --git a/src/version.cc b/src/version.cc index c11fb5a34..1d8adfec9 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 11 +#define PATCH_LEVEL 12 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc index 0d54f89d1..e31bf98db 100644 --- a/src/x64/code-stubs-x64.cc +++ b/src/x64/code-stubs-x64.cc @@ -2378,12 +2378,16 @@ void CallIC_ArrayStub::Generate(MacroAssembler* masm) { __ cmpq(rdi, rcx); __ j(not_equal, &miss); - __ movq(rax, Immediate(arg_count())); - __ movp(rbx, FieldOperand(rbx, rdx, times_pointer_size, + __ movp(rax, Immediate(arg_count())); + __ movp(rcx, FieldOperand(rbx, rdx, times_pointer_size, FixedArray::kHeaderSize)); - // Verify that ecx contains an AllocationSite - __ AssertUndefinedOrAllocationSite(rbx); + Factory* factory = masm->isolate()->factory(); + __ Cmp(FieldOperand(rcx, HeapObject::kMapOffset), + factory->allocation_site_map()); + __ j(not_equal, &miss); + + __ movp(rbx, rcx); ArrayConstructorStub stub(masm->isolate(), arg_count()); __ TailCallStub(&stub); @@ -2457,7 +2461,11 @@ void CallICStub::Generate(MacroAssembler* masm) { __ j(equal, &miss); if (!FLAG_trace_ic) { - // We are going megamorphic, and we don't want to visit the runtime. + // We are going megamorphic. If the feedback is a JSFunction, it is fine + // to handle it here. More complex cases are dealt with in the runtime. + __ AssertNotSmi(rcx); + __ CmpObjectType(rcx, JS_FUNCTION_TYPE, rcx); + __ j(not_equal, &miss); __ Move(FieldOperand(rbx, rdx, times_pointer_size, FixedArray::kHeaderSize), TypeFeedbackInfo::MegamorphicSentinel(isolate)); diff --git a/src/x87/code-stubs-x87.cc b/src/x87/code-stubs-x87.cc index a194780fa..7edc82117 100644 --- a/src/x87/code-stubs-x87.cc +++ b/src/x87/code-stubs-x87.cc @@ -2166,10 +2166,16 @@ void CallIC_ArrayStub::Generate(MacroAssembler* masm) { __ j(not_equal, &miss); __ mov(eax, arg_count()); - __ mov(ebx, FieldOperand(ebx, edx, times_half_pointer_size, + __ mov(ecx, FieldOperand(ebx, edx, times_half_pointer_size, FixedArray::kHeaderSize)); + // Verify that ecx contains an AllocationSite - __ AssertUndefinedOrAllocationSite(ebx); + Factory* factory = masm->isolate()->factory(); + __ cmp(FieldOperand(ecx, HeapObject::kMapOffset), + factory->allocation_site_map()); + __ j(not_equal, &miss); + + __ mov(ebx, ecx); ArrayConstructorStub stub(masm->isolate(), arg_count()); __ TailCallStub(&stub); @@ -2240,7 +2246,11 @@ void CallICStub::Generate(MacroAssembler* masm) { __ j(equal, &miss); if (!FLAG_trace_ic) { - // We are going megamorphic, and we don't want to visit the runtime. + // We are going megamorphic. If the feedback is a JSFunction, it is fine + // to handle it here. More complex cases are dealt with in the runtime. + __ AssertNotSmi(ecx); + __ CmpObjectType(ecx, JS_FUNCTION_TYPE, ecx); + __ j(not_equal, &miss); __ mov(FieldOperand(ebx, edx, times_half_pointer_size, FixedArray::kHeaderSize), Immediate(TypeFeedbackInfo::MegamorphicSentinel(isolate))); diff --git a/test/mjsunit/regress/regress-392114.js b/test/mjsunit/regress/regress-392114.js new file mode 100644 index 000000000..e5cf1cde3 --- /dev/null +++ b/test/mjsunit/regress/regress-392114.js @@ -0,0 +1,66 @@ +// Copyright 2014 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Flags: --expose-debug-as debug --allow-natives-syntax + +Debug = debug.Debug; + +function dummy(x) { + return x + 100; +} + +function create_closure() { + var f = function(arg) { + if (arg) { %DeoptimizeFunction(f); } + var a = Array(10); + for (var i = 0; i < a.length; i++) { + a[i] = i; + } + } + return f; +} + +var c = create_closure(); +c(); + +// c CallIC state now has custom Array handler installed. + +// Turn on the debugger. +Debug.setListener(function () {}); + +var d = create_closure(); +%OptimizeFunctionOnNextCall(d); +// Thanks to the debugger, we recreate the full code too. We deopt and run +// it, stomping on the unexpected AllocationSite in the type vector slot. +d(true); + +// CallIC in c misinterprets type vector slot contents as an AllocationSite, +// corrupting the heap. +c(); + +// CallIC MISS - crash due to corruption. +dummy(); -- cgit v1.2.3 From b3d0e079a65545810a4c3b5fc0852b028d0d617e Mon Sep 17 00:00:00 2001 From: Bo Liu Date: Wed, 6 Aug 2014 11:10:47 -0700 Subject: Update makefiles after merge of Chromium at 37.0.2062.68 This commit was generated by merge_from_chromium.py. Change-Id: Ieb2b8b533ee5c2dd5fb0f260411066814628065d --- tools/gyp/v8_base.target.darwin-arm.mk | 8 ++++---- tools/gyp/v8_base.target.darwin-arm64.mk | 8 ++++---- tools/gyp/v8_base.target.darwin-mips.mk | 8 ++++---- tools/gyp/v8_base.target.darwin-x86.mk | 8 ++++---- tools/gyp/v8_base.target.darwin-x86_64.mk | 8 ++++---- tools/gyp/v8_base.target.linux-arm.mk | 8 ++++---- tools/gyp/v8_base.target.linux-arm64.mk | 8 ++++---- tools/gyp/v8_base.target.linux-mips.mk | 8 ++++---- tools/gyp/v8_base.target.linux-x86.mk | 8 ++++---- tools/gyp/v8_base.target.linux-x86_64.mk | 8 ++++---- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/tools/gyp/v8_base.target.darwin-arm.mk b/tools/gyp/v8_base.target.darwin-arm.mk index 0b6991b24..b398bf062 100644 --- a/tools/gyp/v8_base.target.darwin-arm.mk +++ b/tools/gyp/v8_base.target.darwin-arm.mk @@ -298,8 +298,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -412,8 +412,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.darwin-arm64.mk b/tools/gyp/v8_base.target.darwin-arm64.mk index 3bf85e6a1..57f8cd17b 100644 --- a/tools/gyp/v8_base.target.darwin-arm64.mk +++ b/tools/gyp/v8_base.target.darwin-arm64.mk @@ -288,8 +288,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -388,8 +388,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.darwin-mips.mk b/tools/gyp/v8_base.target.darwin-mips.mk index 848edfa1f..9f20cd391 100644 --- a/tools/gyp/v8_base.target.darwin-mips.mk +++ b/tools/gyp/v8_base.target.darwin-mips.mk @@ -294,8 +294,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -404,8 +404,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.darwin-x86.mk b/tools/gyp/v8_base.target.darwin-x86.mk index f1e190ec9..08454c157 100644 --- a/tools/gyp/v8_base.target.darwin-x86.mk +++ b/tools/gyp/v8_base.target.darwin-x86.mk @@ -289,8 +289,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -395,8 +395,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.darwin-x86_64.mk b/tools/gyp/v8_base.target.darwin-x86_64.mk index 58dc19c4c..2eca06df7 100644 --- a/tools/gyp/v8_base.target.darwin-x86_64.mk +++ b/tools/gyp/v8_base.target.darwin-x86_64.mk @@ -288,8 +288,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -393,8 +393,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.linux-arm.mk b/tools/gyp/v8_base.target.linux-arm.mk index 0b6991b24..b398bf062 100644 --- a/tools/gyp/v8_base.target.linux-arm.mk +++ b/tools/gyp/v8_base.target.linux-arm.mk @@ -298,8 +298,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -412,8 +412,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.linux-arm64.mk b/tools/gyp/v8_base.target.linux-arm64.mk index 3bf85e6a1..57f8cd17b 100644 --- a/tools/gyp/v8_base.target.linux-arm64.mk +++ b/tools/gyp/v8_base.target.linux-arm64.mk @@ -288,8 +288,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -388,8 +388,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.linux-mips.mk b/tools/gyp/v8_base.target.linux-mips.mk index 848edfa1f..9f20cd391 100644 --- a/tools/gyp/v8_base.target.linux-mips.mk +++ b/tools/gyp/v8_base.target.linux-mips.mk @@ -294,8 +294,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -404,8 +404,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.linux-x86.mk b/tools/gyp/v8_base.target.linux-x86.mk index f1e190ec9..08454c157 100644 --- a/tools/gyp/v8_base.target.linux-x86.mk +++ b/tools/gyp/v8_base.target.linux-x86.mk @@ -289,8 +289,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -395,8 +395,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.linux-x86_64.mk b/tools/gyp/v8_base.target.linux-x86_64.mk index 58dc19c4c..2eca06df7 100644 --- a/tools/gyp/v8_base.target.linux-x86_64.mk +++ b/tools/gyp/v8_base.target.linux-x86_64.mk @@ -288,8 +288,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -393,8 +393,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport -- cgit v1.2.3 -- cgit v1.2.3 From dac01f4b16f0a7a3c03f198642f9b813a9ed81c9 Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Mon, 18 Aug 2014 12:10:20 +0000 Subject: Version 3.28.71.3 (merged r23081) Fix newly discovered presubmit errors. R=yangguo@chromium.org BUG= Review URL: https://codereview.chromium.org/484643002 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@23151 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/api.cc | 4 +-- src/arm/assembler-arm.h | 2 +- src/arm/lithium-arm.h | 2 +- src/arm64/assembler-arm64.h | 2 +- src/arm64/instrument-arm64.h | 2 +- src/arm64/lithium-arm64.h | 4 +-- src/arm64/macro-assembler-arm64.h | 2 +- src/base/platform/platform.h | 2 +- src/code-stubs.h | 3 ++- src/effects.h | 2 +- src/hydrogen-instructions.h | 14 ++++++----- src/hydrogen.cc | 4 +-- src/ia32/lithium-ia32.h | 2 +- src/interpreter-irregexp.cc | 4 +-- src/libplatform/worker-thread.cc | 2 +- src/log.cc | 5 ++-- src/macro-assembler.h | 20 +++++++-------- src/mips/lithium-mips.h | 2 +- src/mips64/lithium-mips64.h | 2 +- src/optimizing-compiler-thread.h | 28 ++++++++++----------- src/splay-tree.h | 4 +-- src/version.cc | 2 +- src/x64/lithium-x64.h | 2 +- src/x87/lithium-x87.h | 2 +- .../platform/condition-variable-unittest.cc | 29 +++++++++++++--------- test/base-unittests/platform/platform-unittest.cc | 4 +-- test/cctest/cctest.h | 5 ++-- test/cctest/compiler/test-instruction.cc | 2 +- test/cctest/compiler/test-simplified-lowering.cc | 2 +- test/cctest/test-api.cc | 24 ++++++++++-------- test/cctest/test-circular-queue.cc | 8 +++--- test/cctest/test-debug.cc | 18 +++++++------- test/cctest/test-declarative-accessors.cc | 2 +- test/cctest/test-libplatform.h | 4 ++- test/cctest/test-lockers.cc | 11 +++----- test/cctest/test-semaphore.cc | 6 ++--- test/cctest/test-thread-termination.cc | 4 +-- test/cctest/test-threads.cc | 16 ++++++------ 38 files changed, 127 insertions(+), 126 deletions(-) diff --git a/src/api.cc b/src/api.cc index abe50f69b..3d9e9d831 100644 --- a/src/api.cc +++ b/src/api.cc @@ -4290,9 +4290,7 @@ class Utf8LengthHelper : public i::AllStatic { class Visitor { public: - inline explicit Visitor() - : utf8_length_(0), - state_(kInitialState) {} + Visitor() : utf8_length_(0), state_(kInitialState) {} void VisitOneByteString(const uint8_t* chars, int length) { int utf8_length = 0; diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h index 2950264f0..e33f48a05 100644 --- a/src/arm/assembler-arm.h +++ b/src/arm/assembler-arm.h @@ -649,7 +649,7 @@ class NeonListOperand BASE_EMBEDDED { // Class used to build a constant pool. class ConstantPoolBuilder BASE_EMBEDDED { public: - explicit ConstantPoolBuilder(); + ConstantPoolBuilder(); ConstantPoolArray::LayoutSection AddEntry(Assembler* assm, const RelocInfo& rinfo); void Relocate(int pc_delta); diff --git a/src/arm/lithium-arm.h b/src/arm/lithium-arm.h index 0e24bda0d..16f522e5b 100644 --- a/src/arm/lithium-arm.h +++ b/src/arm/lithium-arm.h @@ -414,7 +414,7 @@ class LLazyBailout V8_FINAL : public LTemplateInstruction<0, 0, 0> { class LDummy V8_FINAL : public LTemplateInstruction<1, 0, 0> { public: - explicit LDummy() { } + LDummy() {} DECLARE_CONCRETE_INSTRUCTION(Dummy, "dummy") }; diff --git a/src/arm64/assembler-arm64.h b/src/arm64/assembler-arm64.h index d0effa79a..1bafce845 100644 --- a/src/arm64/assembler-arm64.h +++ b/src/arm64/assembler-arm64.h @@ -697,7 +697,7 @@ class Operand { // MemOperand represents a memory operand in a load or store instruction. class MemOperand { public: - inline explicit MemOperand(); + inline MemOperand(); inline explicit MemOperand(Register base, ptrdiff_t offset = 0, AddrMode addrmode = Offset); diff --git a/src/arm64/instrument-arm64.h b/src/arm64/instrument-arm64.h index bbb7f8af7..86ddfcbbc 100644 --- a/src/arm64/instrument-arm64.h +++ b/src/arm64/instrument-arm64.h @@ -32,7 +32,7 @@ enum CounterType { class Counter { public: - Counter(const char* name, CounterType type = Gauge); + explicit Counter(const char* name, CounterType type = Gauge); void Increment(); void Enable(); diff --git a/src/arm64/lithium-arm64.h b/src/arm64/lithium-arm64.h index 32c1161ee..21a5f7414 100644 --- a/src/arm64/lithium-arm64.h +++ b/src/arm64/lithium-arm64.h @@ -452,7 +452,7 @@ class LDrop V8_FINAL : public LTemplateInstruction<0, 0, 0> { class LDummy V8_FINAL : public LTemplateInstruction<1, 0, 0> { public: - explicit LDummy() { } + LDummy() {} DECLARE_CONCRETE_INSTRUCTION(Dummy, "dummy") }; @@ -943,7 +943,7 @@ class LCheckInstanceType V8_FINAL : public LTemplateInstruction<0, 1, 1> { class LCheckMaps V8_FINAL : public LTemplateInstruction<0, 1, 1> { public: - LCheckMaps(LOperand* value = NULL, LOperand* temp = NULL) { + explicit LCheckMaps(LOperand* value = NULL, LOperand* temp = NULL) { inputs_[0] = value; temps_[0] = temp; } diff --git a/src/arm64/macro-assembler-arm64.h b/src/arm64/macro-assembler-arm64.h index 47ffff178..aa83c7040 100644 --- a/src/arm64/macro-assembler-arm64.h +++ b/src/arm64/macro-assembler-arm64.h @@ -2201,7 +2201,7 @@ class MacroAssembler : public Assembler { // emitted is what you specified when creating the scope. class InstructionAccurateScope BASE_EMBEDDED { public: - InstructionAccurateScope(MacroAssembler* masm, size_t count = 0) + explicit InstructionAccurateScope(MacroAssembler* masm, size_t count = 0) : masm_(masm) #ifdef DEBUG , diff --git a/src/base/platform/platform.h b/src/base/platform/platform.h index 1645a4de0..8a5412626 100644 --- a/src/base/platform/platform.h +++ b/src/base/platform/platform.h @@ -428,7 +428,7 @@ class Thread { class Options { public: Options() : name_("v8:"), stack_size_(0) {} - Options(const char* name, int stack_size = 0) + explicit Options(const char* name, int stack_size = 0) : name_(name), stack_size_(stack_size) {} const char* name() const { return name_; } diff --git a/src/code-stubs.h b/src/code-stubs.h index e9b4573b5..c1d051b3d 100644 --- a/src/code-stubs.h +++ b/src/code-stubs.h @@ -437,7 +437,8 @@ class HydrogenCodeStub : public CodeStub { INITIALIZED }; - HydrogenCodeStub(Isolate* isolate, InitializationState state = INITIALIZED) + explicit HydrogenCodeStub(Isolate* isolate, + InitializationState state = INITIALIZED) : CodeStub(isolate) { is_uninitialized_ = (state == UNINITIALIZED); } diff --git a/src/effects.h b/src/effects.h index 70c9a97a9..9481bb887 100644 --- a/src/effects.h +++ b/src/effects.h @@ -33,7 +33,7 @@ struct Effect { Bounds bounds; Effect() : modality(DEFINITE) {} - Effect(Bounds b, Modality m = DEFINITE) : modality(m), bounds(b) {} + explicit Effect(Bounds b, Modality m = DEFINITE) : modality(m), bounds(b) {} // The unknown effect. static Effect Unknown(Zone* zone) { diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h index 961c15c61..ed1243507 100644 --- a/src/hydrogen-instructions.h +++ b/src/hydrogen-instructions.h @@ -551,7 +551,7 @@ class HValue : public ZoneObject { return IsShl() || IsShr() || IsSar(); } - HValue(HType type = HType::Tagged()) + explicit HValue(HType type = HType::Tagged()) : block_(NULL), id_(kNoNumber), type_(type), @@ -1205,7 +1205,7 @@ class HInstruction : public HValue { DECLARE_ABSTRACT_INSTRUCTION(Instruction) protected: - HInstruction(HType type = HType::Tagged()) + explicit HInstruction(HType type = HType::Tagged()) : HValue(type), next_(NULL), previous_(NULL), @@ -1238,7 +1238,8 @@ class HTemplateInstruction : public HInstruction { } protected: - HTemplateInstruction(HType type = HType::Tagged()) : HInstruction(type) {} + explicit HTemplateInstruction(HType type = HType::Tagged()) + : HInstruction(type) {} virtual void InternalSetOperandAt(int i, HValue* value) V8_FINAL V8_OVERRIDE { inputs_[i] = value; @@ -1598,7 +1599,7 @@ class HAbnormalExit V8_FINAL : public HTemplateControlInstruction<0, 0> { class HUnaryOperation : public HTemplateInstruction<1> { public: - HUnaryOperation(HValue* value, HType type = HType::Tagged()) + explicit HUnaryOperation(HValue* value, HType type = HType::Tagged()) : HTemplateInstruction<1>(type) { SetOperandAt(0, value); } @@ -2716,7 +2717,7 @@ class HLoadRoot V8_FINAL : public HTemplateInstruction<0> { } private: - HLoadRoot(Heap::RootListIndex index, HType type = HType::Tagged()) + explicit HLoadRoot(Heap::RootListIndex index, HType type = HType::Tagged()) : HTemplateInstruction<0>(type), index_(index) { SetFlag(kUseGVN); // TODO(bmeurer): We'll need kDependsOnRoots once we add the @@ -3706,7 +3707,8 @@ class HConstant V8_FINAL : public HTemplateInstruction<0> { private: friend class HGraph; - HConstant(Handle handle, Representation r = Representation::None()); + explicit HConstant(Handle handle, + Representation r = Representation::None()); HConstant(int32_t value, Representation r = Representation::None(), bool is_not_in_new_space = true, diff --git a/src/hydrogen.cc b/src/hydrogen.cc index fb127ec4f..3ddd7cce8 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -7439,8 +7439,8 @@ HInstruction* HOptimizedGraphBuilder::BuildCallConstantFunction( class FunctionSorter { public: - FunctionSorter(int index = 0, int ticks = 0, int size = 0) - : index_(index), ticks_(ticks), size_(size) { } + explicit FunctionSorter(int index = 0, int ticks = 0, int size = 0) + : index_(index), ticks_(ticks), size_(size) {} int index() const { return index_; } int ticks() const { return ticks_; } diff --git a/src/ia32/lithium-ia32.h b/src/ia32/lithium-ia32.h index e514290d8..4206482de 100644 --- a/src/ia32/lithium-ia32.h +++ b/src/ia32/lithium-ia32.h @@ -409,7 +409,7 @@ class LLazyBailout V8_FINAL : public LTemplateInstruction<0, 0, 0> { class LDummy V8_FINAL : public LTemplateInstruction<1, 0, 0> { public: - explicit LDummy() { } + LDummy() {} DECLARE_CONCRETE_INSTRUCTION(Dummy, "dummy") }; diff --git a/src/interpreter-irregexp.cc b/src/interpreter-irregexp.cc index 626090e45..7f51d5e41 100644 --- a/src/interpreter-irregexp.cc +++ b/src/interpreter-irregexp.cc @@ -136,9 +136,7 @@ static int32_t Load16Aligned(const byte* pc) { // matching terminates. class BacktrackStack { public: - explicit BacktrackStack() { - data_ = NewArray(kBacktrackStackSize); - } + BacktrackStack() { data_ = NewArray(kBacktrackStackSize); } ~BacktrackStack() { DeleteArray(data_); diff --git a/src/libplatform/worker-thread.cc b/src/libplatform/worker-thread.cc index 239403b09..99637151e 100644 --- a/src/libplatform/worker-thread.cc +++ b/src/libplatform/worker-thread.cc @@ -11,7 +11,7 @@ namespace v8 { namespace platform { WorkerThread::WorkerThread(TaskQueue* queue) - : Thread("V8 WorkerThread"), queue_(queue) { + : Thread(Options("V8 WorkerThread")), queue_(queue) { Start(); } diff --git a/src/log.cc b/src/log.cc index 1ce22f848..0c6c4355a 100644 --- a/src/log.cc +++ b/src/log.cc @@ -693,7 +693,7 @@ class Ticker: public Sampler { // Profiler implementation. // Profiler::Profiler(Isolate* isolate) - : base::Thread("v8:Profiler"), + : base::Thread(Options("v8:Profiler")), isolate_(isolate), head_(0), tail_(0), @@ -701,8 +701,7 @@ Profiler::Profiler(Isolate* isolate) buffer_semaphore_(0), engaged_(false), running_(false), - paused_(false) { -} + paused_(false) {} void Profiler::Engage() { diff --git a/src/macro-assembler.h b/src/macro-assembler.h index 2b7d9428a..54cebca90 100644 --- a/src/macro-assembler.h +++ b/src/macro-assembler.h @@ -47,42 +47,42 @@ const int kInvalidProtoDepth = -1; #include "src/assembler.h" #include "src/x64/assembler-x64.h" #include "src/x64/assembler-x64-inl.h" -#include "src/code.h" // must be after assembler_*.h +#include "src/code.h" // NOLINT, must be after assembler_*.h #include "src/x64/macro-assembler-x64.h" #elif V8_TARGET_ARCH_ARM64 #include "src/arm64/constants-arm64.h" #include "src/assembler.h" #include "src/arm64/assembler-arm64.h" // NOLINT #include "src/arm64/assembler-arm64-inl.h" -#include "src/code.h" // must be after assembler_*.h -#include "src/arm64/macro-assembler-arm64.h" +#include "src/code.h" // NOLINT, must be after assembler_*.h +#include "src/arm64/macro-assembler-arm64.h" // NOLINT #include "src/arm64/macro-assembler-arm64-inl.h" #elif V8_TARGET_ARCH_ARM #include "src/arm/constants-arm.h" #include "src/assembler.h" #include "src/arm/assembler-arm.h" // NOLINT #include "src/arm/assembler-arm-inl.h" -#include "src/code.h" // must be after assembler_*.h -#include "src/arm/macro-assembler-arm.h" +#include "src/code.h" // NOLINT, must be after assembler_*.h +#include "src/arm/macro-assembler-arm.h" // NOLINT #elif V8_TARGET_ARCH_MIPS #include "src/mips/constants-mips.h" -#include "src/assembler.h" +#include "src/assembler.h" // NOLINT #include "src/mips/assembler-mips.h" // NOLINT #include "src/mips/assembler-mips-inl.h" -#include "src/code.h" // must be after assembler_*.h +#include "src/code.h" // NOLINT, must be after assembler_*.h #include "src/mips/macro-assembler-mips.h" #elif V8_TARGET_ARCH_MIPS64 #include "src/mips64/constants-mips64.h" -#include "src/assembler.h" +#include "src/assembler.h" // NOLINT #include "src/mips64/assembler-mips64.h" // NOLINT #include "src/mips64/assembler-mips64-inl.h" -#include "src/code.h" // must be after assembler_*.h +#include "src/code.h" // NOLINT, must be after assembler_*.h #include "src/mips64/macro-assembler-mips64.h" #elif V8_TARGET_ARCH_X87 #include "src/assembler.h" #include "src/x87/assembler-x87.h" #include "src/x87/assembler-x87-inl.h" -#include "src/code.h" // must be after assembler_*.h +#include "src/code.h" // NOLINT, must be after assembler_*.h #include "src/x87/macro-assembler-x87.h" #else #error Unsupported target architecture. diff --git a/src/mips/lithium-mips.h b/src/mips/lithium-mips.h index 4f2439206..957895560 100644 --- a/src/mips/lithium-mips.h +++ b/src/mips/lithium-mips.h @@ -411,7 +411,7 @@ class LLazyBailout V8_FINAL : public LTemplateInstruction<0, 0, 0> { class LDummy V8_FINAL : public LTemplateInstruction<1, 0, 0> { public: - explicit LDummy() { } + LDummy() {} DECLARE_CONCRETE_INSTRUCTION(Dummy, "dummy") }; diff --git a/src/mips64/lithium-mips64.h b/src/mips64/lithium-mips64.h index 7902513d4..77e5b9c38 100644 --- a/src/mips64/lithium-mips64.h +++ b/src/mips64/lithium-mips64.h @@ -410,7 +410,7 @@ class LLazyBailout V8_FINAL : public LTemplateInstruction<0, 0, 0> { class LDummy V8_FINAL : public LTemplateInstruction<1, 0, 0> { public: - explicit LDummy() { } + LDummy() {} DECLARE_CONCRETE_INSTRUCTION(Dummy, "dummy") }; diff --git a/src/optimizing-compiler-thread.h b/src/optimizing-compiler-thread.h index 7307f05fe..6ff4f2a61 100644 --- a/src/optimizing-compiler-thread.h +++ b/src/optimizing-compiler-thread.h @@ -22,22 +22,22 @@ class SharedFunctionInfo; class OptimizingCompilerThread : public base::Thread { public: - explicit OptimizingCompilerThread(Isolate *isolate) : - Thread("OptimizingCompilerThread"), + explicit OptimizingCompilerThread(Isolate* isolate) + : Thread(Options("OptimizingCompilerThread")), #ifdef DEBUG - thread_id_(0), + thread_id_(0), #endif - isolate_(isolate), - stop_semaphore_(0), - input_queue_semaphore_(0), - input_queue_capacity_(FLAG_concurrent_recompilation_queue_length), - input_queue_length_(0), - input_queue_shift_(0), - osr_buffer_capacity_(FLAG_concurrent_recompilation_queue_length + 4), - osr_buffer_cursor_(0), - osr_hits_(0), - osr_attempts_(0), - blocked_jobs_(0) { + isolate_(isolate), + stop_semaphore_(0), + input_queue_semaphore_(0), + input_queue_capacity_(FLAG_concurrent_recompilation_queue_length), + input_queue_length_(0), + input_queue_shift_(0), + osr_buffer_capacity_(FLAG_concurrent_recompilation_queue_length + 4), + osr_buffer_cursor_(0), + osr_hits_(0), + osr_attempts_(0), + blocked_jobs_(0) { base::NoBarrier_Store(&stop_thread_, static_cast(CONTINUE)); input_queue_ = NewArray(input_queue_capacity_); diff --git a/src/splay-tree.h b/src/splay-tree.h index 5448fcd04..30e5d6787 100644 --- a/src/splay-tree.h +++ b/src/splay-tree.h @@ -35,8 +35,8 @@ class SplayTree { class Locator; - SplayTree(AllocationPolicy allocator = AllocationPolicy()) - : root_(NULL), allocator_(allocator) { } + explicit SplayTree(AllocationPolicy allocator = AllocationPolicy()) + : root_(NULL), allocator_(allocator) {} ~SplayTree(); INLINE(void* operator new(size_t size, diff --git a/src/version.cc b/src/version.cc index 2ff79776a..614ca2006 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 28 #define BUILD_NUMBER 71 -#define PATCH_LEVEL 2 +#define PATCH_LEVEL 3 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/src/x64/lithium-x64.h b/src/x64/lithium-x64.h index 4782bc932..a1c563f88 100644 --- a/src/x64/lithium-x64.h +++ b/src/x64/lithium-x64.h @@ -419,7 +419,7 @@ class LLazyBailout V8_FINAL : public LTemplateInstruction<0, 0, 0> { class LDummy V8_FINAL : public LTemplateInstruction<1, 0, 0> { public: - explicit LDummy() { } + LDummy() {} DECLARE_CONCRETE_INSTRUCTION(Dummy, "dummy") }; diff --git a/src/x87/lithium-x87.h b/src/x87/lithium-x87.h index 7a373fece..56d7c640f 100644 --- a/src/x87/lithium-x87.h +++ b/src/x87/lithium-x87.h @@ -426,7 +426,7 @@ class LLazyBailout V8_FINAL : public LTemplateInstruction<0, 0, 0> { class LDummy V8_FINAL : public LTemplateInstruction<1, 0, 0> { public: - explicit LDummy() { } + LDummy() {} DECLARE_CONCRETE_INSTRUCTION(Dummy, "dummy") }; diff --git a/test/base-unittests/platform/condition-variable-unittest.cc b/test/base-unittests/platform/condition-variable-unittest.cc index 61001d986..ea1efd0d5 100644 --- a/test/base-unittests/platform/condition-variable-unittest.cc +++ b/test/base-unittests/platform/condition-variable-unittest.cc @@ -32,8 +32,9 @@ namespace { class ThreadWithMutexAndConditionVariable V8_FINAL : public Thread { public: ThreadWithMutexAndConditionVariable() - : Thread("ThreadWithMutexAndConditionVariable"), - running_(false), finished_(false) {} + : Thread(Options("ThreadWithMutexAndConditionVariable")), + running_(false), + finished_(false) {} virtual ~ThreadWithMutexAndConditionVariable() {} virtual void Run() V8_OVERRIDE { @@ -110,8 +111,11 @@ namespace { class ThreadWithSharedMutexAndConditionVariable V8_FINAL : public Thread { public: ThreadWithSharedMutexAndConditionVariable() - : Thread("ThreadWithSharedMutexAndConditionVariable"), - running_(false), finished_(false), cv_(NULL), mutex_(NULL) {} + : Thread(Options("ThreadWithSharedMutexAndConditionVariable")), + running_(false), + finished_(false), + cv_(NULL), + mutex_(NULL) {} virtual ~ThreadWithSharedMutexAndConditionVariable() {} virtual void Run() V8_OVERRIDE { @@ -216,14 +220,15 @@ namespace { class LoopIncrementThread V8_FINAL : public Thread { public: - LoopIncrementThread(int rem, - int* counter, - int limit, - int thread_count, - ConditionVariable* cv, - Mutex* mutex) - : Thread("LoopIncrementThread"), rem_(rem), counter_(counter), - limit_(limit), thread_count_(thread_count), cv_(cv), mutex_(mutex) { + LoopIncrementThread(int rem, int* counter, int limit, int thread_count, + ConditionVariable* cv, Mutex* mutex) + : Thread(Options("LoopIncrementThread")), + rem_(rem), + counter_(counter), + limit_(limit), + thread_count_(thread_count), + cv_(cv), + mutex_(mutex) { EXPECT_LT(rem, thread_count); EXPECT_EQ(0, limit % thread_count); } diff --git a/test/base-unittests/platform/platform-unittest.cc b/test/base-unittests/platform/platform-unittest.cc index 8a99af043..3530ff807 100644 --- a/test/base-unittests/platform/platform-unittest.cc +++ b/test/base-unittests/platform/platform-unittest.cc @@ -37,7 +37,7 @@ namespace { class SelfJoinThread V8_FINAL : public Thread { public: - SelfJoinThread() : Thread("SelfJoinThread") {} + SelfJoinThread() : Thread(Options("SelfJoinThread")) {} virtual void Run() V8_OVERRIDE { Join(); } }; @@ -55,7 +55,7 @@ namespace { class ThreadLocalStorageTest : public Thread, public ::testing::Test { public: - ThreadLocalStorageTest() : Thread("ThreadLocalStorageTest") { + ThreadLocalStorageTest() : Thread(Options("ThreadLocalStorageTest")) { for (size_t i = 0; i < ARRAY_SIZE(keys_); ++i) { keys_[i] = Thread::CreateThreadLocalKey(); } diff --git a/test/cctest/cctest.h b/test/cctest/cctest.h index 1a9abf8a2..2ab973c52 100644 --- a/test/cctest/cctest.h +++ b/test/cctest/cctest.h @@ -209,11 +209,10 @@ class ApiTestFuzzer: public v8::base::Thread { private: explicit ApiTestFuzzer(int num) - : Thread("ApiTestFuzzer"), + : Thread(Options("ApiTestFuzzer")), test_number_(num), gate_(0), - active_(true) { - } + active_(true) {} ~ApiTestFuzzer() {} static bool fuzzing_; diff --git a/test/cctest/compiler/test-instruction.cc b/test/cctest/compiler/test-instruction.cc index ef44b3100..bc9f4c772 100644 --- a/test/cctest/compiler/test-instruction.cc +++ b/test/cctest/compiler/test-instruction.cc @@ -25,7 +25,7 @@ typedef v8::internal::compiler::InstructionSequence TestInstrSeq; // A testing helper for the register code abstraction. class InstructionTester : public HandleAndZoneScope { public: // We're all friends here. - explicit InstructionTester() + InstructionTester() : isolate(main_isolate()), graph(zone()), schedule(zone()), diff --git a/test/cctest/compiler/test-simplified-lowering.cc b/test/cctest/compiler/test-simplified-lowering.cc index af4d2d09d..621019815 100644 --- a/test/cctest/compiler/test-simplified-lowering.cc +++ b/test/cctest/compiler/test-simplified-lowering.cc @@ -614,7 +614,7 @@ class TestingGraph : public HandleAndZoneScope, public GraphAndBuilders { Node* end; Node* ret; - TestingGraph(Type* p0_type, Type* p1_type = Type::None()) + explicit TestingGraph(Type* p0_type, Type* p1_type = Type::None()) : GraphAndBuilders(main_zone()), typer(main_zone()), jsgraph(graph(), common(), &typer) { diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc index 45c5d467d..9ddc9db71 100644 --- a/test/cctest/test-api.cc +++ b/test/cctest/test-api.cc @@ -409,7 +409,8 @@ THREADED_TEST(Script) { class TestResource: public String::ExternalStringResource { public: - TestResource(uint16_t* data, int* counter = NULL, bool owning_data = true) + explicit TestResource(uint16_t* data, int* counter = NULL, + bool owning_data = true) : data_(data), length_(0), counter_(counter), owning_data_(owning_data) { while (data[length_]) ++length_; } @@ -437,11 +438,12 @@ class TestResource: public String::ExternalStringResource { class TestAsciiResource: public String::ExternalAsciiStringResource { public: - TestAsciiResource(const char* data, int* counter = NULL, size_t offset = 0) + explicit TestAsciiResource(const char* data, int* counter = NULL, + size_t offset = 0) : orig_data_(data), data_(data + offset), length_(strlen(data) - offset), - counter_(counter) { } + counter_(counter) {} ~TestAsciiResource() { i::DeleteArray(orig_data_); @@ -15158,7 +15160,7 @@ struct RegExpInterruptionData { class RegExpInterruptionThread : public v8::base::Thread { public: explicit RegExpInterruptionThread(v8::Isolate* isolate) - : Thread("TimeoutThread"), isolate_(isolate) {} + : Thread(Options("TimeoutThread")), isolate_(isolate) {} virtual void Run() { for (regexp_interruption_data.loop_count = 0; @@ -19366,10 +19368,10 @@ static int CalcFibonacci(v8::Isolate* isolate, int limit) { class IsolateThread : public v8::base::Thread { public: IsolateThread(v8::Isolate* isolate, int fib_limit) - : Thread("IsolateThread"), + : Thread(Options("IsolateThread")), isolate_(isolate), fib_limit_(fib_limit), - result_(0) { } + result_(0) {} void Run() { result_ = CalcFibonacci(isolate_, fib_limit_); @@ -19448,9 +19450,9 @@ class InitDefaultIsolateThread : public v8::base::Thread { }; explicit InitDefaultIsolateThread(TestCase testCase) - : Thread("InitDefaultIsolateThread"), + : Thread(Options("InitDefaultIsolateThread")), testCase_(testCase), - result_(false) { } + result_(false) {} void Run() { v8::Isolate* isolate = v8::Isolate::New(); @@ -21508,7 +21510,7 @@ class ThreadInterruptTest { class InterruptThread : public v8::base::Thread { public: explicit InterruptThread(ThreadInterruptTest* test) - : Thread("InterruptThread"), test_(test) {} + : Thread(Options("InterruptThread")), test_(test) {} virtual void Run() { struct sigaction action; @@ -21916,7 +21918,7 @@ class RequestInterruptTestBaseWithSimpleInterrupt class InterruptThread : public v8::base::Thread { public: explicit InterruptThread(RequestInterruptTestBase* test) - : Thread("RequestInterruptTest"), test_(test) {} + : Thread(Options("RequestInterruptTest")), test_(test) {} virtual void Run() { test_->sem_.Wait(); @@ -22136,7 +22138,7 @@ class ClearInterruptFromAnotherThread class InterruptThread : public v8::base::Thread { public: explicit InterruptThread(ClearInterruptFromAnotherThread* test) - : Thread("RequestInterruptTest"), test_(test) {} + : Thread(Options("RequestInterruptTest")), test_(test) {} virtual void Run() { test_->sem_.Wait(); diff --git a/test/cctest/test-circular-queue.cc b/test/cctest/test-circular-queue.cc index 83b85c316..736a9b7c8 100644 --- a/test/cctest/test-circular-queue.cc +++ b/test/cctest/test-circular-queue.cc @@ -105,15 +105,13 @@ typedef SamplingCircularQueue TestSampleQueue; class ProducerThread: public v8::base::Thread { public: - ProducerThread(TestSampleQueue* scq, - int records_per_chunk, - Record value, + ProducerThread(TestSampleQueue* scq, int records_per_chunk, Record value, v8::base::Semaphore* finished) - : Thread("producer"), + : Thread(Options("producer")), scq_(scq), records_per_chunk_(records_per_chunk), value_(value), - finished_(finished) { } + finished_(finished) {} virtual void Run() { for (Record i = value_; i < value_ + records_per_chunk_; ++i) { diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc index 6623a3ed9..5c0b0f392 100644 --- a/test/cctest/test-debug.cc +++ b/test/cctest/test-debug.cc @@ -4848,7 +4848,7 @@ Barriers message_queue_barriers; class MessageQueueDebuggerThread : public v8::base::Thread { public: MessageQueueDebuggerThread() - : Thread("MessageQueueDebuggerThread") { } + : Thread(Options("MessageQueueDebuggerThread")) {} void Run(); }; @@ -5104,13 +5104,13 @@ Barriers threaded_debugging_barriers; class V8Thread : public v8::base::Thread { public: - V8Thread() : Thread("V8Thread") { } + V8Thread() : Thread(Options("V8Thread")) {} void Run(); }; class DebuggerThread : public v8::base::Thread { public: - DebuggerThread() : Thread("DebuggerThread") { } + DebuggerThread() : Thread(Options("DebuggerThread")) {} void Run(); }; @@ -5216,14 +5216,14 @@ TEST(ThreadedDebugging) { class BreakpointsV8Thread : public v8::base::Thread { public: - BreakpointsV8Thread() : Thread("BreakpointsV8Thread") { } + BreakpointsV8Thread() : Thread(Options("BreakpointsV8Thread")) {} void Run(); }; class BreakpointsDebuggerThread : public v8::base::Thread { public: explicit BreakpointsDebuggerThread(bool global_evaluate) - : Thread("BreakpointsDebuggerThread"), + : Thread(Options("BreakpointsDebuggerThread")), global_evaluate_(global_evaluate) {} void Run(); @@ -6525,9 +6525,9 @@ TEST(ProcessDebugMessages) { class SendCommandThread : public v8::base::Thread { public: explicit SendCommandThread(v8::Isolate* isolate) - : Thread("SendCommandThread"), + : Thread(Options("SendCommandThread")), semaphore_(0), - isolate_(isolate) { } + isolate_(isolate) {} static void ProcessDebugMessages(v8::Isolate* isolate, void* data) { v8::Debug::ProcessDebugMessages(); @@ -7379,8 +7379,8 @@ static void DebugBreakTriggerTerminate( class TerminationThread : public v8::base::Thread { public: - explicit TerminationThread(v8::Isolate* isolate) : Thread("terminator"), - isolate_(isolate) { } + explicit TerminationThread(v8::Isolate* isolate) + : Thread(Options("terminator")), isolate_(isolate) {} virtual void Run() { terminate_requested_semaphore.Wait(); diff --git a/test/cctest/test-declarative-accessors.cc b/test/cctest/test-declarative-accessors.cc index 7b2170db6..8d93245eb 100644 --- a/test/cctest/test-declarative-accessors.cc +++ b/test/cctest/test-declarative-accessors.cc @@ -37,7 +37,7 @@ using namespace v8::internal; class HandleArray : public Malloced { public: static const unsigned kArraySize = 200; - explicit HandleArray() {} + HandleArray() {} ~HandleArray() { Reset(); } void Reset() { for (unsigned i = 0; i < kArraySize; i++) { diff --git a/test/cctest/test-libplatform.h b/test/cctest/test-libplatform.h index 7d0e352b9..67147f33e 100644 --- a/test/cctest/test-libplatform.h +++ b/test/cctest/test-libplatform.h @@ -97,7 +97,9 @@ class TestTask : public v8::Task { class TestWorkerThread : public v8::base::Thread { public: explicit TestWorkerThread(v8::Task* task) - : Thread("libplatform TestWorkerThread"), semaphore_(0), task_(task) {} + : Thread(Options("libplatform TestWorkerThread")), + semaphore_(0), + task_(task) {} virtual ~TestWorkerThread() {} void Signal() { semaphore_.Signal(); } diff --git a/test/cctest/test-lockers.cc b/test/cctest/test-lockers.cc index b3cf679a4..ed315cea3 100644 --- a/test/cctest/test-lockers.cc +++ b/test/cctest/test-lockers.cc @@ -59,7 +59,7 @@ using ::v8::V8; class KangarooThread : public v8::base::Thread { public: KangarooThread(v8::Isolate* isolate, v8::Handle context) - : Thread("KangarooThread"), + : Thread(Options("KangarooThread")), isolate_(isolate), context_(isolate, context) {} @@ -149,9 +149,8 @@ class JoinableThread { class ThreadWithSemaphore : public v8::base::Thread { public: explicit ThreadWithSemaphore(JoinableThread* joinable_thread) - : Thread(joinable_thread->name_), - joinable_thread_(joinable_thread) { - } + : Thread(Options(joinable_thread->name_)), + joinable_thread_(joinable_thread) {} virtual void Run() { joinable_thread_->Run(); @@ -223,9 +222,7 @@ TEST(IsolateLockingStress) { class IsolateNonlockingThread : public JoinableThread { public: - explicit IsolateNonlockingThread() - : JoinableThread("IsolateNonlockingThread") { - } + IsolateNonlockingThread() : JoinableThread("IsolateNonlockingThread") {} virtual void Run() { v8::Isolate* isolate = v8::Isolate::New(); diff --git a/test/cctest/test-semaphore.cc b/test/cctest/test-semaphore.cc index 3a8a3a1b8..c7fca519d 100644 --- a/test/cctest/test-semaphore.cc +++ b/test/cctest/test-semaphore.cc @@ -39,7 +39,7 @@ using namespace ::v8::internal; class WaitAndSignalThread V8_FINAL : public v8::base::Thread { public: explicit WaitAndSignalThread(v8::base::Semaphore* semaphore) - : Thread("WaitAndSignalThread"), semaphore_(semaphore) {} + : Thread(Options("WaitAndSignalThread")), semaphore_(semaphore) {} virtual ~WaitAndSignalThread() {} virtual void Run() V8_OVERRIDE { @@ -117,7 +117,7 @@ static v8::base::Semaphore used_space(0); class ProducerThread V8_FINAL : public v8::base::Thread { public: - ProducerThread() : Thread("ProducerThread") {} + ProducerThread() : Thread(Options("ProducerThread")) {} virtual ~ProducerThread() {} virtual void Run() V8_OVERRIDE { @@ -132,7 +132,7 @@ class ProducerThread V8_FINAL : public v8::base::Thread { class ConsumerThread V8_FINAL : public v8::base::Thread { public: - ConsumerThread() : Thread("ConsumerThread") {} + ConsumerThread() : Thread(Options("ConsumerThread")) {} virtual ~ConsumerThread() {} virtual void Run() V8_OVERRIDE { diff --git a/test/cctest/test-thread-termination.cc b/test/cctest/test-thread-termination.cc index 06b077d4b..a5ed7ab9b 100644 --- a/test/cctest/test-thread-termination.cc +++ b/test/cctest/test-thread-termination.cc @@ -162,8 +162,8 @@ TEST(TerminateOnlyV8ThreadFromThreadItselfNoLoop) { class TerminatorThread : public v8::base::Thread { public: explicit TerminatorThread(i::Isolate* isolate) - : Thread("TerminatorThread"), - isolate_(reinterpret_cast(isolate)) { } + : Thread(Options("TerminatorThread")), + isolate_(reinterpret_cast(isolate)) {} void Run() { semaphore->Wait(); CHECK(!v8::V8::IsExecutionTerminating(isolate_)); diff --git a/test/cctest/test-threads.cc b/test/cctest/test-threads.cc index f1f7443e3..12042261f 100644 --- a/test/cctest/test-threads.cc +++ b/test/cctest/test-threads.cc @@ -44,7 +44,7 @@ static Turn turn = FILL_CACHE; class ThreadA : public v8::base::Thread { public: - ThreadA() : Thread("ThreadA") { } + ThreadA() : Thread(Options("ThreadA")) {} void Run() { v8::Isolate* isolate = CcTest::isolate(); v8::Locker locker(isolate); @@ -84,7 +84,7 @@ class ThreadA : public v8::base::Thread { class ThreadB : public v8::base::Thread { public: - ThreadB() : Thread("ThreadB") { } + ThreadB() : Thread(Options("ThreadB")) {} void Run() { do { { @@ -125,13 +125,13 @@ TEST(JSFunctionResultCachesInTwoThreads) { class ThreadIdValidationThread : public v8::base::Thread { public: ThreadIdValidationThread(v8::base::Thread* thread_to_start, - i::List* refs, - unsigned int thread_no, + i::List* refs, unsigned int thread_no, v8::base::Semaphore* semaphore) - : Thread("ThreadRefValidationThread"), - refs_(refs), thread_no_(thread_no), thread_to_start_(thread_to_start), - semaphore_(semaphore) { - } + : Thread(Options("ThreadRefValidationThread")), + refs_(refs), + thread_no_(thread_no), + thread_to_start_(thread_to_start), + semaphore_(semaphore) {} void Run() { i::ThreadId thread_id = i::ThreadId::Current(); -- cgit v1.2.3 From 544132d652545252a948a0eb55aed7c39e868dce Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Mon, 18 Aug 2014 12:16:05 +0000 Subject: Disable handle zapping on 3.28 branch BUG=318206 LOG=y R=yangguo@chromium.org Review URL: https://codereview.chromium.org/480043002 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@23153 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- build/features.gypi | 2 +- src/version.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/features.gypi b/build/features.gypi index 7ce66e4c9..8201ea9ea 100644 --- a/build/features.gypi +++ b/build/features.gypi @@ -115,7 +115,7 @@ 'Release': { 'variables': { 'v8_enable_extra_checks%': 0, - 'v8_enable_handle_zapping%': 1, + 'v8_enable_handle_zapping%': 0, }, 'conditions': [ ['v8_enable_extra_checks==1', { diff --git a/src/version.cc b/src/version.cc index 614ca2006..5515be1df 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 28 #define BUILD_NUMBER 71 -#define PATCH_LEVEL 3 +#define PATCH_LEVEL 4 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- cgit v1.2.3 From 4e9dcd01723d2aa29cbc3db41ef805874fc246ce Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Mon, 18 Aug 2014 12:30:21 +0000 Subject: Fix invalid ASSERT on 3.27 branch R=verwaest@chromium.org Review URL: https://codereview.chromium.org/483603005 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@23154 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/objects.cc | 4 ++-- src/version.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/objects.cc b/src/objects.cc index 5b5d79174..92bce62d4 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -6784,8 +6784,8 @@ bool JSObject::DefineFastAccessor(Handle object, ASSERT(target->NumberOfOwnDescriptors() == object->map()->NumberOfOwnDescriptors()); // This works since descriptors are sorted in order of addition. - ASSERT(object->map()->instance_descriptors()-> - GetKey(descriptor_number) == *name); + ASSERT(Name::Equals(handle(object->map()->instance_descriptors()-> + GetKey(descriptor_number)), name)); return TryAccessorTransition(object, target, descriptor_number, component, accessor, attributes); } diff --git a/src/version.cc b/src/version.cc index 1d8adfec9..d1ebf16af 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 12 +#define PATCH_LEVEL 13 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- cgit v1.2.3 From 14b092be52bd160007e9b57fa6692f5093d071c4 Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Mon, 18 Aug 2014 13:07:39 +0000 Subject: Version 3.27.34.14 (merged r23084) Old space cannot be assumed to be iterable between GCs, even if swept precisely. R=hpayer@chromium.org BUG= Review URL: https://codereview.chromium.org/486693002 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@23158 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mark-compact.cc | 15 +++++---------- src/version.cc | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/mark-compact.cc b/src/mark-compact.cc index 61b1b54c7..30b97550c 100644 --- a/src/mark-compact.cc +++ b/src/mark-compact.cc @@ -2042,16 +2042,11 @@ int MarkCompactCollector::DiscoverAndPromoteBlackObjectsOnPage( static void DiscoverGreyObjectsInSpace(Heap* heap, MarkingDeque* marking_deque, PagedSpace* space) { - if (!space->was_swept_conservatively()) { - HeapObjectIterator it(space); - DiscoverGreyObjectsWithIterator(heap, marking_deque, &it); - } else { - PageIterator it(space); - while (it.has_next()) { - Page* p = it.next(); - DiscoverGreyObjectsOnPage(marking_deque, p); - if (marking_deque->IsFull()) return; - } + PageIterator it(space); + while (it.has_next()) { + Page* p = it.next(); + DiscoverGreyObjectsOnPage(marking_deque, p); + if (marking_deque->IsFull()) return; } } diff --git a/src/version.cc b/src/version.cc index d1ebf16af..d6c513555 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 13 +#define PATCH_LEVEL 14 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- cgit v1.2.3 From 4b64eaba615dd328f1d837b18e7cd1b34897409e Mon Sep 17 00:00:00 2001 From: Dehao Chen Date: Thu, 7 Aug 2014 15:21:42 -0700 Subject: Add LOCAL_FDO_SUPPORT to v8. Change-Id: Iac34d6acdba3217204e77668d677145f66793e01 --- build/toolchain.gypi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/toolchain.gypi b/build/toolchain.gypi index 6b421cad5..d91bcb749 100644 --- a/build/toolchain.gypi +++ b/build/toolchain.gypi @@ -472,6 +472,9 @@ 'cflags': [ '<(m32flag)' ], 'ldflags': [ '<(m32flag)' ], }], + ['OS=="android"', { + 'android_enable_fdo': 1, + }], ], 'xcode_settings': { 'ARCHS': [ 'i386' ], @@ -500,6 +503,9 @@ 'cflags': [ '<(m64flag)' ], 'ldflags': [ '<(m64flag)' ], }], + ['OS=="android"', { + 'android_enable_fdo': 1, + }], ], }] ], -- cgit v1.2.3 From 8e6b6de2b0230c99212993c460bbeed9342bee30 Mon Sep 17 00:00:00 2001 From: Dehao Chen Date: Wed, 20 Aug 2014 15:44:55 -0700 Subject: Update mk file for v8 to enable FDO. Change-Id: Id82e27990713bdb0ecda607a3cbc5f3e4417c00e --- tools/gyp/mksnapshot.host.darwin-arm.mk | 5 +++++ tools/gyp/mksnapshot.host.darwin-arm64.mk | 5 +++++ tools/gyp/mksnapshot.host.darwin-mips.mk | 5 +++++ tools/gyp/mksnapshot.host.darwin-x86.mk | 5 +++++ tools/gyp/mksnapshot.host.darwin-x86_64.mk | 5 +++++ tools/gyp/mksnapshot.host.linux-arm.mk | 5 +++++ tools/gyp/mksnapshot.host.linux-arm64.mk | 5 +++++ tools/gyp/mksnapshot.host.linux-mips.mk | 5 +++++ tools/gyp/mksnapshot.host.linux-x86.mk | 5 +++++ tools/gyp/mksnapshot.host.linux-x86_64.mk | 5 +++++ tools/gyp/v8_base.host.darwin-arm.mk | 5 +++++ tools/gyp/v8_base.host.darwin-arm64.mk | 5 +++++ tools/gyp/v8_base.host.darwin-mips.mk | 5 +++++ tools/gyp/v8_base.host.darwin-x86.mk | 5 +++++ tools/gyp/v8_base.host.darwin-x86_64.mk | 5 +++++ tools/gyp/v8_base.host.linux-arm.mk | 5 +++++ tools/gyp/v8_base.host.linux-arm64.mk | 5 +++++ tools/gyp/v8_base.host.linux-mips.mk | 5 +++++ tools/gyp/v8_base.host.linux-x86.mk | 5 +++++ tools/gyp/v8_base.host.linux-x86_64.mk | 5 +++++ tools/gyp/v8_base.target.darwin-arm.mk | 5 +++++ tools/gyp/v8_base.target.darwin-arm64.mk | 5 +++++ tools/gyp/v8_base.target.darwin-mips.mk | 5 +++++ tools/gyp/v8_base.target.darwin-x86.mk | 5 +++++ tools/gyp/v8_base.target.darwin-x86_64.mk | 5 +++++ tools/gyp/v8_base.target.linux-arm.mk | 5 +++++ tools/gyp/v8_base.target.linux-arm64.mk | 5 +++++ tools/gyp/v8_base.target.linux-mips.mk | 5 +++++ tools/gyp/v8_base.target.linux-x86.mk | 5 +++++ tools/gyp/v8_base.target.linux-x86_64.mk | 5 +++++ tools/gyp/v8_libbase.host.darwin-arm.mk | 5 +++++ tools/gyp/v8_libbase.host.darwin-arm64.mk | 5 +++++ tools/gyp/v8_libbase.host.darwin-mips.mk | 5 +++++ tools/gyp/v8_libbase.host.darwin-x86.mk | 5 +++++ tools/gyp/v8_libbase.host.darwin-x86_64.mk | 5 +++++ tools/gyp/v8_libbase.host.linux-arm.mk | 5 +++++ tools/gyp/v8_libbase.host.linux-arm64.mk | 5 +++++ tools/gyp/v8_libbase.host.linux-mips.mk | 5 +++++ tools/gyp/v8_libbase.host.linux-x86.mk | 5 +++++ tools/gyp/v8_libbase.host.linux-x86_64.mk | 5 +++++ tools/gyp/v8_libbase.target.darwin-arm.mk | 5 +++++ tools/gyp/v8_libbase.target.darwin-arm64.mk | 5 +++++ tools/gyp/v8_libbase.target.darwin-mips.mk | 5 +++++ tools/gyp/v8_libbase.target.darwin-x86.mk | 5 +++++ tools/gyp/v8_libbase.target.darwin-x86_64.mk | 5 +++++ tools/gyp/v8_libbase.target.linux-arm.mk | 5 +++++ tools/gyp/v8_libbase.target.linux-arm64.mk | 5 +++++ tools/gyp/v8_libbase.target.linux-mips.mk | 5 +++++ tools/gyp/v8_libbase.target.linux-x86.mk | 5 +++++ tools/gyp/v8_libbase.target.linux-x86_64.mk | 5 +++++ tools/gyp/v8_nosnapshot.host.darwin-arm.mk | 5 +++++ tools/gyp/v8_nosnapshot.host.darwin-arm64.mk | 5 +++++ tools/gyp/v8_nosnapshot.host.darwin-mips.mk | 5 +++++ tools/gyp/v8_nosnapshot.host.darwin-x86.mk | 5 +++++ tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk | 5 +++++ tools/gyp/v8_nosnapshot.host.linux-arm.mk | 5 +++++ tools/gyp/v8_nosnapshot.host.linux-arm64.mk | 5 +++++ tools/gyp/v8_nosnapshot.host.linux-mips.mk | 5 +++++ tools/gyp/v8_nosnapshot.host.linux-x86.mk | 5 +++++ tools/gyp/v8_nosnapshot.host.linux-x86_64.mk | 5 +++++ tools/gyp/v8_snapshot.target.darwin-arm.mk | 5 +++++ tools/gyp/v8_snapshot.target.darwin-arm64.mk | 5 +++++ tools/gyp/v8_snapshot.target.darwin-mips.mk | 5 +++++ tools/gyp/v8_snapshot.target.darwin-x86.mk | 5 +++++ tools/gyp/v8_snapshot.target.darwin-x86_64.mk | 5 +++++ tools/gyp/v8_snapshot.target.linux-arm.mk | 5 +++++ tools/gyp/v8_snapshot.target.linux-arm64.mk | 5 +++++ tools/gyp/v8_snapshot.target.linux-mips.mk | 5 +++++ tools/gyp/v8_snapshot.target.linux-x86.mk | 5 +++++ tools/gyp/v8_snapshot.target.linux-x86_64.mk | 5 +++++ 70 files changed, 350 insertions(+) diff --git a/tools/gyp/mksnapshot.host.darwin-arm.mk b/tools/gyp/mksnapshot.host.darwin-arm.mk index 1364b2f84..e8911b32e 100644 --- a/tools/gyp/mksnapshot.host.darwin-arm.mk +++ b/tools/gyp/mksnapshot.host.darwin-arm.mk @@ -113,6 +113,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -185,7 +187,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/mksnapshot.host.darwin-arm64.mk b/tools/gyp/mksnapshot.host.darwin-arm64.mk index 012194e9e..99b5a7aea 100644 --- a/tools/gyp/mksnapshot.host.darwin-arm64.mk +++ b/tools/gyp/mksnapshot.host.darwin-arm64.mk @@ -110,6 +110,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -179,7 +181,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/mksnapshot.host.darwin-mips.mk b/tools/gyp/mksnapshot.host.darwin-mips.mk index eb9c2a03e..d07116fc9 100644 --- a/tools/gyp/mksnapshot.host.darwin-mips.mk +++ b/tools/gyp/mksnapshot.host.darwin-mips.mk @@ -115,6 +115,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -189,7 +191,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/mksnapshot.host.darwin-x86.mk b/tools/gyp/mksnapshot.host.darwin-x86.mk index b93eb275a..d1aa85f99 100644 --- a/tools/gyp/mksnapshot.host.darwin-x86.mk +++ b/tools/gyp/mksnapshot.host.darwin-x86.mk @@ -111,6 +111,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -181,7 +183,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/mksnapshot.host.darwin-x86_64.mk b/tools/gyp/mksnapshot.host.darwin-x86_64.mk index 3aefdd6aa..61180909e 100644 --- a/tools/gyp/mksnapshot.host.darwin-x86_64.mk +++ b/tools/gyp/mksnapshot.host.darwin-x86_64.mk @@ -111,6 +111,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -181,7 +183,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/mksnapshot.host.linux-arm.mk b/tools/gyp/mksnapshot.host.linux-arm.mk index c393a00de..0076b9b07 100644 --- a/tools/gyp/mksnapshot.host.linux-arm.mk +++ b/tools/gyp/mksnapshot.host.linux-arm.mk @@ -114,6 +114,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -187,7 +189,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/mksnapshot.host.linux-arm64.mk b/tools/gyp/mksnapshot.host.linux-arm64.mk index e6223af4e..49c56d784 100644 --- a/tools/gyp/mksnapshot.host.linux-arm64.mk +++ b/tools/gyp/mksnapshot.host.linux-arm64.mk @@ -111,6 +111,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -181,7 +183,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/mksnapshot.host.linux-mips.mk b/tools/gyp/mksnapshot.host.linux-mips.mk index 19904df26..881e249f6 100644 --- a/tools/gyp/mksnapshot.host.linux-mips.mk +++ b/tools/gyp/mksnapshot.host.linux-mips.mk @@ -116,6 +116,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -191,7 +193,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/mksnapshot.host.linux-x86.mk b/tools/gyp/mksnapshot.host.linux-x86.mk index 8f7044431..a2eace439 100644 --- a/tools/gyp/mksnapshot.host.linux-x86.mk +++ b/tools/gyp/mksnapshot.host.linux-x86.mk @@ -112,6 +112,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -183,7 +185,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/mksnapshot.host.linux-x86_64.mk b/tools/gyp/mksnapshot.host.linux-x86_64.mk index ddb827a5c..4185769ba 100644 --- a/tools/gyp/mksnapshot.host.linux-x86_64.mk +++ b/tools/gyp/mksnapshot.host.linux-x86_64.mk @@ -112,6 +112,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -183,7 +185,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_base.host.darwin-arm.mk b/tools/gyp/v8_base.host.darwin-arm.mk index d884d8497..5ef2410e6 100644 --- a/tools/gyp/v8_base.host.darwin-arm.mk +++ b/tools/gyp/v8_base.host.darwin-arm.mk @@ -280,6 +280,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -358,7 +360,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_base.host.darwin-arm64.mk b/tools/gyp/v8_base.host.darwin-arm64.mk index 0aa1477af..9b8d1833e 100644 --- a/tools/gyp/v8_base.host.darwin-arm64.mk +++ b/tools/gyp/v8_base.host.darwin-arm64.mk @@ -280,6 +280,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -355,7 +357,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_base.host.darwin-mips.mk b/tools/gyp/v8_base.host.darwin-mips.mk index 9fe0e393f..1c3dfa522 100644 --- a/tools/gyp/v8_base.host.darwin-mips.mk +++ b/tools/gyp/v8_base.host.darwin-mips.mk @@ -282,6 +282,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -362,7 +364,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_base.host.darwin-x86.mk b/tools/gyp/v8_base.host.darwin-x86.mk index a3de46d22..fea0a64d7 100644 --- a/tools/gyp/v8_base.host.darwin-x86.mk +++ b/tools/gyp/v8_base.host.darwin-x86.mk @@ -276,6 +276,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -352,7 +354,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_base.host.darwin-x86_64.mk b/tools/gyp/v8_base.host.darwin-x86_64.mk index 94f88e080..6d98cf22e 100644 --- a/tools/gyp/v8_base.host.darwin-x86_64.mk +++ b/tools/gyp/v8_base.host.darwin-x86_64.mk @@ -276,6 +276,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -352,7 +354,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_base.host.linux-arm.mk b/tools/gyp/v8_base.host.linux-arm.mk index 5689f5b07..d55d446c1 100644 --- a/tools/gyp/v8_base.host.linux-arm.mk +++ b/tools/gyp/v8_base.host.linux-arm.mk @@ -282,6 +282,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -362,7 +364,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_base.host.linux-arm64.mk b/tools/gyp/v8_base.host.linux-arm64.mk index 21050ec9f..3d5cff37a 100644 --- a/tools/gyp/v8_base.host.linux-arm64.mk +++ b/tools/gyp/v8_base.host.linux-arm64.mk @@ -282,6 +282,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -359,7 +361,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_base.host.linux-mips.mk b/tools/gyp/v8_base.host.linux-mips.mk index bf538431e..a72576c1c 100644 --- a/tools/gyp/v8_base.host.linux-mips.mk +++ b/tools/gyp/v8_base.host.linux-mips.mk @@ -284,6 +284,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -366,7 +368,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_base.host.linux-x86.mk b/tools/gyp/v8_base.host.linux-x86.mk index ef4c95960..32049d054 100644 --- a/tools/gyp/v8_base.host.linux-x86.mk +++ b/tools/gyp/v8_base.host.linux-x86.mk @@ -278,6 +278,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -356,7 +358,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_base.host.linux-x86_64.mk b/tools/gyp/v8_base.host.linux-x86_64.mk index d1854ced4..938069d8e 100644 --- a/tools/gyp/v8_base.host.linux-x86_64.mk +++ b/tools/gyp/v8_base.host.linux-x86_64.mk @@ -278,6 +278,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -356,7 +358,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_base.target.darwin-arm.mk b/tools/gyp/v8_base.target.darwin-arm.mk index b398bf062..1f8587b76 100644 --- a/tools/gyp/v8_base.target.darwin-arm.mk +++ b/tools/gyp/v8_base.target.darwin-arm.mk @@ -317,6 +317,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -431,7 +433,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_base.target.darwin-arm64.mk b/tools/gyp/v8_base.target.darwin-arm64.mk index 57f8cd17b..21135fea7 100644 --- a/tools/gyp/v8_base.target.darwin-arm64.mk +++ b/tools/gyp/v8_base.target.darwin-arm64.mk @@ -306,6 +306,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -406,7 +408,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_base.target.darwin-mips.mk b/tools/gyp/v8_base.target.darwin-mips.mk index 9f20cd391..2bc88cc86 100644 --- a/tools/gyp/v8_base.target.darwin-mips.mk +++ b/tools/gyp/v8_base.target.darwin-mips.mk @@ -313,6 +313,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -423,7 +425,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_base.target.darwin-x86.mk b/tools/gyp/v8_base.target.darwin-x86.mk index 08454c157..8979eb547 100644 --- a/tools/gyp/v8_base.target.darwin-x86.mk +++ b/tools/gyp/v8_base.target.darwin-x86.mk @@ -307,6 +307,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -413,7 +415,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_base.target.darwin-x86_64.mk b/tools/gyp/v8_base.target.darwin-x86_64.mk index 2eca06df7..9eb56dcf1 100644 --- a/tools/gyp/v8_base.target.darwin-x86_64.mk +++ b/tools/gyp/v8_base.target.darwin-x86_64.mk @@ -306,6 +306,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -411,7 +413,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_base.target.linux-arm.mk b/tools/gyp/v8_base.target.linux-arm.mk index b398bf062..1f8587b76 100644 --- a/tools/gyp/v8_base.target.linux-arm.mk +++ b/tools/gyp/v8_base.target.linux-arm.mk @@ -317,6 +317,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -431,7 +433,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_base.target.linux-arm64.mk b/tools/gyp/v8_base.target.linux-arm64.mk index 57f8cd17b..21135fea7 100644 --- a/tools/gyp/v8_base.target.linux-arm64.mk +++ b/tools/gyp/v8_base.target.linux-arm64.mk @@ -306,6 +306,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -406,7 +408,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_base.target.linux-mips.mk b/tools/gyp/v8_base.target.linux-mips.mk index 9f20cd391..2bc88cc86 100644 --- a/tools/gyp/v8_base.target.linux-mips.mk +++ b/tools/gyp/v8_base.target.linux-mips.mk @@ -313,6 +313,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -423,7 +425,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_base.target.linux-x86.mk b/tools/gyp/v8_base.target.linux-x86.mk index 08454c157..8979eb547 100644 --- a/tools/gyp/v8_base.target.linux-x86.mk +++ b/tools/gyp/v8_base.target.linux-x86.mk @@ -307,6 +307,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -413,7 +415,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_base.target.linux-x86_64.mk b/tools/gyp/v8_base.target.linux-x86_64.mk index 2eca06df7..9eb56dcf1 100644 --- a/tools/gyp/v8_base.target.linux-x86_64.mk +++ b/tools/gyp/v8_base.target.linux-x86_64.mk @@ -306,6 +306,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -411,7 +413,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_libbase.host.darwin-arm.mk b/tools/gyp/v8_libbase.host.darwin-arm.mk index 573109323..c3e00507b 100644 --- a/tools/gyp/v8_libbase.host.darwin-arm.mk +++ b/tools/gyp/v8_libbase.host.darwin-arm.mk @@ -105,6 +105,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -177,7 +179,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_libbase.host.darwin-arm64.mk b/tools/gyp/v8_libbase.host.darwin-arm64.mk index 273920f2f..363a27175 100644 --- a/tools/gyp/v8_libbase.host.darwin-arm64.mk +++ b/tools/gyp/v8_libbase.host.darwin-arm64.mk @@ -102,6 +102,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -171,7 +173,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_libbase.host.darwin-mips.mk b/tools/gyp/v8_libbase.host.darwin-mips.mk index 92b85112b..9fa271940 100644 --- a/tools/gyp/v8_libbase.host.darwin-mips.mk +++ b/tools/gyp/v8_libbase.host.darwin-mips.mk @@ -107,6 +107,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -181,7 +183,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_libbase.host.darwin-x86.mk b/tools/gyp/v8_libbase.host.darwin-x86.mk index 38ec6b656..c44b2bc2e 100644 --- a/tools/gyp/v8_libbase.host.darwin-x86.mk +++ b/tools/gyp/v8_libbase.host.darwin-x86.mk @@ -103,6 +103,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -173,7 +175,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_libbase.host.darwin-x86_64.mk b/tools/gyp/v8_libbase.host.darwin-x86_64.mk index 29a5aff03..a562489f6 100644 --- a/tools/gyp/v8_libbase.host.darwin-x86_64.mk +++ b/tools/gyp/v8_libbase.host.darwin-x86_64.mk @@ -103,6 +103,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -173,7 +175,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_libbase.host.linux-arm.mk b/tools/gyp/v8_libbase.host.linux-arm.mk index b65517ea7..868e36312 100644 --- a/tools/gyp/v8_libbase.host.linux-arm.mk +++ b/tools/gyp/v8_libbase.host.linux-arm.mk @@ -106,6 +106,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -179,7 +181,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_libbase.host.linux-arm64.mk b/tools/gyp/v8_libbase.host.linux-arm64.mk index 9aa44970c..87b190a32 100644 --- a/tools/gyp/v8_libbase.host.linux-arm64.mk +++ b/tools/gyp/v8_libbase.host.linux-arm64.mk @@ -103,6 +103,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -173,7 +175,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_libbase.host.linux-mips.mk b/tools/gyp/v8_libbase.host.linux-mips.mk index 331e36e04..eaa6a9e0d 100644 --- a/tools/gyp/v8_libbase.host.linux-mips.mk +++ b/tools/gyp/v8_libbase.host.linux-mips.mk @@ -108,6 +108,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -183,7 +185,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_libbase.host.linux-x86.mk b/tools/gyp/v8_libbase.host.linux-x86.mk index 7dc39e719..fe47f4413 100644 --- a/tools/gyp/v8_libbase.host.linux-x86.mk +++ b/tools/gyp/v8_libbase.host.linux-x86.mk @@ -104,6 +104,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -175,7 +177,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_libbase.host.linux-x86_64.mk b/tools/gyp/v8_libbase.host.linux-x86_64.mk index 4f24e1f25..32d87e917 100644 --- a/tools/gyp/v8_libbase.host.linux-x86_64.mk +++ b/tools/gyp/v8_libbase.host.linux-x86_64.mk @@ -104,6 +104,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -175,7 +177,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_libbase.target.darwin-arm.mk b/tools/gyp/v8_libbase.target.darwin-arm.mk index 5a299a972..765407c95 100644 --- a/tools/gyp/v8_libbase.target.darwin-arm.mk +++ b/tools/gyp/v8_libbase.target.darwin-arm.mk @@ -139,6 +139,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -246,7 +248,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_libbase.target.darwin-arm64.mk b/tools/gyp/v8_libbase.target.darwin-arm64.mk index 00cfc57b5..bcc4e7bbe 100644 --- a/tools/gyp/v8_libbase.target.darwin-arm64.mk +++ b/tools/gyp/v8_libbase.target.darwin-arm64.mk @@ -125,6 +125,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -218,7 +220,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_libbase.target.darwin-mips.mk b/tools/gyp/v8_libbase.target.darwin-mips.mk index 289cc4614..cae2ffec4 100644 --- a/tools/gyp/v8_libbase.target.darwin-mips.mk +++ b/tools/gyp/v8_libbase.target.darwin-mips.mk @@ -135,6 +135,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -238,7 +240,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_libbase.target.darwin-x86.mk b/tools/gyp/v8_libbase.target.darwin-x86.mk index 59b0efefb..8ea8265b4 100644 --- a/tools/gyp/v8_libbase.target.darwin-x86.mk +++ b/tools/gyp/v8_libbase.target.darwin-x86.mk @@ -131,6 +131,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -230,7 +232,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_libbase.target.darwin-x86_64.mk b/tools/gyp/v8_libbase.target.darwin-x86_64.mk index 8fa4f94c5..e61707fd8 100644 --- a/tools/gyp/v8_libbase.target.darwin-x86_64.mk +++ b/tools/gyp/v8_libbase.target.darwin-x86_64.mk @@ -130,6 +130,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -228,7 +230,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_libbase.target.linux-arm.mk b/tools/gyp/v8_libbase.target.linux-arm.mk index 5a299a972..765407c95 100644 --- a/tools/gyp/v8_libbase.target.linux-arm.mk +++ b/tools/gyp/v8_libbase.target.linux-arm.mk @@ -139,6 +139,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -246,7 +248,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_libbase.target.linux-arm64.mk b/tools/gyp/v8_libbase.target.linux-arm64.mk index 00cfc57b5..bcc4e7bbe 100644 --- a/tools/gyp/v8_libbase.target.linux-arm64.mk +++ b/tools/gyp/v8_libbase.target.linux-arm64.mk @@ -125,6 +125,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -218,7 +220,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_libbase.target.linux-mips.mk b/tools/gyp/v8_libbase.target.linux-mips.mk index 289cc4614..cae2ffec4 100644 --- a/tools/gyp/v8_libbase.target.linux-mips.mk +++ b/tools/gyp/v8_libbase.target.linux-mips.mk @@ -135,6 +135,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -238,7 +240,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_libbase.target.linux-x86.mk b/tools/gyp/v8_libbase.target.linux-x86.mk index 59b0efefb..8ea8265b4 100644 --- a/tools/gyp/v8_libbase.target.linux-x86.mk +++ b/tools/gyp/v8_libbase.target.linux-x86.mk @@ -131,6 +131,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -230,7 +232,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_libbase.target.linux-x86_64.mk b/tools/gyp/v8_libbase.target.linux-x86_64.mk index 8fa4f94c5..e61707fd8 100644 --- a/tools/gyp/v8_libbase.target.linux-x86_64.mk +++ b/tools/gyp/v8_libbase.target.linux-x86_64.mk @@ -130,6 +130,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -228,7 +230,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk index 98d5f02f9..9153f361f 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk @@ -116,6 +116,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -188,7 +190,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk index ccd7d3e50..2a1632a86 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk @@ -113,6 +113,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -182,7 +184,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk index 9cb296779..20747f4d6 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk @@ -118,6 +118,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -192,7 +194,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk index 6ed73a02d..2877f0a7e 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk @@ -114,6 +114,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -184,7 +186,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk index a8991411b..a5f4dab7f 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk @@ -114,6 +114,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -184,7 +186,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm.mk b/tools/gyp/v8_nosnapshot.host.linux-arm.mk index ef16fa9dc..3c098dae6 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-arm.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-arm.mk @@ -117,6 +117,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -190,7 +192,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk index b5abe386c..374da70d2 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk @@ -114,6 +114,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -184,7 +186,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_nosnapshot.host.linux-mips.mk b/tools/gyp/v8_nosnapshot.host.linux-mips.mk index 079ffcbda..d0ddd73b3 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-mips.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-mips.mk @@ -119,6 +119,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -194,7 +196,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86.mk b/tools/gyp/v8_nosnapshot.host.linux-x86.mk index 243ceadb8..3c6867dcf 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-x86.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-x86.mk @@ -115,6 +115,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -186,7 +188,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk index 28dab34fd..2c9b2e6a1 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk @@ -115,6 +115,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -186,7 +188,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-deprecated +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) # Undefine ANDROID for host modules LOCAL_CFLAGS += -UANDROID LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) diff --git a/tools/gyp/v8_snapshot.target.darwin-arm.mk b/tools/gyp/v8_snapshot.target.darwin-arm.mk index 84270fa1b..c37827075 100644 --- a/tools/gyp/v8_snapshot.target.darwin-arm.mk +++ b/tools/gyp/v8_snapshot.target.darwin-arm.mk @@ -166,6 +166,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -275,7 +277,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_snapshot.target.darwin-arm64.mk b/tools/gyp/v8_snapshot.target.darwin-arm64.mk index c50ac9586..d3119a21a 100644 --- a/tools/gyp/v8_snapshot.target.darwin-arm64.mk +++ b/tools/gyp/v8_snapshot.target.darwin-arm64.mk @@ -152,6 +152,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -247,7 +249,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_snapshot.target.darwin-mips.mk b/tools/gyp/v8_snapshot.target.darwin-mips.mk index 6434ebb5e..7486f1313 100644 --- a/tools/gyp/v8_snapshot.target.darwin-mips.mk +++ b/tools/gyp/v8_snapshot.target.darwin-mips.mk @@ -162,6 +162,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -267,7 +269,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_snapshot.target.darwin-x86.mk b/tools/gyp/v8_snapshot.target.darwin-x86.mk index b8e085728..4cd81bffb 100644 --- a/tools/gyp/v8_snapshot.target.darwin-x86.mk +++ b/tools/gyp/v8_snapshot.target.darwin-x86.mk @@ -158,6 +158,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -259,7 +261,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk index e637f2222..a232826d2 100644 --- a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk +++ b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk @@ -157,6 +157,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -257,7 +259,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_snapshot.target.linux-arm.mk b/tools/gyp/v8_snapshot.target.linux-arm.mk index 84270fa1b..c37827075 100644 --- a/tools/gyp/v8_snapshot.target.linux-arm.mk +++ b/tools/gyp/v8_snapshot.target.linux-arm.mk @@ -166,6 +166,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -275,7 +277,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_snapshot.target.linux-arm64.mk b/tools/gyp/v8_snapshot.target.linux-arm64.mk index c50ac9586..d3119a21a 100644 --- a/tools/gyp/v8_snapshot.target.linux-arm64.mk +++ b/tools/gyp/v8_snapshot.target.linux-arm64.mk @@ -152,6 +152,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -247,7 +249,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_snapshot.target.linux-mips.mk b/tools/gyp/v8_snapshot.target.linux-mips.mk index 6434ebb5e..7486f1313 100644 --- a/tools/gyp/v8_snapshot.target.linux-mips.mk +++ b/tools/gyp/v8_snapshot.target.linux-mips.mk @@ -162,6 +162,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -267,7 +269,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_snapshot.target.linux-x86.mk b/tools/gyp/v8_snapshot.target.linux-x86.mk index b8e085728..4cd81bffb 100644 --- a/tools/gyp/v8_snapshot.target.linux-x86.mk +++ b/tools/gyp/v8_snapshot.target.linux-x86.mk @@ -158,6 +158,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -259,7 +261,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/tools/gyp/v8_snapshot.target.linux-x86_64.mk b/tools/gyp/v8_snapshot.target.linux-x86_64.mk index e637f2222..a232826d2 100644 --- a/tools/gyp/v8_snapshot.target.linux-x86_64.mk +++ b/tools/gyp/v8_snapshot.target.linux-x86_64.mk @@ -157,6 +157,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -257,7 +259,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := true + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -- cgit v1.2.3 From 0bb343f5ed1becef0996a234d5d7d431e60ef72a Mon Sep 17 00:00:00 2001 From: "verwaest@chromium.org" Date: Mon, 25 Aug 2014 19:05:32 +0000 Subject: Version 3.28.71.5 (merged r23129, r23114) Rewrite GetAccessor using the LookupIterator Fix pointer iteration for maps. R=danno@chromium.org BUG= Review URL: https://codereview.chromium.org/471433006 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@23373 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/heap/store-buffer.cc | 7 +++-- src/objects.cc | 71 ++++++++++++++++++++++++++++++------------------ src/version.cc | 2 +- test/cctest/test-heap.cc | 45 ++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 31 deletions(-) diff --git a/src/heap/store-buffer.cc b/src/heap/store-buffer.cc index b48e1a404..48e98a3de 100644 --- a/src/heap/store-buffer.cc +++ b/src/heap/store-buffer.cc @@ -486,10 +486,11 @@ void StoreBuffer::IteratePointersToNewSpace(ObjectSlotCallback slot_callback, heap_object = iterator.Next()) { // We skip free space objects. if (!heap_object->IsFiller()) { + DCHECK(heap_object->IsMap()); FindPointersToNewSpaceInRegion( - heap_object->address() + HeapObject::kHeaderSize, - heap_object->address() + heap_object->Size(), slot_callback, - clear_maps); + heap_object->address() + Map::kPointerFieldsBeginOffset, + heap_object->address() + Map::kPointerFieldsEndOffset, + slot_callback, clear_maps); } } } else { diff --git a/src/objects.cc b/src/objects.cc index aa9984000..b668916a5 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -6865,25 +6865,26 @@ MaybeHandle JSObject::GetAccessor(Handle object, // interceptor calls. AssertNoContextChange ncc(isolate); - // Check access rights if needed. - if (object->IsAccessCheckNeeded() && - !isolate->MayNamedAccess(object, name, v8::ACCESS_HAS)) { - isolate->ReportFailedAccessCheck(object, v8::ACCESS_HAS); - RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object); - return isolate->factory()->undefined_value(); - } - // Make the lookup and include prototypes. uint32_t index = 0; if (name->AsArrayIndex(&index)) { for (PrototypeIterator iter(isolate, object, PrototypeIterator::START_AT_RECEIVER); !iter.IsAtEnd(); iter.Advance()) { - if (PrototypeIterator::GetCurrent(iter)->IsJSObject() && - JSObject::cast(*PrototypeIterator::GetCurrent(iter)) - ->HasDictionaryElements()) { - JSObject* js_object = - JSObject::cast(*PrototypeIterator::GetCurrent(iter)); + Handle current = PrototypeIterator::GetCurrent(iter); + // Check access rights if needed. + if (current->IsAccessCheckNeeded() && + !isolate->MayNamedAccess(Handle::cast(current), name, + v8::ACCESS_HAS)) { + isolate->ReportFailedAccessCheck(Handle::cast(current), + v8::ACCESS_HAS); + RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object); + return isolate->factory()->undefined_value(); + } + + if (current->IsJSObject() && + Handle::cast(current)->HasDictionaryElements()) { + JSObject* js_object = JSObject::cast(*current); SeededNumberDictionary* dictionary = js_object->element_dictionary(); int entry = dictionary->FindEntry(index); if (entry != SeededNumberDictionary::kNotFound) { @@ -6897,21 +6898,37 @@ MaybeHandle JSObject::GetAccessor(Handle object, } } } else { - for (PrototypeIterator iter(isolate, object, - PrototypeIterator::START_AT_RECEIVER); - !iter.IsAtEnd(); iter.Advance()) { - LookupResult result(isolate); - JSReceiver::cast(*PrototypeIterator::GetCurrent(iter)) - ->LookupOwn(name, &result); - if (result.IsFound()) { - if (result.IsReadOnly()) return isolate->factory()->undefined_value(); - if (result.IsPropertyCallbacks()) { - Object* obj = result.GetCallbackObject(); - if (obj->IsAccessorPair()) { - return handle(AccessorPair::cast(obj)->GetComponent(component), - isolate); + LookupIterator it(object, name, LookupIterator::SKIP_INTERCEPTOR); + for (; it.IsFound(); it.Next()) { + switch (it.state()) { + case LookupIterator::NOT_FOUND: + case LookupIterator::INTERCEPTOR: + UNREACHABLE(); + + case LookupIterator::ACCESS_CHECK: + if (it.HasAccess(v8::ACCESS_HAS)) continue; + isolate->ReportFailedAccessCheck(it.GetHolder(), + v8::ACCESS_HAS); + RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object); + return isolate->factory()->undefined_value(); + + case LookupIterator::JSPROXY: + return isolate->factory()->undefined_value(); + + case LookupIterator::PROPERTY: + if (!it.HasProperty()) continue; + switch (it.property_kind()) { + case LookupIterator::DATA: + continue; + case LookupIterator::ACCESSOR: { + Handle maybe_pair = it.GetAccessors(); + if (maybe_pair->IsAccessorPair()) { + return handle( + AccessorPair::cast(*maybe_pair)->GetComponent(component), + isolate); + } + } } - } } } } diff --git a/src/version.cc b/src/version.cc index 5515be1df..cbb4044cb 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 28 #define BUILD_NUMBER 71 -#define PATCH_LEVEL 4 +#define PATCH_LEVEL 5 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc index ab000dc6a..601e9eb71 100644 --- a/test/cctest/test-heap.cc +++ b/test/cctest/test-heap.cc @@ -4475,6 +4475,51 @@ TEST(Regress388880) { } +TEST(RegressStoreBufferMapUpdate) { + CcTest::InitializeVM(); + v8::HandleScope scope(CcTest::isolate()); + Isolate* isolate = CcTest::i_isolate(); + Factory* factory = isolate->factory(); + Heap* heap = isolate->heap(); + + // This test checks that we do not treat instance size field of the map + // as a heap pointer when processing the store buffer. + + Handle map1 = Map::Create(isolate->object_function(), 1); + + // Allocate a throw-away object. + factory->NewFixedArray(1, NOT_TENURED); + + // Allocate a new-space object that will be moved by the GC (because + // the throw-away object will die). + Handle object_to_move = factory->NewFixedArray(1, NOT_TENURED); + + // Record the address before the GC. + Object* object_to_move_address = *object_to_move; + + // Smash the new space pointer to the moving object into the instance size + // field of the map. The idea is to trick the GC into updating this pointer + // when the object moves. This would be wrong because instance size should + // not be treated as a heap pointer. + *(reinterpret_cast(map1->address() + Map::kInstanceSizeOffset)) = + object_to_move_address; + + // Make sure we scan the map's page on scavenge. + Page* page = Page::FromAddress(map1->address()); + page->set_scan_on_scavenge(true); + + heap->CollectGarbage(NEW_SPACE); + + // Check the object has really moved. + CHECK(*object_to_move != object_to_move_address); + + // Now check that we have not updated the instance size field of the map. + CHECK_EQ(object_to_move_address, + *(reinterpret_cast(map1->address() + + Map::kInstanceSizeOffset))); +} + + #ifdef DEBUG TEST(PathTracer) { CcTest::InitializeVM(); -- cgit v1.2.3 From 5fadd689d674a068be2ff824f26829a6484384ff Mon Sep 17 00:00:00 2001 From: "verwaest@chromium.org" Date: Mon, 25 Aug 2014 19:32:23 +0000 Subject: Version 3.27.34.15 (merged r23129) Fix access checks in GetAccessor R=danno@chromium.org BUG= Review URL: https://codereview.chromium.org/500203002 git-svn-id: https://v8.googlecode.com/svn/branches/3.27@23375 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/objects.cc | 25 +++++++++++++++++-------- src/version.cc | 2 +- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/objects.cc b/src/objects.cc index 92bce62d4..1d3b022c7 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -6909,20 +6909,21 @@ MaybeHandle JSObject::GetAccessor(Handle object, // interceptor calls. AssertNoContextChange ncc(isolate); - // Check access rights if needed. - if (object->IsAccessCheckNeeded() && - !isolate->MayNamedAccess(object, name, v8::ACCESS_HAS)) { - isolate->ReportFailedAccessCheck(object, v8::ACCESS_HAS); - RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object); - return isolate->factory()->undefined_value(); - } - // Make the lookup and include prototypes. uint32_t index = 0; if (name->AsArrayIndex(&index)) { for (Handle obj = object; !obj->IsNull(); obj = handle(JSReceiver::cast(*obj)->GetPrototype(), isolate)) { + if (obj->IsAccessCheckNeeded() && + !isolate->MayNamedAccess(Handle::cast(obj), name, + v8::ACCESS_HAS)) { + isolate->ReportFailedAccessCheck(Handle::cast(obj), + v8::ACCESS_HAS); + RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object); + return isolate->factory()->undefined_value(); + } + if (obj->IsJSObject() && JSObject::cast(*obj)->HasDictionaryElements()) { JSObject* js_object = JSObject::cast(*obj); SeededNumberDictionary* dictionary = js_object->element_dictionary(); @@ -6941,6 +6942,14 @@ MaybeHandle JSObject::GetAccessor(Handle object, for (Handle obj = object; !obj->IsNull(); obj = handle(JSReceiver::cast(*obj)->GetPrototype(), isolate)) { + if (obj->IsAccessCheckNeeded() && + !isolate->MayNamedAccess(Handle::cast(obj), name, + v8::ACCESS_HAS)) { + isolate->ReportFailedAccessCheck(Handle::cast(obj), + v8::ACCESS_HAS); + RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object); + return isolate->factory()->undefined_value(); + } LookupResult result(isolate); JSReceiver::cast(*obj)->LookupOwn(name, &result); if (result.IsFound()) { diff --git a/src/version.cc b/src/version.cc index d6c513555..da8e38614 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 27 #define BUILD_NUMBER 34 -#define PATCH_LEVEL 14 +#define PATCH_LEVEL 15 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- cgit v1.2.3 From 0d5412d173af1b243137b05ffab9670f5f5d9320 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 27 Aug 2014 18:27:07 +0100 Subject: Update makefiles after merge of Chromium at 38.0.2125.24 This commit was generated by merge_from_chromium.py. Change-Id: Ia7d3c2c3db56f809f8d4dae7762c0d75c7513688 --- tools/gyp/mksnapshot.host.darwin-arm.mk | 3 +-- tools/gyp/mksnapshot.host.darwin-arm64.mk | 3 +-- tools/gyp/mksnapshot.host.darwin-mips.mk | 3 +-- tools/gyp/mksnapshot.host.darwin-x86.mk | 3 +-- tools/gyp/mksnapshot.host.darwin-x86_64.mk | 3 +-- tools/gyp/mksnapshot.host.linux-arm.mk | 3 +-- tools/gyp/mksnapshot.host.linux-arm64.mk | 3 +-- tools/gyp/mksnapshot.host.linux-mips.mk | 3 +-- tools/gyp/mksnapshot.host.linux-x86.mk | 3 +-- tools/gyp/mksnapshot.host.linux-x86_64.mk | 3 +-- tools/gyp/v8_base.host.darwin-arm.mk | 3 +-- tools/gyp/v8_base.host.darwin-arm64.mk | 3 +-- tools/gyp/v8_base.host.darwin-mips.mk | 3 +-- tools/gyp/v8_base.host.darwin-x86.mk | 3 +-- tools/gyp/v8_base.host.darwin-x86_64.mk | 3 +-- tools/gyp/v8_base.host.linux-arm.mk | 3 +-- tools/gyp/v8_base.host.linux-arm64.mk | 3 +-- tools/gyp/v8_base.host.linux-mips.mk | 3 +-- tools/gyp/v8_base.host.linux-x86.mk | 3 +-- tools/gyp/v8_base.host.linux-x86_64.mk | 3 +-- tools/gyp/v8_base.target.darwin-arm.mk | 3 +-- tools/gyp/v8_base.target.darwin-arm64.mk | 3 +-- tools/gyp/v8_base.target.darwin-mips.mk | 3 +-- tools/gyp/v8_base.target.darwin-x86.mk | 3 +-- tools/gyp/v8_base.target.darwin-x86_64.mk | 3 +-- tools/gyp/v8_base.target.linux-arm.mk | 3 +-- tools/gyp/v8_base.target.linux-arm64.mk | 3 +-- tools/gyp/v8_base.target.linux-mips.mk | 3 +-- tools/gyp/v8_base.target.linux-x86.mk | 3 +-- tools/gyp/v8_base.target.linux-x86_64.mk | 3 +-- tools/gyp/v8_libbase.host.darwin-arm.mk | 3 +-- tools/gyp/v8_libbase.host.darwin-arm64.mk | 3 +-- tools/gyp/v8_libbase.host.darwin-mips.mk | 3 +-- tools/gyp/v8_libbase.host.darwin-x86.mk | 3 +-- tools/gyp/v8_libbase.host.darwin-x86_64.mk | 3 +-- tools/gyp/v8_libbase.host.linux-arm.mk | 3 +-- tools/gyp/v8_libbase.host.linux-arm64.mk | 3 +-- tools/gyp/v8_libbase.host.linux-mips.mk | 3 +-- tools/gyp/v8_libbase.host.linux-x86.mk | 3 +-- tools/gyp/v8_libbase.host.linux-x86_64.mk | 3 +-- tools/gyp/v8_libbase.target.darwin-arm.mk | 3 +-- tools/gyp/v8_libbase.target.darwin-arm64.mk | 3 +-- tools/gyp/v8_libbase.target.darwin-mips.mk | 3 +-- tools/gyp/v8_libbase.target.darwin-x86.mk | 3 +-- tools/gyp/v8_libbase.target.darwin-x86_64.mk | 3 +-- tools/gyp/v8_libbase.target.linux-arm.mk | 3 +-- tools/gyp/v8_libbase.target.linux-arm64.mk | 3 +-- tools/gyp/v8_libbase.target.linux-mips.mk | 3 +-- tools/gyp/v8_libbase.target.linux-x86.mk | 3 +-- tools/gyp/v8_libbase.target.linux-x86_64.mk | 3 +-- tools/gyp/v8_libplatform.host.darwin-arm.mk | 3 +-- tools/gyp/v8_libplatform.host.darwin-arm64.mk | 3 +-- tools/gyp/v8_libplatform.host.darwin-mips.mk | 3 +-- tools/gyp/v8_libplatform.host.darwin-x86.mk | 3 +-- tools/gyp/v8_libplatform.host.darwin-x86_64.mk | 3 +-- tools/gyp/v8_libplatform.host.linux-arm.mk | 3 +-- tools/gyp/v8_libplatform.host.linux-arm64.mk | 3 +-- tools/gyp/v8_libplatform.host.linux-mips.mk | 3 +-- tools/gyp/v8_libplatform.host.linux-x86.mk | 3 +-- tools/gyp/v8_libplatform.host.linux-x86_64.mk | 3 +-- tools/gyp/v8_nosnapshot.host.darwin-arm.mk | 3 +-- tools/gyp/v8_nosnapshot.host.darwin-arm64.mk | 3 +-- tools/gyp/v8_nosnapshot.host.darwin-mips.mk | 3 +-- tools/gyp/v8_nosnapshot.host.darwin-x86.mk | 3 +-- tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk | 3 +-- tools/gyp/v8_nosnapshot.host.linux-arm.mk | 3 +-- tools/gyp/v8_nosnapshot.host.linux-arm64.mk | 3 +-- tools/gyp/v8_nosnapshot.host.linux-mips.mk | 3 +-- tools/gyp/v8_nosnapshot.host.linux-x86.mk | 3 +-- tools/gyp/v8_nosnapshot.host.linux-x86_64.mk | 3 +-- tools/gyp/v8_snapshot.target.darwin-arm.mk | 3 +-- tools/gyp/v8_snapshot.target.darwin-arm64.mk | 3 +-- tools/gyp/v8_snapshot.target.darwin-mips.mk | 3 +-- tools/gyp/v8_snapshot.target.darwin-x86.mk | 3 +-- tools/gyp/v8_snapshot.target.darwin-x86_64.mk | 3 +-- tools/gyp/v8_snapshot.target.linux-arm.mk | 3 +-- tools/gyp/v8_snapshot.target.linux-arm64.mk | 3 +-- tools/gyp/v8_snapshot.target.linux-mips.mk | 3 +-- tools/gyp/v8_snapshot.target.linux-x86.mk | 3 +-- tools/gyp/v8_snapshot.target.linux-x86_64.mk | 3 +-- 80 files changed, 80 insertions(+), 160 deletions(-) diff --git a/tools/gyp/mksnapshot.host.darwin-arm.mk b/tools/gyp/mksnapshot.host.darwin-arm.mk index 40e7fb0bb..e6601240e 100644 --- a/tools/gyp/mksnapshot.host.darwin-arm.mk +++ b/tools/gyp/mksnapshot.host.darwin-arm.mk @@ -164,8 +164,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.darwin-arm64.mk b/tools/gyp/mksnapshot.host.darwin-arm64.mk index e708056d5..0bc04e0e9 100644 --- a/tools/gyp/mksnapshot.host.darwin-arm64.mk +++ b/tools/gyp/mksnapshot.host.darwin-arm64.mk @@ -160,8 +160,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.darwin-mips.mk b/tools/gyp/mksnapshot.host.darwin-mips.mk index 725a6f35d..dd9f19aa6 100644 --- a/tools/gyp/mksnapshot.host.darwin-mips.mk +++ b/tools/gyp/mksnapshot.host.darwin-mips.mk @@ -170,8 +170,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.darwin-x86.mk b/tools/gyp/mksnapshot.host.darwin-x86.mk index 151aa6006..9ae6f398e 100644 --- a/tools/gyp/mksnapshot.host.darwin-x86.mk +++ b/tools/gyp/mksnapshot.host.darwin-x86.mk @@ -162,8 +162,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.darwin-x86_64.mk b/tools/gyp/mksnapshot.host.darwin-x86_64.mk index 8ef23b7d5..0130f5506 100644 --- a/tools/gyp/mksnapshot.host.darwin-x86_64.mk +++ b/tools/gyp/mksnapshot.host.darwin-x86_64.mk @@ -162,8 +162,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.linux-arm.mk b/tools/gyp/mksnapshot.host.linux-arm.mk index 5a4e0056e..1a31f5e54 100644 --- a/tools/gyp/mksnapshot.host.linux-arm.mk +++ b/tools/gyp/mksnapshot.host.linux-arm.mk @@ -166,8 +166,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.linux-arm64.mk b/tools/gyp/mksnapshot.host.linux-arm64.mk index 8d9b6864f..0b9528a54 100644 --- a/tools/gyp/mksnapshot.host.linux-arm64.mk +++ b/tools/gyp/mksnapshot.host.linux-arm64.mk @@ -162,8 +162,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.linux-mips.mk b/tools/gyp/mksnapshot.host.linux-mips.mk index f90a7ddec..67d54ddcb 100644 --- a/tools/gyp/mksnapshot.host.linux-mips.mk +++ b/tools/gyp/mksnapshot.host.linux-mips.mk @@ -172,8 +172,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.linux-x86.mk b/tools/gyp/mksnapshot.host.linux-x86.mk index cc24dacdc..464333648 100644 --- a/tools/gyp/mksnapshot.host.linux-x86.mk +++ b/tools/gyp/mksnapshot.host.linux-x86.mk @@ -164,8 +164,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/mksnapshot.host.linux-x86_64.mk b/tools/gyp/mksnapshot.host.linux-x86_64.mk index 905df86cc..8c575b035 100644 --- a/tools/gyp/mksnapshot.host.linux-x86_64.mk +++ b/tools/gyp/mksnapshot.host.linux-x86_64.mk @@ -164,8 +164,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.darwin-arm.mk b/tools/gyp/v8_base.host.darwin-arm.mk index 329178a7f..a222e4dd3 100644 --- a/tools/gyp/v8_base.host.darwin-arm.mk +++ b/tools/gyp/v8_base.host.darwin-arm.mk @@ -362,8 +362,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.darwin-arm64.mk b/tools/gyp/v8_base.host.darwin-arm64.mk index d0cf53321..5fe203b44 100644 --- a/tools/gyp/v8_base.host.darwin-arm64.mk +++ b/tools/gyp/v8_base.host.darwin-arm64.mk @@ -362,8 +362,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.darwin-mips.mk b/tools/gyp/v8_base.host.darwin-mips.mk index dc32bfe9f..97e52702f 100644 --- a/tools/gyp/v8_base.host.darwin-mips.mk +++ b/tools/gyp/v8_base.host.darwin-mips.mk @@ -365,8 +365,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.darwin-x86.mk b/tools/gyp/v8_base.host.darwin-x86.mk index dc463d936..588839e20 100644 --- a/tools/gyp/v8_base.host.darwin-x86.mk +++ b/tools/gyp/v8_base.host.darwin-x86.mk @@ -358,8 +358,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.darwin-x86_64.mk b/tools/gyp/v8_base.host.darwin-x86_64.mk index d6f9e192a..e5f28cb80 100644 --- a/tools/gyp/v8_base.host.darwin-x86_64.mk +++ b/tools/gyp/v8_base.host.darwin-x86_64.mk @@ -358,8 +358,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.linux-arm.mk b/tools/gyp/v8_base.host.linux-arm.mk index 6491c9643..97fb73111 100644 --- a/tools/gyp/v8_base.host.linux-arm.mk +++ b/tools/gyp/v8_base.host.linux-arm.mk @@ -364,8 +364,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.linux-arm64.mk b/tools/gyp/v8_base.host.linux-arm64.mk index 97a05ca47..dd99c03ab 100644 --- a/tools/gyp/v8_base.host.linux-arm64.mk +++ b/tools/gyp/v8_base.host.linux-arm64.mk @@ -364,8 +364,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.linux-mips.mk b/tools/gyp/v8_base.host.linux-mips.mk index 35b6a37bb..ef34a093e 100644 --- a/tools/gyp/v8_base.host.linux-mips.mk +++ b/tools/gyp/v8_base.host.linux-mips.mk @@ -367,8 +367,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.linux-x86.mk b/tools/gyp/v8_base.host.linux-x86.mk index be182649e..4ed38d266 100644 --- a/tools/gyp/v8_base.host.linux-x86.mk +++ b/tools/gyp/v8_base.host.linux-x86.mk @@ -360,8 +360,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.host.linux-x86_64.mk b/tools/gyp/v8_base.host.linux-x86_64.mk index 81928230f..07487f93d 100644 --- a/tools/gyp/v8_base.host.linux-x86_64.mk +++ b/tools/gyp/v8_base.host.linux-x86_64.mk @@ -360,8 +360,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.darwin-arm.mk b/tools/gyp/v8_base.target.darwin-arm.mk index 8a73fe43b..b9547afaa 100644 --- a/tools/gyp/v8_base.target.darwin-arm.mk +++ b/tools/gyp/v8_base.target.darwin-arm.mk @@ -429,8 +429,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.darwin-arm64.mk b/tools/gyp/v8_base.target.darwin-arm64.mk index f8fae367a..ed284a527 100644 --- a/tools/gyp/v8_base.target.darwin-arm64.mk +++ b/tools/gyp/v8_base.target.darwin-arm64.mk @@ -408,8 +408,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.darwin-mips.mk b/tools/gyp/v8_base.target.darwin-mips.mk index 412a45f66..d63163c04 100644 --- a/tools/gyp/v8_base.target.darwin-mips.mk +++ b/tools/gyp/v8_base.target.darwin-mips.mk @@ -420,8 +420,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.darwin-x86.mk b/tools/gyp/v8_base.target.darwin-x86.mk index c72f05566..a04717fe0 100644 --- a/tools/gyp/v8_base.target.darwin-x86.mk +++ b/tools/gyp/v8_base.target.darwin-x86.mk @@ -416,8 +416,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.darwin-x86_64.mk b/tools/gyp/v8_base.target.darwin-x86_64.mk index dbbe5728d..37ef99f15 100644 --- a/tools/gyp/v8_base.target.darwin-x86_64.mk +++ b/tools/gyp/v8_base.target.darwin-x86_64.mk @@ -414,8 +414,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.linux-arm.mk b/tools/gyp/v8_base.target.linux-arm.mk index 8a73fe43b..b9547afaa 100644 --- a/tools/gyp/v8_base.target.linux-arm.mk +++ b/tools/gyp/v8_base.target.linux-arm.mk @@ -429,8 +429,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.linux-arm64.mk b/tools/gyp/v8_base.target.linux-arm64.mk index f8fae367a..ed284a527 100644 --- a/tools/gyp/v8_base.target.linux-arm64.mk +++ b/tools/gyp/v8_base.target.linux-arm64.mk @@ -408,8 +408,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.linux-mips.mk b/tools/gyp/v8_base.target.linux-mips.mk index 412a45f66..d63163c04 100644 --- a/tools/gyp/v8_base.target.linux-mips.mk +++ b/tools/gyp/v8_base.target.linux-mips.mk @@ -420,8 +420,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.linux-x86.mk b/tools/gyp/v8_base.target.linux-x86.mk index c72f05566..a04717fe0 100644 --- a/tools/gyp/v8_base.target.linux-x86.mk +++ b/tools/gyp/v8_base.target.linux-x86.mk @@ -416,8 +416,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_base.target.linux-x86_64.mk b/tools/gyp/v8_base.target.linux-x86_64.mk index dbbe5728d..37ef99f15 100644 --- a/tools/gyp/v8_base.target.linux-x86_64.mk +++ b/tools/gyp/v8_base.target.linux-x86_64.mk @@ -414,8 +414,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.darwin-arm.mk b/tools/gyp/v8_libbase.host.darwin-arm.mk index 64291cdbd..dc45df058 100644 --- a/tools/gyp/v8_libbase.host.darwin-arm.mk +++ b/tools/gyp/v8_libbase.host.darwin-arm.mk @@ -165,8 +165,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.darwin-arm64.mk b/tools/gyp/v8_libbase.host.darwin-arm64.mk index eb7ac4120..c4a8fa350 100644 --- a/tools/gyp/v8_libbase.host.darwin-arm64.mk +++ b/tools/gyp/v8_libbase.host.darwin-arm64.mk @@ -161,8 +161,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.darwin-mips.mk b/tools/gyp/v8_libbase.host.darwin-mips.mk index 02485fef6..f918160bb 100644 --- a/tools/gyp/v8_libbase.host.darwin-mips.mk +++ b/tools/gyp/v8_libbase.host.darwin-mips.mk @@ -171,8 +171,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.darwin-x86.mk b/tools/gyp/v8_libbase.host.darwin-x86.mk index 5028dc0bd..857e34c0f 100644 --- a/tools/gyp/v8_libbase.host.darwin-x86.mk +++ b/tools/gyp/v8_libbase.host.darwin-x86.mk @@ -163,8 +163,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.darwin-x86_64.mk b/tools/gyp/v8_libbase.host.darwin-x86_64.mk index 362d53734..3edb394ea 100644 --- a/tools/gyp/v8_libbase.host.darwin-x86_64.mk +++ b/tools/gyp/v8_libbase.host.darwin-x86_64.mk @@ -163,8 +163,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.linux-arm.mk b/tools/gyp/v8_libbase.host.linux-arm.mk index 38c572788..2e6a8d632 100644 --- a/tools/gyp/v8_libbase.host.linux-arm.mk +++ b/tools/gyp/v8_libbase.host.linux-arm.mk @@ -169,8 +169,7 @@ MY_DEFS_Release := \ '-DV8_LIBRT_NOT_AVAILABLE=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.linux-arm64.mk b/tools/gyp/v8_libbase.host.linux-arm64.mk index 53e52652c..e50454fae 100644 --- a/tools/gyp/v8_libbase.host.linux-arm64.mk +++ b/tools/gyp/v8_libbase.host.linux-arm64.mk @@ -165,8 +165,7 @@ MY_DEFS_Release := \ '-DV8_LIBRT_NOT_AVAILABLE=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.linux-mips.mk b/tools/gyp/v8_libbase.host.linux-mips.mk index 8be646b0a..746fb0e90 100644 --- a/tools/gyp/v8_libbase.host.linux-mips.mk +++ b/tools/gyp/v8_libbase.host.linux-mips.mk @@ -175,8 +175,7 @@ MY_DEFS_Release := \ '-DV8_LIBRT_NOT_AVAILABLE=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.linux-x86.mk b/tools/gyp/v8_libbase.host.linux-x86.mk index b3719a6a7..9deeec28f 100644 --- a/tools/gyp/v8_libbase.host.linux-x86.mk +++ b/tools/gyp/v8_libbase.host.linux-x86.mk @@ -167,8 +167,7 @@ MY_DEFS_Release := \ '-DV8_LIBRT_NOT_AVAILABLE=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.host.linux-x86_64.mk b/tools/gyp/v8_libbase.host.linux-x86_64.mk index 8933b8138..d0f3cdaa9 100644 --- a/tools/gyp/v8_libbase.host.linux-x86_64.mk +++ b/tools/gyp/v8_libbase.host.linux-x86_64.mk @@ -167,8 +167,7 @@ MY_DEFS_Release := \ '-DV8_LIBRT_NOT_AVAILABLE=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.darwin-arm.mk b/tools/gyp/v8_libbase.target.darwin-arm.mk index 3fa8071e2..e9b9a054a 100644 --- a/tools/gyp/v8_libbase.target.darwin-arm.mk +++ b/tools/gyp/v8_libbase.target.darwin-arm.mk @@ -230,8 +230,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.darwin-arm64.mk b/tools/gyp/v8_libbase.target.darwin-arm64.mk index 583b973e5..5cefb21db 100644 --- a/tools/gyp/v8_libbase.target.darwin-arm64.mk +++ b/tools/gyp/v8_libbase.target.darwin-arm64.mk @@ -205,8 +205,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.darwin-mips.mk b/tools/gyp/v8_libbase.target.darwin-mips.mk index b2710eba7..c632a1e06 100644 --- a/tools/gyp/v8_libbase.target.darwin-mips.mk +++ b/tools/gyp/v8_libbase.target.darwin-mips.mk @@ -224,8 +224,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.darwin-x86.mk b/tools/gyp/v8_libbase.target.darwin-x86.mk index 730dd2fcb..93304ce4c 100644 --- a/tools/gyp/v8_libbase.target.darwin-x86.mk +++ b/tools/gyp/v8_libbase.target.darwin-x86.mk @@ -219,8 +219,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.darwin-x86_64.mk b/tools/gyp/v8_libbase.target.darwin-x86_64.mk index 0b7b7cafa..2ea724fb6 100644 --- a/tools/gyp/v8_libbase.target.darwin-x86_64.mk +++ b/tools/gyp/v8_libbase.target.darwin-x86_64.mk @@ -217,8 +217,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.linux-arm.mk b/tools/gyp/v8_libbase.target.linux-arm.mk index 3fa8071e2..e9b9a054a 100644 --- a/tools/gyp/v8_libbase.target.linux-arm.mk +++ b/tools/gyp/v8_libbase.target.linux-arm.mk @@ -230,8 +230,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.linux-arm64.mk b/tools/gyp/v8_libbase.target.linux-arm64.mk index 583b973e5..5cefb21db 100644 --- a/tools/gyp/v8_libbase.target.linux-arm64.mk +++ b/tools/gyp/v8_libbase.target.linux-arm64.mk @@ -205,8 +205,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.linux-mips.mk b/tools/gyp/v8_libbase.target.linux-mips.mk index b2710eba7..c632a1e06 100644 --- a/tools/gyp/v8_libbase.target.linux-mips.mk +++ b/tools/gyp/v8_libbase.target.linux-mips.mk @@ -224,8 +224,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.linux-x86.mk b/tools/gyp/v8_libbase.target.linux-x86.mk index 730dd2fcb..93304ce4c 100644 --- a/tools/gyp/v8_libbase.target.linux-x86.mk +++ b/tools/gyp/v8_libbase.target.linux-x86.mk @@ -219,8 +219,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libbase.target.linux-x86_64.mk b/tools/gyp/v8_libbase.target.linux-x86_64.mk index 0b7b7cafa..2ea724fb6 100644 --- a/tools/gyp/v8_libbase.target.linux-x86_64.mk +++ b/tools/gyp/v8_libbase.target.linux-x86_64.mk @@ -217,8 +217,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libplatform.host.darwin-arm.mk b/tools/gyp/v8_libplatform.host.darwin-arm.mk index 81a3aaaa1..98e0c1ff4 100644 --- a/tools/gyp/v8_libplatform.host.darwin-arm.mk +++ b/tools/gyp/v8_libplatform.host.darwin-arm.mk @@ -157,8 +157,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libplatform.host.darwin-arm64.mk b/tools/gyp/v8_libplatform.host.darwin-arm64.mk index 4b5a3ee00..b66c85de4 100644 --- a/tools/gyp/v8_libplatform.host.darwin-arm64.mk +++ b/tools/gyp/v8_libplatform.host.darwin-arm64.mk @@ -153,8 +153,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libplatform.host.darwin-mips.mk b/tools/gyp/v8_libplatform.host.darwin-mips.mk index 0e983af45..081815e6b 100644 --- a/tools/gyp/v8_libplatform.host.darwin-mips.mk +++ b/tools/gyp/v8_libplatform.host.darwin-mips.mk @@ -163,8 +163,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libplatform.host.darwin-x86.mk b/tools/gyp/v8_libplatform.host.darwin-x86.mk index 5977bd09c..b383a9412 100644 --- a/tools/gyp/v8_libplatform.host.darwin-x86.mk +++ b/tools/gyp/v8_libplatform.host.darwin-x86.mk @@ -155,8 +155,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libplatform.host.darwin-x86_64.mk b/tools/gyp/v8_libplatform.host.darwin-x86_64.mk index 495aa5f98..fec9da9a9 100644 --- a/tools/gyp/v8_libplatform.host.darwin-x86_64.mk +++ b/tools/gyp/v8_libplatform.host.darwin-x86_64.mk @@ -155,8 +155,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libplatform.host.linux-arm.mk b/tools/gyp/v8_libplatform.host.linux-arm.mk index d5345a008..7a644beb3 100644 --- a/tools/gyp/v8_libplatform.host.linux-arm.mk +++ b/tools/gyp/v8_libplatform.host.linux-arm.mk @@ -159,8 +159,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libplatform.host.linux-arm64.mk b/tools/gyp/v8_libplatform.host.linux-arm64.mk index bb6c68719..ecd37a064 100644 --- a/tools/gyp/v8_libplatform.host.linux-arm64.mk +++ b/tools/gyp/v8_libplatform.host.linux-arm64.mk @@ -155,8 +155,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libplatform.host.linux-mips.mk b/tools/gyp/v8_libplatform.host.linux-mips.mk index 0fe76efa9..d7c26023f 100644 --- a/tools/gyp/v8_libplatform.host.linux-mips.mk +++ b/tools/gyp/v8_libplatform.host.linux-mips.mk @@ -165,8 +165,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libplatform.host.linux-x86.mk b/tools/gyp/v8_libplatform.host.linux-x86.mk index b8826dd4d..8a4544e78 100644 --- a/tools/gyp/v8_libplatform.host.linux-x86.mk +++ b/tools/gyp/v8_libplatform.host.linux-x86.mk @@ -157,8 +157,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_libplatform.host.linux-x86_64.mk b/tools/gyp/v8_libplatform.host.linux-x86_64.mk index 87288888d..e591ec8ba 100644 --- a/tools/gyp/v8_libplatform.host.linux-x86_64.mk +++ b/tools/gyp/v8_libplatform.host.linux-x86_64.mk @@ -157,8 +157,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk index 6922826ea..809f9b94d 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk @@ -164,8 +164,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk index 7282d18a1..b710098ad 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk @@ -160,8 +160,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk index 390514140..32f5ebf32 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk @@ -170,8 +170,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk index 9ec27193c..8103458f6 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk @@ -162,8 +162,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk index 49382c257..2383e334d 100644 --- a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk +++ b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk @@ -162,8 +162,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm.mk b/tools/gyp/v8_nosnapshot.host.linux-arm.mk index 2b6fd1e0e..78fcb80a0 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-arm.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-arm.mk @@ -166,8 +166,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk index 322105f80..9b5370127 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk @@ -162,8 +162,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.linux-mips.mk b/tools/gyp/v8_nosnapshot.host.linux-mips.mk index 9ea9ce283..33c728908 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-mips.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-mips.mk @@ -172,8 +172,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86.mk b/tools/gyp/v8_nosnapshot.host.linux-x86.mk index 9d247cdc4..fcf58879f 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-x86.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-x86.mk @@ -164,8 +164,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk index 2d193be76..b80ee49dd 100644 --- a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk +++ b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk @@ -164,8 +164,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL_CERTS=1' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.darwin-arm.mk b/tools/gyp/v8_snapshot.target.darwin-arm.mk index 4ee893dd1..990fa7cb6 100644 --- a/tools/gyp/v8_snapshot.target.darwin-arm.mk +++ b/tools/gyp/v8_snapshot.target.darwin-arm.mk @@ -245,8 +245,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.darwin-arm64.mk b/tools/gyp/v8_snapshot.target.darwin-arm64.mk index 1b8526bc5..a603b6068 100644 --- a/tools/gyp/v8_snapshot.target.darwin-arm64.mk +++ b/tools/gyp/v8_snapshot.target.darwin-arm64.mk @@ -220,8 +220,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.darwin-mips.mk b/tools/gyp/v8_snapshot.target.darwin-mips.mk index 40437ffd2..689525a7e 100644 --- a/tools/gyp/v8_snapshot.target.darwin-mips.mk +++ b/tools/gyp/v8_snapshot.target.darwin-mips.mk @@ -239,8 +239,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.darwin-x86.mk b/tools/gyp/v8_snapshot.target.darwin-x86.mk index 8ad6566dd..1cf7e355c 100644 --- a/tools/gyp/v8_snapshot.target.darwin-x86.mk +++ b/tools/gyp/v8_snapshot.target.darwin-x86.mk @@ -234,8 +234,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk index 6643feb47..74a2d304e 100644 --- a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk +++ b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk @@ -232,8 +232,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.linux-arm.mk b/tools/gyp/v8_snapshot.target.linux-arm.mk index 4ee893dd1..990fa7cb6 100644 --- a/tools/gyp/v8_snapshot.target.linux-arm.mk +++ b/tools/gyp/v8_snapshot.target.linux-arm.mk @@ -245,8 +245,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.linux-arm64.mk b/tools/gyp/v8_snapshot.target.linux-arm64.mk index 1b8526bc5..a603b6068 100644 --- a/tools/gyp/v8_snapshot.target.linux-arm64.mk +++ b/tools/gyp/v8_snapshot.target.linux-arm64.mk @@ -220,8 +220,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.linux-mips.mk b/tools/gyp/v8_snapshot.target.linux-mips.mk index 40437ffd2..689525a7e 100644 --- a/tools/gyp/v8_snapshot.target.linux-mips.mk +++ b/tools/gyp/v8_snapshot.target.linux-mips.mk @@ -239,8 +239,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.linux-x86.mk b/tools/gyp/v8_snapshot.target.linux-x86.mk index 8ad6566dd..1cf7e355c 100644 --- a/tools/gyp/v8_snapshot.target.linux-x86.mk +++ b/tools/gyp/v8_snapshot.target.linux-x86.mk @@ -234,8 +234,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS diff --git a/tools/gyp/v8_snapshot.target.linux-x86_64.mk b/tools/gyp/v8_snapshot.target.linux-x86_64.mk index 6643feb47..74a2d304e 100644 --- a/tools/gyp/v8_snapshot.target.linux-x86_64.mk +++ b/tools/gyp/v8_snapshot.target.linux-x86_64.mk @@ -232,8 +232,7 @@ MY_DEFS_Release := \ '-DCHROME_BUILD_ID=""' \ '-DNDEBUG' \ '-DNVALGRIND' \ - '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ - '-DENABLE_HANDLE_ZAPPING' + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' # Include paths placed before CFLAGS/CPPFLAGS -- cgit v1.2.3 From ba1959a2d1c4ee30e203025bb242e3aefd41a971 Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Mon, 1 Sep 2014 11:03:15 +0000 Subject: Version 3.28.71.6 (merged r23552) Add mapping of test groups to test driver. TBR=bmeurer@chromium.org BUG= Review URL: https://codereview.chromium.org/529703002 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@23553 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/version.cc | 2 +- tools/run-tests.py | 43 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/version.cc b/src/version.cc index cbb4044cb..e6ce49f08 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 28 #define BUILD_NUMBER 71 -#define PATCH_LEVEL 5 +#define PATCH_LEVEL 6 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/tools/run-tests.py b/tools/run-tests.py index 6e9f5549d..059202430 100755 --- a/tools/run-tests.py +++ b/tools/run-tests.py @@ -28,6 +28,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +from collections import OrderedDict import itertools import multiprocessing import optparse @@ -52,6 +53,31 @@ from testrunner.objects import context ARCH_GUESS = utils.DefaultArch() DEFAULT_TESTS = ["mjsunit", "fuzz-natives", "base-unittests", "cctest", "compiler-unittests", "message", "preparser"] + +# Map of test name synonyms to lists of test suites. Should be ordered by +# expected runtimes (suites with slow test cases first). These groups are +# invoked in seperate steps on the bots. +TEST_MAP = { + "default": [ + "mjsunit", + "fuzz-natives", + "cctest", + "message", + "preparser", + ], + "optimize_for_size": [ + "mjsunit", + "cctest", + "webkit", + ], + "unittests": [ + "compiler-unittests", + "heap-unittests", + "base-unittests", + "libplatform-unittests", + ], +} + TIMEOUT_DEFAULT = 60 TIMEOUT_SCALEFACTOR = {"debug" : 4, "release" : 1 } @@ -377,14 +403,23 @@ def Main(): suite_paths = utils.GetSuitePaths(join(workspace, "test")) + # Expand arguments with grouped tests. The args should reflect the list of + # suites as otherwise filters would break. + def ExpandTestGroups(name): + if name in TEST_MAP: + return [suite for suite in TEST_MAP[arg]] + else: + return [name] + args = reduce(lambda x, y: x + y, + [ExpandTestGroups(arg) for arg in args], + []) + if len(args) == 0: suite_paths = [ s for s in DEFAULT_TESTS if s in suite_paths ] else: - args_suites = set() + args_suites = OrderedDict() # Used as set for arg in args: - suite = arg.split(os.path.sep)[0] - if not suite in args_suites: - args_suites.add(suite) + args_suites[arg.split(os.path.sep)[0]] = True suite_paths = [ s for s in args_suites if s in suite_paths ] suites = [] -- cgit v1.2.3 From 15eaa8c6ac2b338d606327d327d29f31ba692777 Mon Sep 17 00:00:00 2001 From: "verwaest@chromium.org" Date: Wed, 3 Sep 2014 11:55:50 +0000 Subject: Version 3.28.71.7 (merged r23397) Fixed inlining of constant values BUG=v8:3529 LOG=Y R=jarin@chromium.org Review URL: https://codereview.chromium.org/535093002 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@23644 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/hydrogen-instructions.cc | 13 ++----------- src/property-details-inl.h | 12 ------------ src/property-details.h | 2 -- src/version.cc | 2 +- .../regress/regress-force-constant-representation.js | 18 ++++++++++++++++++ 5 files changed, 21 insertions(+), 26 deletions(-) create mode 100644 test/mjsunit/regress/regress-force-constant-representation.js diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc index b75bec0f5..5065d4ce3 100644 --- a/src/hydrogen-instructions.cc +++ b/src/hydrogen-instructions.cc @@ -1511,17 +1511,8 @@ HInstruction* HForceRepresentation::New(Zone* zone, HValue* context, HValue* value, Representation representation) { if (FLAG_fold_constants && value->IsConstant()) { HConstant* c = HConstant::cast(value); - if (c->HasNumberValue()) { - double double_res = c->DoubleValue(); - if (representation.IsDouble()) { - return HConstant::New(zone, context, double_res); - - } else if (representation.CanContainDouble(double_res)) { - return HConstant::New(zone, context, - static_cast(double_res), - representation); - } - } + c = c->CopyToRepresentation(representation, zone); + if (c != NULL) return c; } return new(zone) HForceRepresentation(value, representation); } diff --git a/src/property-details-inl.h b/src/property-details-inl.h index eaa596f9d..efb27b319 100644 --- a/src/property-details-inl.h +++ b/src/property-details-inl.h @@ -13,18 +13,6 @@ namespace v8 { namespace internal { -inline bool Representation::CanContainDouble(double value) { - if (IsDouble() || is_more_general_than(Representation::Double())) { - return true; - } - if (IsInt32Double(value)) { - if (IsInteger32()) return true; - if (IsSmi()) return Smi::IsValid(static_cast(value)); - } - return false; -} - - Representation Representation::FromType(Type* type) { DisallowHeapAllocation no_allocation; if (type->Is(Type::None())) return Representation::None(); diff --git a/src/property-details.h b/src/property-details.h index 7eb2e4ea9..c5f6a8ee1 100644 --- a/src/property-details.h +++ b/src/property-details.h @@ -124,8 +124,6 @@ class Representation { return other.is_more_general_than(*this) || other.Equals(*this); } - bool CanContainDouble(double value); - Representation generalize(Representation other) { if (other.fits_into(*this)) return *this; if (other.is_more_general_than(*this)) return other; diff --git a/src/version.cc b/src/version.cc index e6ce49f08..fe385bf6d 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 28 #define BUILD_NUMBER 71 -#define PATCH_LEVEL 6 +#define PATCH_LEVEL 7 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/mjsunit/regress/regress-force-constant-representation.js b/test/mjsunit/regress/regress-force-constant-representation.js new file mode 100644 index 000000000..4ec2a6a79 --- /dev/null +++ b/test/mjsunit/regress/regress-force-constant-representation.js @@ -0,0 +1,18 @@ +// Copyright 2014 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Flags: --allow-natives-syntax + +// Test push double as tagged. +var a = [{}]; +function f(a) { + a.push(Infinity); +} + +f(a); +f(a); +f(a); +%OptimizeFunctionOnNextCall(f); +f(a); +assertEquals([{}, Infinity, Infinity, Infinity, Infinity], a); -- cgit v1.2.3 From 267831d92adc09d88f49f887b358eadb92a1585e Mon Sep 17 00:00:00 2001 From: "ulan@chromium.org" Date: Tue, 9 Sep 2014 12:12:35 +0000 Subject: Version 3.28.71.8 (merged r23404) Handle empty allocation list in CodeRange properly. BUG=407566,v8:3540 LOG=N R=hpayer@chromium.org Review URL: https://codereview.chromium.org/556863002 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@23797 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/heap/spaces.cc | 8 +++++--- src/version.cc | 2 +- test/cctest/test-spaces.cc | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/heap/spaces.cc b/src/heap/spaces.cc index 9be53e03f..92f3f7fa5 100644 --- a/src/heap/spaces.cc +++ b/src/heap/spaces.cc @@ -193,8 +193,10 @@ Address CodeRange::AllocateRawMemory(const size_t requested_size, const size_t commit_size, size_t* allocated) { DCHECK(commit_size <= requested_size); - DCHECK(current_allocation_block_index_ < allocation_list_.length()); - if (requested_size > allocation_list_[current_allocation_block_index_].size) { + DCHECK(allocation_list_.length() == 0 || + current_allocation_block_index_ < allocation_list_.length()); + if (allocation_list_.length() == 0 || + requested_size > allocation_list_[current_allocation_block_index_].size) { // Find an allocation block large enough. if (!GetNextAllocationBlock(requested_size)) return NULL; } @@ -218,7 +220,7 @@ Address CodeRange::AllocateRawMemory(const size_t requested_size, allocation_list_[current_allocation_block_index_].size -= *allocated; if (*allocated == current.size) { // This block is used up, get the next one. - if (!GetNextAllocationBlock(0)) return NULL; + GetNextAllocationBlock(0); } return current.start; } diff --git a/src/version.cc b/src/version.cc index fe385bf6d..92b9be115 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 28 #define BUILD_NUMBER 71 -#define PATCH_LEVEL 7 +#define PATCH_LEVEL 8 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/cctest/test-spaces.cc b/test/cctest/test-spaces.cc index 006209440..3c5961006 100644 --- a/test/cctest/test-spaces.cc +++ b/test/cctest/test-spaces.cc @@ -203,6 +203,28 @@ static void VerifyMemoryChunk(Isolate* isolate, } +TEST(Regress3540) { + Isolate* isolate = CcTest::i_isolate(); + isolate->InitializeLoggingAndCounters(); + Heap* heap = isolate->heap(); + CHECK(heap->ConfigureHeapDefault()); + MemoryAllocator* memory_allocator = new MemoryAllocator(isolate); + CHECK( + memory_allocator->SetUp(heap->MaxReserved(), heap->MaxExecutableSize())); + TestMemoryAllocatorScope test_allocator_scope(isolate, memory_allocator); + CodeRange* code_range = new CodeRange(isolate); + const size_t code_range_size = 4 * MB; + if (!code_range->SetUp(code_range_size)) return; + size_t allocated_size; + Address result; + for (int i = 0; i < 5; i++) { + result = code_range->AllocateRawMemory( + code_range_size - MB, code_range_size - MB, &allocated_size); + CHECK((result != NULL) == (i == 0)); + } +} + + static unsigned int Pseudorandom() { static uint32_t lo = 2345; lo = 18273 * (lo & 0xFFFFF) + (lo >> 16); -- cgit v1.2.3 From 908fbbb87371b50f61105e615c686f17a2ea4486 Mon Sep 17 00:00:00 2001 From: "bmeurer@chromium.org" Date: Wed, 10 Sep 2014 07:01:40 +0000 Subject: Version 3.28.71.9 (merged r23691) Enforce correct number comparisons when inlining Array.indexOf. BUG=407946 LOG=N R=machenbach@chromium.org Review URL: https://codereview.chromium.org/553373002 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@23817 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/hydrogen.cc | 14 ++++++++------ src/version.cc | 2 +- test/mjsunit/regress/regress-crbug-407946.js | 12 ++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 test/mjsunit/regress/regress-crbug-407946.js diff --git a/src/hydrogen.cc b/src/hydrogen.cc index 3ddd7cce8..9f3945f27 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -8800,6 +8800,12 @@ HValue* HOptimizedGraphBuilder::BuildArrayIndexOf(HValue* receiver, Push(graph()->GetConstantMinus1()); if (IsFastDoubleElementsKind(kind) || IsFastSmiElementsKind(kind)) { + // Make sure that we can actually compare numbers correctly below, see + // https://code.google.com/p/chromium/issues/detail?id=407946 for details. + search_element = AddUncasted( + search_element, IsFastSmiElementsKind(kind) ? Representation::Smi() + : Representation::Double()); + LoopBuilder loop(this, context(), direction); { HValue* index = loop.BeginBody(initial, terminating, token); @@ -8807,12 +8813,8 @@ HValue* HOptimizedGraphBuilder::BuildArrayIndexOf(HValue* receiver, elements, index, static_cast(NULL), kind, ALLOW_RETURN_HOLE); IfBuilder if_issame(this); - if (IsFastDoubleElementsKind(kind)) { - if_issame.If( - element, search_element, Token::EQ_STRICT); - } else { - if_issame.If(element, search_element); - } + if_issame.If(element, search_element, + Token::EQ_STRICT); if_issame.Then(); { Drop(1); diff --git a/src/version.cc b/src/version.cc index 92b9be115..afcd7b803 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 28 #define BUILD_NUMBER 71 -#define PATCH_LEVEL 8 +#define PATCH_LEVEL 9 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/mjsunit/regress/regress-crbug-407946.js b/test/mjsunit/regress/regress-crbug-407946.js new file mode 100644 index 000000000..d5687cca3 --- /dev/null +++ b/test/mjsunit/regress/regress-crbug-407946.js @@ -0,0 +1,12 @@ +// Copyright 2014 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Flags: --allow-natives-syntax + +function f(n) { return [0].indexOf((n - n) + 0); } + +assertEquals(0, f(.1)); +assertEquals(0, f(.1)); +%OptimizeFunctionOnNextCall(f); +assertEquals(0, f(.1)); -- cgit v1.2.3 From 895fe777a81b25528620c70eadc4c7463ccfd749 Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Wed, 10 Sep 2014 12:21:05 +0000 Subject: Skip slow webkit test. BUG= R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/559983002 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@23836 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- test/webkit/webkit.status | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/webkit/webkit.status b/test/webkit/webkit.status index c14d5c13c..7b6d3a34c 100644 --- a/test/webkit/webkit.status +++ b/test/webkit/webkit.status @@ -50,6 +50,9 @@ ['simulator', { 'function-apply-aliased': [SKIP], }], # 'simulator' +['arch == arm and simulator_run == True', { + 'dfg-int-overflow-in-loop': [SKIP], +}], # 'arch == arm and simulator_run == True' ['arch == arm64 and simulator_run == True', { 'dfg-int-overflow-in-loop': [SKIP], }], # 'arch == arm64 and simulator_run == True' -- cgit v1.2.3 From 2e4c2a04c8f042037bdf5b45180c009d7f0ce946 Mon Sep 17 00:00:00 2001 From: "verwaest@chromium.org" Date: Thu, 18 Sep 2014 12:11:48 +0000 Subject: Version 3.28.71.10 (merged r23727) Allocate a new empty number dictionary when resetting elements BUG=410332 LOG=N R=yangguo@chromium.org Review URL: https://codereview.chromium.org/577233002 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@24034 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/objects-inl.h | 3 --- src/objects.cc | 12 +++++++++--- src/version.cc | 2 +- test/mjsunit/regress/regress-reset-dictionary-elements.js | 14 ++++++++++++++ 4 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 test/mjsunit/regress/regress-reset-dictionary-elements.js diff --git a/src/objects-inl.h b/src/objects-inl.h index 432d6133b..b81eeaee5 100644 --- a/src/objects-inl.h +++ b/src/objects-inl.h @@ -2920,9 +2920,6 @@ FixedArrayBase* Map::GetInitialElements() { GetHeap()->EmptyFixedTypedArrayForMap(this); DCHECK(!GetHeap()->InNewSpace(empty_array)); return empty_array; - } else if (has_dictionary_elements()) { - DCHECK(!GetHeap()->InNewSpace(GetHeap()->empty_slow_element_dictionary())); - return GetHeap()->empty_slow_element_dictionary(); } else { UNREACHABLE(); } diff --git a/src/objects.cc b/src/objects.cc index b668916a5..75b5860f8 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -4730,9 +4730,15 @@ void JSObject::MigrateSlowToFast(Handle object, void JSObject::ResetElements(Handle object) { - Heap* heap = object->GetIsolate()->heap(); - CHECK(object->map() != heap->sloppy_arguments_elements_map()); - object->set_elements(object->map()->GetInitialElements()); + Isolate* isolate = object->GetIsolate(); + CHECK(object->map() != isolate->heap()->sloppy_arguments_elements_map()); + if (object->map()->has_dictionary_elements()) { + Handle new_elements = + SeededNumberDictionary::New(isolate, 0); + object->set_elements(*new_elements); + } else { + object->set_elements(object->map()->GetInitialElements()); + } } diff --git a/src/version.cc b/src/version.cc index afcd7b803..2d5f48a0f 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 28 #define BUILD_NUMBER 71 -#define PATCH_LEVEL 9 +#define PATCH_LEVEL 10 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/mjsunit/regress/regress-reset-dictionary-elements.js b/test/mjsunit/regress/regress-reset-dictionary-elements.js new file mode 100644 index 000000000..d3d093ec0 --- /dev/null +++ b/test/mjsunit/regress/regress-reset-dictionary-elements.js @@ -0,0 +1,14 @@ +// Copyright 2014 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +var a = []; +a[10000] = 1; +a.length = 0; +a[1] = 1; +a.length = 0; +assertEquals(undefined, a[1]); + +var o = {}; +Object.freeze(o); +assertEquals(undefined, o[1]); -- cgit v1.2.3 From c0f76a15bbfb6badefa8f21f539cb43a7388f6cd Mon Sep 17 00:00:00 2001 From: "ulan@chromium.org" Date: Tue, 23 Sep 2014 07:45:52 +0000 Subject: Version 3.28.71.11 (merged r24079) ARM: Make stack limit stricter to account for large buffers in MacroAssembler. BUG=chromium:405338 LOG=Y R=machenbach@chromium.org Review URL: https://codereview.chromium.org/594033003 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@24131 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/flag-definitions.h | 4 +--- src/globals.h | 12 ++++++++++++ src/version.cc | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/flag-definitions.h b/src/flag-definitions.h index 55af2e674..591fd4f11 100644 --- a/src/flag-definitions.h +++ b/src/flag-definitions.h @@ -460,9 +460,7 @@ DEFINE_BOOL(enable_liveedit, true, "enable liveedit experimental feature") DEFINE_BOOL(hard_abort, true, "abort by crashing") // execution.cc -// Slightly less than 1MB, since Windows' default stack size for -// the main execution thread is 1MB for both 32 and 64-bit. -DEFINE_INT(stack_size, 984, +DEFINE_INT(stack_size, V8_DEFAULT_STACK_SIZE_KB, "default size of stack region v8 is allowed to use (in kBytes)") // frames.cc diff --git a/src/globals.h b/src/globals.h index 889822f91..89940ccae 100644 --- a/src/globals.h +++ b/src/globals.h @@ -69,6 +69,18 @@ namespace internal { // Determine whether the architecture uses an out-of-line constant pool. #define V8_OOL_CONSTANT_POOL 0 +#ifdef V8_TARGET_ARCH_ARM +// Set stack limit lower for ARM than for other architectures because +// stack allocating MacroAssembler takes 120K bytes. +// See issue crbug.com/405338 +#define V8_DEFAULT_STACK_SIZE_KB 864 +#else +// Slightly less than 1MB, since Windows' default stack size for +// the main execution thread is 1MB for both 32 and 64-bit. +#define V8_DEFAULT_STACK_SIZE_KB 984 +#endif + + // Support for alternative bool type. This is only enabled if the code is // compiled with USE_MYBOOL defined. This catches some nasty type bugs. // For instance, 'bool b = "false";' results in b == true! This is a hidden diff --git a/src/version.cc b/src/version.cc index 2d5f48a0f..16eefdbf8 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 28 #define BUILD_NUMBER 71 -#define PATCH_LEVEL 10 +#define PATCH_LEVEL 11 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- cgit v1.2.3 From 2060cd6150cdcd41d72640273a8ded546e97ca9d Mon Sep 17 00:00:00 2001 From: "yangguo@chromium.org" Date: Wed, 24 Sep 2014 07:33:46 +0000 Subject: Version 3.28.71.12 (merged r24125) Fix escaped index JSON parsing BUG=416449 LOG=N R=verwaest@google.com, verwaest@chromium.org Review URL: https://codereview.chromium.org/597893002 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@24162 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/json-parser.h | 3 +-- src/objects.cc | 2 +- src/version.cc | 2 +- test/mjsunit/regress/regress-json-parse-index.js | 6 ++++++ 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 test/mjsunit/regress/regress-json-parse-index.js diff --git a/src/json-parser.h b/src/json-parser.h index c23e50dbb..cf3e6b82b 100644 --- a/src/json-parser.h +++ b/src/json-parser.h @@ -424,8 +424,7 @@ Handle JsonParser::ParseJsonObject() { if (value.is_null()) return ReportUnexpectedCharacter(); } - JSObject::SetOwnPropertyIgnoreAttributes( - json_object, key, value, NONE).Assert(); + Runtime::DefineObjectProperty(json_object, key, value, NONE).Check(); } while (MatchSkipWhiteSpace(',')); if (c0_ != '}') { return ReportUnexpectedCharacter(); diff --git a/src/objects.cc b/src/objects.cc index 75b5860f8..a994718bd 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -693,7 +693,7 @@ void JSObject::SetNormalizedProperty(Handle object, Handle name, Handle value, PropertyDetails details) { - DCHECK(!object->HasFastProperties()); + CHECK(!object->HasFastProperties()); Handle property_dictionary(object->property_dictionary()); if (!name->IsUniqueName()) { diff --git a/src/version.cc b/src/version.cc index 16eefdbf8..3080460cf 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 28 #define BUILD_NUMBER 71 -#define PATCH_LEVEL 11 +#define PATCH_LEVEL 12 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/mjsunit/regress/regress-json-parse-index.js b/test/mjsunit/regress/regress-json-parse-index.js new file mode 100644 index 000000000..d1a785aaf --- /dev/null +++ b/test/mjsunit/regress/regress-json-parse-index.js @@ -0,0 +1,6 @@ +// Copyright 2014 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +var o = JSON.parse('{"\\u0030":100}'); +assertEquals(100, o[0]); -- cgit v1.2.3 From 728b1040e8baf36fff8796b6a7688d92e23fcd60 Mon Sep 17 00:00:00 2001 From: "dcarney@chromium.org" Date: Fri, 26 Sep 2014 08:14:40 +0000 Subject: Version 3.28.71.13 (merged r24049) Revert "filter cross context eval" BUG=chromium:415051 LOG=N R=machenbach@chromium.org Review URL: https://codereview.chromium.org/600203003 git-svn-id: https://v8.googlecode.com/svn/branches/3.28@24241 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/generator.js | 4 +- src/runtime.cc | 58 ----------------------------- src/v8natives.js | 4 +- src/version.cc | 2 +- test/cctest/test-api.cc | 26 ------------- test/mjsunit/cross-realm-filtering.js | 69 ----------------------------------- 6 files changed, 3 insertions(+), 160 deletions(-) diff --git a/src/generator.js b/src/generator.js index c62fe2c77..1c7c4ec27 100644 --- a/src/generator.js +++ b/src/generator.js @@ -47,9 +47,7 @@ function GeneratorFunctionConstructor(arg1) { // length == 1 var global_proxy = %GlobalProxy(global); // Compile the string in the constructor and not a helper so that errors // appear to come from here. - var f = %CompileString(source, true); - if (!IS_FUNCTION(f)) return f; - f = %_CallFunction(global_proxy, f); + var f = %_CallFunction(global_proxy, %CompileString(source, true)); %FunctionMarkNameShouldPrintAsAnonymous(f); return f; } diff --git a/src/runtime.cc b/src/runtime.cc index 24c9655a3..80281a70c 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -9756,59 +9756,6 @@ bool CodeGenerationFromStringsAllowed(Isolate* isolate, } -// Walk up the stack expecting: -// - Runtime_CompileString -// - JSFunction callee (eval, Function constructor, etc) -// - call() (maybe) -// - apply() (maybe) -// - bind() (maybe) -// - JSFunction caller (maybe) -// -// return true if the caller has the same security token as the callee -// or if an exit frame was hit, in which case allow it through, as it could -// have come through the api. -static bool TokensMatchForCompileString(Isolate* isolate) { - MaybeHandle callee; - bool exit_handled = true; - bool tokens_match = true; - bool done = false; - for (StackFrameIterator it(isolate); !it.done() && !done; it.Advance()) { - StackFrame* raw_frame = it.frame(); - if (!raw_frame->is_java_script()) { - if (raw_frame->is_exit()) exit_handled = false; - continue; - } - JavaScriptFrame* outer_frame = JavaScriptFrame::cast(raw_frame); - List frames(FLAG_max_inlining_levels + 1); - outer_frame->Summarize(&frames); - for (int i = frames.length() - 1; i >= 0 && !done; --i) { - FrameSummary& frame = frames[i]; - Handle fun = frame.function(); - // Capture the callee function. - if (callee.is_null()) { - callee = fun; - exit_handled = true; - continue; - } - // Exit condition. - Handle context(callee.ToHandleChecked()->context()); - if (!fun->context()->HasSameSecurityTokenAs(*context)) { - tokens_match = false; - done = true; - continue; - } - // Skip bound functions in correct origin. - if (fun->shared()->bound()) { - exit_handled = true; - continue; - } - done = true; - } - } - return !exit_handled || tokens_match; -} - - RUNTIME_FUNCTION(Runtime_CompileString) { HandleScope scope(isolate); DCHECK(args.length() == 2); @@ -9818,11 +9765,6 @@ RUNTIME_FUNCTION(Runtime_CompileString) { // Extract native context. Handle context(isolate->native_context()); - // Filter cross security context calls. - if (!TokensMatchForCompileString(isolate)) { - return isolate->heap()->undefined_value(); - } - // Check if native context allows code generation from // strings. Throw an exception if it doesn't. if (context->allow_code_gen_from_strings()->IsFalse() && diff --git a/src/v8natives.js b/src/v8natives.js index 9612f16f9..1353f885a 100644 --- a/src/v8natives.js +++ b/src/v8natives.js @@ -1855,9 +1855,7 @@ function FunctionConstructor(arg1) { // length == 1 var global_proxy = %GlobalProxy(global); // Compile the string in the constructor and not a helper so that errors // appear to come from here. - var f = %CompileString(source, true); - if (!IS_FUNCTION(f)) return f; - f = %_CallFunction(global_proxy, f); + var f = %_CallFunction(global_proxy, %CompileString(source, true)); %FunctionMarkNameShouldPrintAsAnonymous(f); return f; } diff --git a/src/version.cc b/src/version.cc index 3080460cf..ed2bb9b5d 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 28 #define BUILD_NUMBER 71 -#define PATCH_LEVEL 12 +#define PATCH_LEVEL 13 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc index 9ddc9db71..2ac657d7f 100644 --- a/test/cctest/test-api.cc +++ b/test/cctest/test-api.cc @@ -22736,32 +22736,6 @@ TEST(ScriptNameAndLineNumber) { } -Local call_eval_context; -Local call_eval_bound_function; -static void CallEval(const v8::FunctionCallbackInfo& args) { - v8::Context::Scope scope(call_eval_context); - args.GetReturnValue().Set( - call_eval_bound_function->Call(call_eval_context->Global(), 0, NULL)); -} - - -TEST(CrossActivationEval) { - LocalContext env; - v8::Isolate* isolate = env->GetIsolate(); - v8::HandleScope scope(isolate); - { - call_eval_context = v8::Context::New(isolate); - v8::Context::Scope scope(call_eval_context); - call_eval_bound_function = - Local::Cast(CompileRun("eval.bind(this, '1')")); - } - env->Global()->Set(v8_str("CallEval"), - v8::FunctionTemplate::New(isolate, CallEval)->GetFunction()); - Local result = CompileRun("CallEval();"); - CHECK_EQ(result, v8::Integer::New(isolate, 1)); -} - - void SourceURLHelper(const char* source, const char* expected_source_url, const char* expected_source_mapping_url) { Local