| 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/globals.h" // Needed here to get TARGET_ARCH_IA32. | 5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32. |
| 6 #if defined(TARGET_ARCH_IA32) | 6 #if defined(TARGET_ARCH_IA32) |
| 7 | 7 |
| 8 #include "vm/intermediate_language.h" | 8 #include "vm/intermediate_language.h" |
| 9 | 9 |
| 10 #include "vm/compiler.h" | 10 #include "vm/compiler.h" |
| (...skipping 2530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2541 | 2541 |
| 2542 | 2542 |
| 2543 LocationSummary* CatchBlockEntryInstr::MakeLocationSummary(Zone* zone, | 2543 LocationSummary* CatchBlockEntryInstr::MakeLocationSummary(Zone* zone, |
| 2544 bool opt) const { | 2544 bool opt) const { |
| 2545 UNREACHABLE(); | 2545 UNREACHABLE(); |
| 2546 return NULL; | 2546 return NULL; |
| 2547 } | 2547 } |
| 2548 | 2548 |
| 2549 | 2549 |
| 2550 void CatchBlockEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) { | 2550 void CatchBlockEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
| 2551 // Ensure space for patching return sites for lazy deopt. | |
| 2552 if (!FLAG_precompiled_mode && compiler->is_optimizing()) { | |
| 2553 __ nop(CallPattern::pattern_length_in_bytes()); | |
| 2554 } | |
| 2555 __ Bind(compiler->GetJumpLabel(this)); | 2551 __ Bind(compiler->GetJumpLabel(this)); |
| 2556 compiler->AddExceptionHandler(catch_try_index(), | 2552 compiler->AddExceptionHandler(catch_try_index(), |
| 2557 try_index(), | 2553 try_index(), |
| 2558 compiler->assembler()->CodeSize(), | 2554 compiler->assembler()->CodeSize(), |
| 2559 catch_handler_types_, | 2555 catch_handler_types_, |
| 2560 needs_stacktrace()); | 2556 needs_stacktrace()); |
| 2561 // On lazy deoptimization we patch the optimized code here to enter the | 2557 // On lazy deoptimization we patch the optimized code here to enter the |
| 2562 // deoptimization stub. | 2558 // deoptimization stub. |
| 2563 const intptr_t deopt_id = Thread::ToDeoptAfter(GetDeoptId()); | 2559 const intptr_t deopt_id = Thread::ToDeoptAfter(GetDeoptId()); |
| 2564 if (compiler->is_optimizing()) { | 2560 if (compiler->is_optimizing()) { |
| (...skipping 4321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6886 __ Drop(1); | 6882 __ Drop(1); |
| 6887 __ popl(result); | 6883 __ popl(result); |
| 6888 } | 6884 } |
| 6889 | 6885 |
| 6890 | 6886 |
| 6891 } // namespace dart | 6887 } // namespace dart |
| 6892 | 6888 |
| 6893 #undef __ | 6889 #undef __ |
| 6894 | 6890 |
| 6895 #endif // defined TARGET_ARCH_IA32 | 6891 #endif // defined TARGET_ARCH_IA32 |
| OLD | NEW |