Chromium Code Reviews| Index: runtime/vm/object.cc |
| diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc |
| index db1f6953eb9561c5a62e9f166e2645bdeee8411e..324c8dc4b06f3f96b1e6174e33a5b7049adc6c40 100644 |
| --- a/runtime/vm/object.cc |
| +++ b/runtime/vm/object.cc |
| @@ -5290,6 +5290,9 @@ const char* Function::KindToCString(RawFunction::Kind kind) { |
| case RawFunction::kInvokeFieldDispatcher: |
| return "kInvokeFieldDispatcher"; |
| break; |
| + case RawFunction::kIrregexpFunction: |
| + return "kIrregexpFunction"; |
| + break; |
| default: |
| UNREACHABLE(); |
| return NULL; |
| @@ -5375,6 +5378,21 @@ void Function::set_owner(const Object& value) const { |
| } |
| +RawJSRegExp* Function::regexp() const { |
| + ASSERT(kind() == RawFunction::kIrregexpFunction); |
| + const Object& obj = Object::Handle(raw_ptr()->data_); |
| + ASSERT(obj.IsJSRegExp()); |
| + return JSRegExp::Cast(obj).raw(); |
| +} |
| + |
| + |
| +void Function::set_regexp(const JSRegExp& value) const { |
| + ASSERT(kind() == RawFunction::kIrregexpFunction); |
| + ASSERT(raw_ptr()->data_ == Object::null()); |
| + set_data(value); |
| +} |
| + |
| + |
| void Function::set_result_type(const AbstractType& value) const { |
| ASSERT(!value.IsNull()); |
| StorePointer(&raw_ptr()->result_type_, value.raw()); |
| @@ -6693,6 +6711,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(); |
| } |
| @@ -10369,6 +10390,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())); |
| @@ -19978,6 +20000,23 @@ 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; |
|
Vyacheslav Egorov (Google)
2014/10/07 15:48:30
I suggest make formatting more uniform
case kOneB
jgruber1
2014/10/07 17:16:51
Done.
|
| + 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()); |
|
Vyacheslav Egorov (Google)
2014/10/07 15:48:30
You can make JSRegExp a friend class of Instance a
jgruber1
2014/10/07 17:16:51
Done.
|
| +} |
| + |
| + |
| void JSRegExp::set_num_bracket_expressions(intptr_t value) const { |
| StoreSmi(&raw_ptr()->num_bracket_expressions_, Smi::New(value)); |
| } |