summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorAli Ijaz Sheikh <ofrobots@google.com>2016-04-19 17:13:11 -0700
committerAli Ijaz Sheikh <ofrobots@google.com>2016-04-20 08:07:24 -0700
commit4fbd3757244c84c9ac1b8cbeda5d4b531a059a4c (patch)
tree85b44e0b15b176d6cd1e3d4ee818fc9559092eeb /deps
parent0899ea7a5210be333ed13c730a179a86e48a56a0 (diff)
downloadandroid-node-v8-4fbd3757244c84c9ac1b8cbeda5d4b531a059a4c.tar.gz
android-node-v8-4fbd3757244c84c9ac1b8cbeda5d4b531a059a4c.tar.bz2
android-node-v8-4fbd3757244c84c9ac1b8cbeda5d4b531a059a4c.zip
deps: upgrade to V8 5.0.71.33
This picks up the fix for harmony-regexp-properties being enabled without a flag. V8-Commit: https://github.com/v8/v8/commit/27ac008 Fixes: https://github.com/nodejs/node/issues/6251 PR-URL: https://github.com/nodejs/node/pull/6290 Reviewed-By: jasnell - James M Snell <jasnell@gmail.com> Reviewed-By: ChALkeR - Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: indutny - Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: targos - Michaël Zasso <mic.besace@gmail.com> Reviewed-By: jbergstroem - Johan Bergström <bugs@bergstroem.nu> Reviewed-By: cjihrig - Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps')
-rw-r--r--deps/v8/include/v8-version.h2
-rw-r--r--deps/v8/src/regexp/regexp-parser.cc16
2 files changed, 11 insertions, 7 deletions
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
index 3d41a2cb3f..1c3e60f95e 100644
--- a/deps/v8/include/v8-version.h
+++ b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 5
#define V8_MINOR_VERSION 0
#define V8_BUILD_NUMBER 71
-#define V8_PATCH_LEVEL 32
+#define V8_PATCH_LEVEL 33
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/src/regexp/regexp-parser.cc b/deps/v8/src/regexp/regexp-parser.cc
index 2fe6fde82a..46c593c264 100644
--- a/deps/v8/src/regexp/regexp-parser.cc
+++ b/deps/v8/src/regexp/regexp-parser.cc
@@ -358,13 +358,17 @@ RegExpTree* RegExpParser::ParseDisjunction() {
uc32 p = Next();
Advance(2);
if (unicode()) {
- ZoneList<CharacterRange>* ranges = ParsePropertyClass();
- if (ranges == nullptr) {
- return ReportError(CStrVector("Invalid property name"));
+ if (FLAG_harmony_regexp_property) {
+ ZoneList<CharacterRange>* ranges = ParsePropertyClass();
+ if (ranges == nullptr) {
+ return ReportError(CStrVector("Invalid property name"));
+ }
+ RegExpCharacterClass* cc =
+ new (zone()) RegExpCharacterClass(ranges, p == 'P');
+ builder->AddCharacterClass(cc);
+ } else {
+ return ReportError(CStrVector("Invalid escape"));
}
- RegExpCharacterClass* cc =
- new (zone()) RegExpCharacterClass(ranges, p == 'P');
- builder->AddCharacterClass(cc);
} else {
builder->AddCharacter(p);
}