diff --git a/src/regexp/regexp-parser.cc b/src/regexp/regexp-parser.cc index 7a8033a2d8..8b15dbf0db 100644 --- a/src/regexp/regexp-parser.cc +++ b/src/regexp/regexp-parser.cc @@ -1225,9 +1225,9 @@ bool IsSupportedBinaryProperty(UProperty property) { case UCHAR_DEPRECATED: case UCHAR_DIACRITIC: case UCHAR_EMOJI: - // TODO(yangguo): Uncomment this once we upgrade to ICU 60. - // See https://ssl.icu-project.org/trac/ticket/13062 - // case UCHAR_EMOJI_COMPONENT: +#if U_ICU_VERSION_MAJOR_NUM >= 60 + case UCHAR_EMOJI_COMPONENT: +#endif case UCHAR_EMOJI_MODIFIER_BASE: case UCHAR_EMOJI_MODIFIER: case UCHAR_EMOJI_PRESENTATION: diff --git a/test/mjsunit/harmony/regexp-property-binary.js b/test/mjsunit/harmony/regexp-property-binary.js index 8ab3f19329..760ab68e87 100644 --- a/test/mjsunit/harmony/regexp-property-binary.js +++ b/test/mjsunit/harmony/regexp-property-binary.js @@ -71,8 +71,8 @@ f(/\p{Dia}/u, "1"); t(/\p{Emoji}/u, "\u2603"); f(/\p{Emoji}/u, "x"); -// t(/\p{Emoji_Component}/u, "\u2603"); -// f(/\p{Emoji_Component}/u, "x"); +t(/\p{Emoji_Component}/u, "\u{1F1E6}"); +f(/\p{Emoji_Component}/u, "x"); t(/\p{Emoji_Modifier_Base}/u, "\u{1F6CC}"); f(/\p{Emoji_Modifier_Base}/u, "x"); diff --git a/test/test262/test262.status b/test/test262/test262.status index fcfcd18f14..4aae5903ed 100644 --- a/test/test262/test262.status +++ b/test/test262/test262.status @@ -438,9 +438,6 @@ 'built-ins/Object/internals/DefineOwnProperty/consistent-value-function-caller': [FAIL_SLOPPY], 'built-ins/Object/internals/DefineOwnProperty/consistent-value-function-arguments': [FAIL_SLOPPY], - # https://bugs.chromium.org/p/v8/issues/detail?id=4743#c28 - 'built-ins/RegExp/property-escapes/generated/Emoji_Component': [FAIL], - # ICU 59 uses Unicode 9 data; property escape tests were generated for Unicode 10 'built-ins/RegExp/property-escapes/generated/*': [SKIP],