Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Unified Diff: runtime/vm/object.cc

Issue 683433003: Integrate the Irregexp Regular Expression Engine. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: byte-order assert & context-var Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index cd72ed11b146e53a90295474bfa349d7dd73289c..4c3bad73a00866e6950e86937a1017c054beb66a 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -5359,6 +5359,9 @@ const char* Function::KindToCString(RawFunction::Kind kind) {
case RawFunction::kInvokeFieldDispatcher:
return "kInvokeFieldDispatcher";
break;
+ case RawFunction::kIrregexpFunction:
+ return "kIrregexpFunction";
+ break;
default:
UNREACHABLE();
return NULL;
@@ -5444,6 +5447,30 @@ 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());
Ivan Posva 2014/11/05 07:55:09 The Cast below is executing this assertion exactly
zerny-google 2014/11/05 11:51:59 Removed the assert.
+ 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_regexp_cid(intptr_t regexp_cid) const {
+ ASSERT((regexp_cid == kIllegalCid) ||
+ (kind() == RawFunction::kIrregexpFunction));
+ ASSERT((regexp_cid == kIllegalCid) ||
+ RawObject::IsStringClassId(regexp_cid));
+ StoreNonPointer(&raw_ptr()->regexp_cid_, regexp_cid);
+}
+
+
void Function::set_result_type(const AbstractType& value) const {
ASSERT(!value.IsNull());
StorePointer(&raw_ptr()->result_type_, value.raw());
@@ -6124,6 +6151,7 @@ RawFunction* Function::New(const String& name,
result.set_num_optional_parameters(0);
result.set_usage_counter(0);
result.set_deoptimization_counter(0);
+ result.set_regexp_cid(kIllegalCid);
result.set_optimized_instruction_count(0);
result.set_optimized_call_site_count(0);
result.set_is_optimizable(is_native ? false : true);
@@ -6152,6 +6180,7 @@ RawFunction* Function::Clone(const Class& new_owner) const {
clone.ClearCode();
clone.set_usage_counter(0);
clone.set_deoptimization_counter(0);
+ clone.set_regexp_cid(kIllegalCid);
clone.set_optimized_instruction_count(0);
clone.set_optimized_call_site_count(0);
clone.set_ic_data_array(Array::Handle());
@@ -6704,6 +6733,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();
}
@@ -10380,6 +10412,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()));
@@ -19974,6 +20007,11 @@ void JSRegExp::set_pattern(const String& pattern) const {
}
+void JSRegExp::set_function(intptr_t cid, const Function& value) const {
+ StorePointer(FunctionAddr(cid), value.raw());
+}
+
+
void JSRegExp::set_num_bracket_expressions(intptr_t value) const {
StoreSmi(&raw_ptr()->num_bracket_expressions_, Smi::New(value));
}

Powered by Google App Engine
This is Rietveld 408576698