Chromium Code Reviews| Index: runtime/vm/intermediate_language.cc |
| diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc |
| index cc5e51f9a91bec5a4dcc6b578d255df57b05aa9d..c2de24c15778367b6cc440b6a7608243c74f5a51 100644 |
| --- a/runtime/vm/intermediate_language.cc |
| +++ b/runtime/vm/intermediate_language.cc |
| @@ -3329,13 +3329,15 @@ void StaticCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
| __ PushConstant(function()); |
| __ StaticCall(ArgumentCount(), argdesc_kidx); |
| - compiler->AddCurrentDescriptor(RawPcDescriptors::kUnoptStaticCall, |
| - deopt_id(), |
| - token_pos()); |
| + RawPcDescriptors::Kind kind = (compiler->is_optimizing()) |
|
zra
2016/06/24 22:37:49
Fixing this doesn't stop the assert from being hit
|
| + ? RawPcDescriptors::kOther |
| + : RawPcDescriptors::kUnoptStaticCall; |
| + compiler->AddCurrentDescriptor(kind, deopt_id(), token_pos()); |
| compiler->RecordAfterCall(this); |
| if (compiler->is_optimizing()) { |
| + compiler->AddStaticCallTarget(function()); |
| __ PopLocal(locs()->out(0).reg()); |
| } |
| #endif // !defined(TARGET_ARCH_DBC) |