Index: src/runtime/runtime-i18n.cc |
diff --git a/src/runtime/runtime-i18n.cc b/src/runtime/runtime-i18n.cc |
index f6f526ded289086460bc912a94f5bb12cec10142..7554f99cbb7dd8f46cabe846db49e966173607bd 100644 |
--- a/src/runtime/runtime-i18n.cc |
+++ b/src/runtime/runtime-i18n.cc |
@@ -359,11 +359,6 @@ RUNTIME_FUNCTION(Runtime_CreateDateTimeFormat) { |
local_object->SetInternalField(0, reinterpret_cast<Smi*>(date_format)); |
- Factory* factory = isolate->factory(); |
- Handle<String> key = factory->NewStringFromStaticChars("dateFormat"); |
- Handle<String> value = factory->NewStringFromStaticChars("valid"); |
- JSObject::AddProperty(local_object, key, value, NONE); |
- |
// Make object handle weak so we can delete the data format once GC kicks in. |
Handle<Object> wrapper = isolate->global_handles()->Create(*local_object); |
GlobalHandles::MakeWeak(wrapper.location(), wrapper.location(), |
@@ -386,7 +381,7 @@ RUNTIME_FUNCTION(Runtime_InternalDateFormat) { |
icu::SimpleDateFormat* date_format = |
DateFormat::UnpackDateFormat(isolate, date_format_holder); |
- if (!date_format) return isolate->ThrowIllegalOperation(); |
+ CHECK_NOT_NULL(date_format); |
icu::UnicodeString result; |
date_format->format(value->Number(), result); |
@@ -487,7 +482,7 @@ RUNTIME_FUNCTION(Runtime_InternalDateFormatToParts) { |
icu::SimpleDateFormat* date_format = |
DateFormat::UnpackDateFormat(isolate, date_format_holder); |
- if (!date_format) return isolate->ThrowIllegalOperation(); |
+ CHECK_NOT_NULL(date_format); |
icu::UnicodeString formatted; |
icu::FieldPositionIterator fp_iter; |
@@ -556,11 +551,6 @@ RUNTIME_FUNCTION(Runtime_CreateNumberFormat) { |
local_object->SetInternalField(0, reinterpret_cast<Smi*>(number_format)); |
- Factory* factory = isolate->factory(); |
- Handle<String> key = factory->NewStringFromStaticChars("numberFormat"); |
- Handle<String> value = factory->NewStringFromStaticChars("valid"); |
- JSObject::AddProperty(local_object, key, value, NONE); |
- |
Handle<Object> wrapper = isolate->global_handles()->Create(*local_object); |
GlobalHandles::MakeWeak(wrapper.location(), wrapper.location(), |
NumberFormat::DeleteNumberFormat, |
@@ -582,7 +572,7 @@ RUNTIME_FUNCTION(Runtime_InternalNumberFormat) { |
icu::DecimalFormat* number_format = |
NumberFormat::UnpackNumberFormat(isolate, number_format_holder); |
- if (!number_format) return isolate->ThrowIllegalOperation(); |
+ CHECK_NOT_NULL(number_format); |
icu::UnicodeString result; |
number_format->format(value->Number(), result); |
@@ -618,11 +608,6 @@ RUNTIME_FUNCTION(Runtime_CreateCollator) { |
local_object->SetInternalField(0, reinterpret_cast<Smi*>(collator)); |
- Factory* factory = isolate->factory(); |
- Handle<String> key = factory->NewStringFromStaticChars("collator"); |
- Handle<String> value = factory->NewStringFromStaticChars("valid"); |
- JSObject::AddProperty(local_object, key, value, NONE); |
- |
Handle<Object> wrapper = isolate->global_handles()->Create(*local_object); |
GlobalHandles::MakeWeak(wrapper.location(), wrapper.location(), |
Collator::DeleteCollator, |
@@ -641,7 +626,7 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) { |
CONVERT_ARG_HANDLE_CHECKED(String, string2, 2); |
icu::Collator* collator = Collator::UnpackCollator(isolate, collator_holder); |
- if (!collator) return isolate->ThrowIllegalOperation(); |
+ CHECK_NOT_NULL(collator); |
string1 = String::Flatten(string1); |
string2 = String::Flatten(string2); |
@@ -753,11 +738,6 @@ RUNTIME_FUNCTION(Runtime_CreateBreakIterator) { |
// Make sure that the pointer to adopted text is NULL. |
local_object->SetInternalField(1, static_cast<Smi*>(nullptr)); |
- Factory* factory = isolate->factory(); |
- Handle<String> key = factory->NewStringFromStaticChars("breakIterator"); |
- Handle<String> value = factory->NewStringFromStaticChars("valid"); |
- JSObject::AddProperty(local_object, key, value, NONE); |
- |
// Make object handle weak so we can delete the break iterator once GC kicks |
// in. |
Handle<Object> wrapper = isolate->global_handles()->Create(*local_object); |
@@ -778,7 +758,7 @@ RUNTIME_FUNCTION(Runtime_BreakIteratorAdoptText) { |
icu::BreakIterator* break_iterator = |
BreakIterator::UnpackBreakIterator(isolate, break_iterator_holder); |
- if (!break_iterator) return isolate->ThrowIllegalOperation(); |
+ CHECK_NOT_NULL(break_iterator); |
icu::UnicodeString* u_text = reinterpret_cast<icu::UnicodeString*>( |
break_iterator_holder->GetInternalField(1)); |
@@ -808,7 +788,7 @@ RUNTIME_FUNCTION(Runtime_BreakIteratorFirst) { |
icu::BreakIterator* break_iterator = |
BreakIterator::UnpackBreakIterator(isolate, break_iterator_holder); |
- if (!break_iterator) return isolate->ThrowIllegalOperation(); |
+ CHECK_NOT_NULL(break_iterator); |
return *isolate->factory()->NewNumberFromInt(break_iterator->first()); |
} |
@@ -823,7 +803,7 @@ RUNTIME_FUNCTION(Runtime_BreakIteratorNext) { |
icu::BreakIterator* break_iterator = |
BreakIterator::UnpackBreakIterator(isolate, break_iterator_holder); |
- if (!break_iterator) return isolate->ThrowIllegalOperation(); |
+ CHECK_NOT_NULL(break_iterator); |
return *isolate->factory()->NewNumberFromInt(break_iterator->next()); |
} |
@@ -838,7 +818,7 @@ RUNTIME_FUNCTION(Runtime_BreakIteratorCurrent) { |
icu::BreakIterator* break_iterator = |
BreakIterator::UnpackBreakIterator(isolate, break_iterator_holder); |
- if (!break_iterator) return isolate->ThrowIllegalOperation(); |
+ CHECK_NOT_NULL(break_iterator); |
return *isolate->factory()->NewNumberFromInt(break_iterator->current()); |
} |
@@ -853,7 +833,7 @@ RUNTIME_FUNCTION(Runtime_BreakIteratorBreakType) { |
icu::BreakIterator* break_iterator = |
BreakIterator::UnpackBreakIterator(isolate, break_iterator_holder); |
- if (!break_iterator) return isolate->ThrowIllegalOperation(); |
+ CHECK_NOT_NULL(break_iterator); |
// TODO(cira): Remove cast once ICU fixes base BreakIterator class. |
icu::RuleBasedBreakIterator* rule_based_iterator = |