Chromium Code Reviews| Index: runtime/vm/flow_graph_type_propagator.cc |
| diff --git a/runtime/vm/flow_graph_type_propagator.cc b/runtime/vm/flow_graph_type_propagator.cc |
| index 0501f6a944faa1ea535e2d1ad5a2cee2c6c317cb..12248d9667b24a2a89444a5f3b63b434f4a6eda7 100644 |
| --- a/runtime/vm/flow_graph_type_propagator.cc |
| +++ b/runtime/vm/flow_graph_type_propagator.cc |
| @@ -7,6 +7,7 @@ |
| #include "vm/cha.h" |
| #include "vm/bit_vector.h" |
| #include "vm/il_printer.h" |
| +#include "vm/regexp_assembler.h" |
| namespace dart { |
| @@ -714,6 +715,21 @@ CompileType ParameterInstr::ComputeType() const { |
| } |
| const Function& function = graph_entry->parsed_function().function(); |
| + if (function.IsIrregexpFunction()) { |
| + // In irregexp functions, types of input parameters are known and immutable. |
| + // Set parameter types here in order to prevent unnecessary CheckClassInstr |
| + // from being generated. |
| + switch (index()) { |
| + case RegExpMacroAssembler::kParamStringIndex: |
| + return CompileType::FromCid(function.regexp_specialization()); |
| + case RegExpMacroAssembler::kParamStartOffsetIndex: |
| + return CompileType::FromCid(kSmiCid); |
| + default: UNREACHABLE(); |
| + } |
| + UNREACHABLE(); |
| + return CompileType::Dynamic(); |
| + } |
| + |
| LocalScope* scope = graph_entry->parsed_function().node_sequence()->scope(); |
| const AbstractType& type = scope->VariableAt(index())->type(); |
| @@ -1288,6 +1304,11 @@ CompileType MathMinMaxInstr::ComputeType() const { |
| } |
| +CompileType CaseInsensitiveCompareUC16Instr::ComputeType() const { |
| + return CompileType::FromCid(kSmiCid); |
|
Florian Schneider
2014/10/01 17:04:14
The return type is Bool, not Smi.
jgruber1
2014/10/03 18:59:52
Done.
|
| +} |
| + |
| + |
| CompileType UnboxDoubleInstr::ComputeType() const { |
| return CompileType::FromCid(kDoubleCid); |
| } |