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

Side by Side Diff: runtime/vm/intermediate_language_ia32.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_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/dart_entry.h" 10 #include "vm/dart_entry.h"
(...skipping 2270 matching lines...) Expand 10 before | Expand all | Expand 10 after
2281 UNREACHABLE(); 2281 UNREACHABLE();
2282 return NULL; 2282 return NULL;
2283 } 2283 }
2284 2284
2285 2285
2286 void CatchBlockEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) { 2286 void CatchBlockEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
2287 __ Bind(compiler->GetJumpLabel(this)); 2287 __ Bind(compiler->GetJumpLabel(this));
2288 compiler->AddExceptionHandler(catch_try_index(), 2288 compiler->AddExceptionHandler(catch_try_index(),
2289 try_index(), 2289 try_index(),
2290 compiler->assembler()->CodeSize(), 2290 compiler->assembler()->CodeSize(),
2291 catch_handler_types_); 2291 catch_handler_types_,
2292 needs_stacktrace());
2292 if (HasParallelMove()) { 2293 if (HasParallelMove()) {
2293 compiler->parallel_move_resolver()->EmitNativeCode(parallel_move()); 2294 compiler->parallel_move_resolver()->EmitNativeCode(parallel_move());
2294 } 2295 }
2295 2296
2296 // Restore ESP from EBP as we are coming from a throw and the code for 2297 // Restore ESP from EBP as we are coming from a throw and the code for
2297 // popping arguments has not been run. 2298 // popping arguments has not been run.
2298 const intptr_t fp_sp_dist = 2299 const intptr_t fp_sp_dist =
2299 (kFirstLocalSlotFromFp + 1 - compiler->StackSize()) * kWordSize; 2300 (kFirstLocalSlotFromFp + 1 - compiler->StackSize()) * kWordSize;
2300 ASSERT(fp_sp_dist <= 0); 2301 ASSERT(fp_sp_dist <= 0);
2301 __ leal(ESP, Address(EBP, fp_sp_dist)); 2302 __ leal(ESP, Address(EBP, fp_sp_dist));
(...skipping 2953 matching lines...) Expand 10 before | Expand all | Expand 10 after
5255 PcDescriptors::kOther, 5256 PcDescriptors::kOther,
5256 locs()); 5257 locs());
5257 __ Drop(2); // Discard type arguments and receiver. 5258 __ Drop(2); // Discard type arguments and receiver.
5258 } 5259 }
5259 5260
5260 } // namespace dart 5261 } // namespace dart
5261 5262
5262 #undef __ 5263 #undef __
5263 5264
5264 #endif // defined TARGET_ARCH_IA32 5265 #endif // defined TARGET_ARCH_IA32
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698