Chromium Code Reviews| Index: runtime/vm/object.cc |
| diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc |
| index 5825d87cf6cbf8e05343b6e04ad745a60ab4018d..5987b154f82d5126b4e7286158d5f333cb03d8bc 100644 |
| --- a/runtime/vm/object.cc |
| +++ b/runtime/vm/object.cc |
| @@ -5381,6 +5381,9 @@ const char* Function::KindToCString(RawFunction::Kind kind) { |
| case RawFunction::kInvokeFieldDispatcher: |
| return "kInvokeFieldDispatcher"; |
| break; |
| + case RawFunction::kIrregexpFunction: |
| + return "kIrregexpFunction"; |
| + break; |
| default: |
| UNREACHABLE(); |
| return NULL; |
| @@ -5466,6 +5469,12 @@ void Function::set_owner(const Object& value) const { |
| } |
| +void Function::set_regexp(const JSRegExp& value) const { |
| + ASSERT(!value.IsNull()); |
| + StorePointer(&raw_ptr()->regexp_, value.raw()); |
| +} |
| + |
| + |
| void Function::set_result_type(const AbstractType& value) const { |
| ASSERT(!value.IsNull()); |
| StorePointer(&raw_ptr()->result_type_, value.raw()); |
| @@ -6782,6 +6791,9 @@ const char* Function::ToCString() const { |
| case RawFunction::kInvokeFieldDispatcher: |
| kind_str = "invoke-field-dispatcher"; |
| break; |
| + case RawFunction::kIrregexpFunction: |
| + kind_str = "irregexp-function"; |
| + break; |
| default: |
| UNREACHABLE(); |
| } |
| @@ -10441,6 +10453,7 @@ void Library::CheckFunctionFingerprints() { |
| all_libs.Add(&Library::ZoneHandle(Library::CoreLibrary())); |
| CORE_LIB_INTRINSIC_LIST(CHECK_FINGERPRINTS); |
| + CORE_REGEXP_LIB_INTRINSIC_LIST(CHECK_FINGERPRINTS); |
| CORE_INTEGER_LIB_INTRINSIC_LIST(CHECK_FINGERPRINTS); |
| all_libs.Add(&Library::ZoneHandle(Library::MathLibrary())); |
| @@ -20032,6 +20045,41 @@ void JSRegExp::set_pattern(const String& pattern) const { |
| } |
| +void JSRegExp::set_function(intptr_t cid, const Function& value) { |
| + RawFunction** dest = NULL; |
| + switch (cid) { |
| + case kOneByteStringCid: dest = &raw_ptr()->one_byte_function_; break; |
|
Florian Schneider
2014/10/01 17:04:15
break lines after if there is more than one statem
|
| + case kTwoByteStringCid: dest = &raw_ptr()->two_byte_function_; break; |
| + case kExternalOneByteStringCid: |
| + dest = &raw_ptr()->external_one_byte_function_; break; |
| + case kExternalTwoByteStringCid: |
| + dest = &raw_ptr()->external_two_byte_function_; break; |
| + default: UNREACHABLE(); |
| + } |
| + ASSERT(dest != NULL); |
| + |
| + StorePointer(dest, value.raw()); |
| +} |
| + |
| + |
| +void JSRegExp::set_sample_subject(intptr_t cid, const String& value) const { |
| + RawString** dest = NULL; |
| + switch (cid) { |
| + case kOneByteStringCid: dest = &raw_ptr()->one_byte_subject_; break; |
|
Florian Schneider
2014/10/01 17:04:15
Also here.
|
| + case kTwoByteStringCid: dest = &raw_ptr()->two_byte_subject_; break; |
| + case kExternalOneByteStringCid: |
| + dest = &raw_ptr()->external_one_byte_subject_; break; |
| + case kExternalTwoByteStringCid: |
| + dest = &raw_ptr()->external_two_byte_subject_; break; |
| + default: UNREACHABLE(); |
| + } |
| + ASSERT(dest != NULL); |
| + |
| + StorePointer(dest, value.raw()); |
| +} |
| + |
| + |
| + |
| void JSRegExp::set_num_bracket_expressions(intptr_t value) const { |
| raw_ptr()->num_bracket_expressions_ = Smi::New(value); |
| } |