Chromium Code Reviews| Index: src/builtins/builtins-regexp-gen.cc |
| diff --git a/src/builtins/builtins-regexp-gen.cc b/src/builtins/builtins-regexp-gen.cc |
| index 32aa2ce0d79bf20b5ff49766eaf9e675621679ce..0d9ec1c6e54c6f8810d6bc00c9d8513f06e817d1 100644 |
| --- a/src/builtins/builtins-regexp-gen.cc |
| +++ b/src/builtins/builtins-regexp-gen.cc |
| @@ -250,7 +250,7 @@ Node* RegExpBuiltinsAssembler::IrregexpExec(Node* const context, |
| CSA_ASSERT(this, TaggedIsNotSmi(string)); |
| CSA_ASSERT(this, IsString(string)); |
| - CSA_ASSERT(this, IsHeapNumberMap(LoadReceiverMap(last_index))); |
| + CSA_ASSERT(this, IsNumber(last_index)); |
| CSA_ASSERT(this, IsFixedArrayMap(LoadReceiverMap(match_info))); |
| Node* const int_zero = IntPtrConstant(0); |
| @@ -1532,13 +1532,11 @@ Node* RegExpBuiltinsAssembler::AdvanceStringIndex(Node* const string, |
| Node* const is_unicode, |
| bool is_fastpath) { |
| CSA_ASSERT(this, IsString(string)); |
| - CSA_ASSERT(this, IsHeapNumberMap(LoadReceiverMap(index))); |
| + CSA_ASSERT(this, IsNumber(index)); |
|
cbruni
2017/04/11 09:10:54
nit: not needed then as IsNumberNormalized => IsNu
jgruber
2017/04/11 09:54:58
Done.
|
| + CSA_ASSERT(this, IsNumberNormalized(index)); |
| if (is_fastpath) CSA_ASSERT(this, TaggedIsPositiveSmi(index)); |
| // Default to last_index + 1. |
| - // Smi range. |
| - |
| - // Default to last_index + 1. |
| Node* const index_plus_one = NumberInc(index); |
| VARIABLE(var_result, MachineRepresentation::kTagged, index_plus_one); |
| @@ -2356,7 +2354,7 @@ TF_BUILTIN(RegExpSplit, RegExpBuiltinsAssembler) { |
| { |
| // The runtime call passes in limit to ensure the second ToUint32(limit) |
| // call is not observable. |
| - CSA_ASSERT(this, IsHeapNumberMap(LoadReceiverMap(limit))); |
| + CSA_ASSERT(this, IsNumber(limit)); |
| Return(CallRuntime(Runtime::kRegExpSplit, context, regexp, string, limit)); |
| } |
| } |