Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Side by Side Diff: runtime/vm/intermediate_language_x64.cc

Issue 23445012: Mark exception handlers if they have a stacktrace specified. Do not build a stacktrace if the handl… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_X64. 5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_X64.
6 #if defined(TARGET_ARCH_X64) 6 #if defined(TARGET_ARCH_X64)
7 7
8 #include "vm/intermediate_language.h" 8 #include "vm/intermediate_language.h"
9 9
10 #include "vm/dart_entry.h" 10 #include "vm/dart_entry.h"
(...skipping 2211 matching lines...) Expand 10 before | Expand all | Expand 10 after
2222 UNREACHABLE(); 2222 UNREACHABLE();
2223 return NULL; 2223 return NULL;
2224 } 2224 }
2225 2225
2226 2226
2227 void CatchBlockEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) { 2227 void CatchBlockEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
2228 __ Bind(compiler->GetJumpLabel(this)); 2228 __ Bind(compiler->GetJumpLabel(this));
2229 compiler->AddExceptionHandler(catch_try_index(), 2229 compiler->AddExceptionHandler(catch_try_index(),
2230 try_index(), 2230 try_index(),
2231 compiler->assembler()->CodeSize(), 2231 compiler->assembler()->CodeSize(),
2232 catch_handler_types_); 2232 catch_handler_types_,
2233 needs_stacktrace());
2233 if (HasParallelMove()) { 2234 if (HasParallelMove()) {
2234 compiler->parallel_move_resolver()->EmitNativeCode(parallel_move()); 2235 compiler->parallel_move_resolver()->EmitNativeCode(parallel_move());
2235 } 2236 }
2236 2237
2237 // Restore RSP from RBP as we are coming from a throw and the code for 2238 // Restore RSP from RBP as we are coming from a throw and the code for
2238 // popping arguments has not been run. 2239 // popping arguments has not been run.
2239 const intptr_t fp_sp_dist = 2240 const intptr_t fp_sp_dist =
2240 (kFirstLocalSlotFromFp + 1 - compiler->StackSize()) * kWordSize; 2241 (kFirstLocalSlotFromFp + 1 - compiler->StackSize()) * kWordSize;
2241 ASSERT(fp_sp_dist <= 0); 2242 ASSERT(fp_sp_dist <= 0);
2242 __ leaq(RSP, Address(RBP, fp_sp_dist)); 2243 __ leaq(RSP, Address(RBP, fp_sp_dist));
(...skipping 2628 matching lines...) Expand 10 before | Expand all | Expand 10 after
4871 PcDescriptors::kOther, 4872 PcDescriptors::kOther,
4872 locs()); 4873 locs());
4873 __ Drop(2); // Discard type arguments and receiver. 4874 __ Drop(2); // Discard type arguments and receiver.
4874 } 4875 }
4875 4876
4876 } // namespace dart 4877 } // namespace dart
4877 4878
4878 #undef __ 4879 #undef __
4879 4880
4880 #endif // defined TARGET_ARCH_X64 4881 #endif // defined TARGET_ARCH_X64
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698