Index: src/bootstrapper.cc |
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc |
index 9b1399e1cbdfdf8c26364eb91d9e3bc3f520033d..c26aa1de13f92d2efd5690fbf5a50bda4e3b25b9 100644 |
--- a/src/bootstrapper.cc |
+++ b/src/bootstrapper.cc |
@@ -1228,16 +1228,31 @@ |
Map::EnsureDescriptorSlack(initial_map, 5); |
{ |
- // ES6 21.2.3.2.1 |
- DataDescriptor field(factory->regexp_source_symbol(), |
+ // ECMA-262, section 15.10.7.1. |
+ DataDescriptor field(factory->source_string(), |
JSRegExp::kSourceFieldIndex, final, |
Representation::Tagged()); |
initial_map->AppendDescriptor(&field); |
} |
{ |
- DataDescriptor field(factory->regexp_flags_symbol(), |
- JSRegExp::kFlagsFieldIndex, final, |
- Representation::Smi()); |
+ // ECMA-262, section 15.10.7.2. |
+ DataDescriptor field(factory->global_string(), |
+ JSRegExp::kGlobalFieldIndex, final, |
+ Representation::Tagged()); |
+ initial_map->AppendDescriptor(&field); |
+ } |
+ { |
+ // ECMA-262, section 15.10.7.3. |
+ DataDescriptor field(factory->ignore_case_string(), |
+ JSRegExp::kIgnoreCaseFieldIndex, final, |
+ Representation::Tagged()); |
+ initial_map->AppendDescriptor(&field); |
+ } |
+ { |
+ // ECMA-262, section 15.10.7.4. |
+ DataDescriptor field(factory->multiline_string(), |
+ JSRegExp::kMultilineFieldIndex, final, |
+ Representation::Tagged()); |
initial_map->AppendDescriptor(&field); |
} |
{ |
@@ -2040,6 +2055,8 @@ |
isolate->factory()->ToBoolean(FLAG), NONE); \ |
} |
+ INITIALIZE_FLAG(FLAG_harmony_regexps) |
+ INITIALIZE_FLAG(FLAG_harmony_unicode_regexps) |
INITIALIZE_FLAG(FLAG_harmony_tostring) |
INITIALIZE_FLAG(FLAG_harmony_tolength) |