Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 #include "vm/intermediate_language.h" | 5 #include "vm/intermediate_language.h" |
| 6 | 6 |
| 7 #include "vm/bit_vector.h" | 7 #include "vm/bit_vector.h" |
| 8 #include "vm/bootstrap.h" | 8 #include "vm/bootstrap.h" |
| 9 #include "vm/compiler.h" | 9 #include "vm/compiler.h" |
| 10 #include "vm/constant_propagator.h" | 10 #include "vm/constant_propagator.h" |
| (...skipping 3311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3322 #else | 3322 #else |
| 3323 const Array& arguments_descriptor = | 3323 const Array& arguments_descriptor = |
| 3324 (ic_data() == NULL) ? | 3324 (ic_data() == NULL) ? |
| 3325 Array::Handle(ArgumentsDescriptor::New(ArgumentCount(), | 3325 Array::Handle(ArgumentsDescriptor::New(ArgumentCount(), |
| 3326 argument_names())) : | 3326 argument_names())) : |
| 3327 Array::Handle(ic_data()->arguments_descriptor()); | 3327 Array::Handle(ic_data()->arguments_descriptor()); |
| 3328 const intptr_t argdesc_kidx = __ AddConstant(arguments_descriptor); | 3328 const intptr_t argdesc_kidx = __ AddConstant(arguments_descriptor); |
| 3329 | 3329 |
| 3330 __ PushConstant(function()); | 3330 __ PushConstant(function()); |
| 3331 __ StaticCall(ArgumentCount(), argdesc_kidx); | 3331 __ StaticCall(ArgumentCount(), argdesc_kidx); |
| 3332 compiler->AddCurrentDescriptor(RawPcDescriptors::kUnoptStaticCall, | 3332 RawPcDescriptors::Kind kind = (compiler->is_optimizing()) |
|
zra
2016/06/24 22:37:49
Fixing this doesn't stop the assert from being hit
| |
| 3333 deopt_id(), | 3333 ? RawPcDescriptors::kOther |
| 3334 token_pos()); | 3334 : RawPcDescriptors::kUnoptStaticCall; |
| 3335 compiler->AddCurrentDescriptor(kind, deopt_id(), token_pos()); | |
| 3335 | 3336 |
| 3336 compiler->RecordAfterCall(this); | 3337 compiler->RecordAfterCall(this); |
| 3337 | 3338 |
| 3338 if (compiler->is_optimizing()) { | 3339 if (compiler->is_optimizing()) { |
| 3340 compiler->AddStaticCallTarget(function()); | |
| 3339 __ PopLocal(locs()->out(0).reg()); | 3341 __ PopLocal(locs()->out(0).reg()); |
| 3340 } | 3342 } |
| 3341 #endif // !defined(TARGET_ARCH_DBC) | 3343 #endif // !defined(TARGET_ARCH_DBC) |
| 3342 } | 3344 } |
| 3343 | 3345 |
| 3344 | 3346 |
| 3345 void AssertAssignableInstr::EmitNativeCode(FlowGraphCompiler* compiler) { | 3347 void AssertAssignableInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
| 3346 compiler->GenerateAssertAssignable(token_pos(), | 3348 compiler->GenerateAssertAssignable(token_pos(), |
| 3347 deopt_id(), | 3349 deopt_id(), |
| 3348 dst_type(), | 3350 dst_type(), |
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3924 set_native_c_function(native_function); | 3926 set_native_c_function(native_function); |
| 3925 function().SetIsNativeAutoSetupScope(auto_setup_scope); | 3927 function().SetIsNativeAutoSetupScope(auto_setup_scope); |
| 3926 Dart_NativeEntryResolver resolver = library.native_entry_resolver(); | 3928 Dart_NativeEntryResolver resolver = library.native_entry_resolver(); |
| 3927 bool is_bootstrap_native = Bootstrap::IsBootstapResolver(resolver); | 3929 bool is_bootstrap_native = Bootstrap::IsBootstapResolver(resolver); |
| 3928 set_is_bootstrap_native(is_bootstrap_native); | 3930 set_is_bootstrap_native(is_bootstrap_native); |
| 3929 } | 3931 } |
| 3930 | 3932 |
| 3931 #undef __ | 3933 #undef __ |
| 3932 | 3934 |
| 3933 } // namespace dart | 3935 } // namespace dart |
| OLD | NEW |