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

Side by Side Diff: runtime/vm/intermediate_language_arm.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_ARM. 5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM.
6 #if defined(TARGET_ARCH_ARM) 6 #if defined(TARGET_ARCH_ARM)
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 2179 matching lines...) Expand 10 before | Expand all | Expand 10 after
2190 UNREACHABLE(); 2190 UNREACHABLE();
2191 return NULL; 2191 return NULL;
2192 } 2192 }
2193 2193
2194 2194
2195 void CatchBlockEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) { 2195 void CatchBlockEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
2196 __ Bind(compiler->GetJumpLabel(this)); 2196 __ Bind(compiler->GetJumpLabel(this));
2197 compiler->AddExceptionHandler(catch_try_index(), 2197 compiler->AddExceptionHandler(catch_try_index(),
2198 try_index(), 2198 try_index(),
2199 compiler->assembler()->CodeSize(), 2199 compiler->assembler()->CodeSize(),
2200 catch_handler_types_); 2200 catch_handler_types_,
2201 needs_stacktrace());
2201 2202
2202 // Restore the pool pointer. 2203 // Restore the pool pointer.
2203 __ LoadPoolPointer(); 2204 __ LoadPoolPointer();
2204 2205
2205 if (HasParallelMove()) { 2206 if (HasParallelMove()) {
2206 compiler->parallel_move_resolver()->EmitNativeCode(parallel_move()); 2207 compiler->parallel_move_resolver()->EmitNativeCode(parallel_move());
2207 } 2208 }
2208 2209
2209 // Restore SP from FP as we are coming from a throw and the code for 2210 // Restore SP from FP as we are coming from a throw and the code for
2210 // popping arguments has not been run. 2211 // popping arguments has not been run.
(...skipping 2479 matching lines...) Expand 10 before | Expand all | Expand 10 after
4690 compiler->GenerateCall(token_pos(), 4691 compiler->GenerateCall(token_pos(),
4691 &label, 4692 &label,
4692 PcDescriptors::kOther, 4693 PcDescriptors::kOther,
4693 locs()); 4694 locs());
4694 __ Drop(2); // Discard type arguments and receiver. 4695 __ Drop(2); // Discard type arguments and receiver.
4695 } 4696 }
4696 4697
4697 } // namespace dart 4698 } // namespace dart
4698 4699
4699 #endif // defined TARGET_ARCH_ARM 4700 #endif // defined TARGET_ARCH_ARM
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698