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

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

Issue 23691024: If a rethrow is encountered in the catch block, then its handler must be marked that it needs stack… (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
« no previous file with comments | « runtime/vm/intermediate_language_x64.cc ('k') | tests/language/stack_trace_test.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, 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/parser.h" 5 #include "vm/parser.h"
6 6
7 #include "lib/invocation_mirror.h" 7 #include "lib/invocation_mirror.h"
8 #include "vm/bigint_operations.h" 8 #include "vm/bigint_operations.h"
9 #include "vm/bootstrap.h" 9 #include "vm/bootstrap.h"
10 #include "vm/class_finalizer.h" 10 #include "vm/class_finalizer.h"
(...skipping 6669 matching lines...) Expand 10 before | Expand all | Expand 10 after
6680 handler_types.SetLength(0); 6680 handler_types.SetLength(0);
6681 handler_types.Add(*exception_param.type); 6681 handler_types.Add(*exception_param.type);
6682 } 6682 }
6683 SequenceNode* catch_clause = CloseBlock(); 6683 SequenceNode* catch_clause = CloseBlock();
6684 6684
6685 // Add this individual catch handler to the catch handlers list. 6685 // Add this individual catch handler to the catch handlers list.
6686 current_block_->statements->Add(catch_clause); 6686 current_block_->statements->Add(catch_clause);
6687 } 6687 }
6688 catch_handler_list = CloseBlock(); 6688 catch_handler_list = CloseBlock();
6689 TryBlocks* inner_try_block = PopTryBlock(); 6689 TryBlocks* inner_try_block = PopTryBlock();
6690 intptr_t try_index = inner_try_block->try_index(); 6690 const intptr_t try_index = inner_try_block->try_index();
6691 TryBlocks* outer_try_block = try_blocks_list_; 6691 TryBlocks* outer_try_block = try_blocks_list_;
6692 intptr_t outer_try_index = (outer_try_block != NULL) 6692 const intptr_t outer_try_index = (outer_try_block != NULL)
6693 ? outer_try_block->try_index() 6693 ? outer_try_block->try_index()
6694 : CatchClauseNode::kInvalidTryIndex; 6694 : CatchClauseNode::kInvalidTryIndex;
6695 6695
6696 // Finally parse the 'finally' block. 6696 // Finally parse the 'finally' block.
6697 SequenceNode* finally_block = NULL; 6697 SequenceNode* finally_block = NULL;
6698 if (CurrentToken() == Token::kFINALLY) { 6698 if (CurrentToken() == Token::kFINALLY) {
6699 current_function().set_has_finally(true); 6699 current_function().set_has_finally(true);
6700 ConsumeToken(); // Consume the 'finally'. 6700 ConsumeToken(); // Consume the 'finally'.
6701 const intptr_t finally_pos = TokenPos(); 6701 const intptr_t finally_pos = TokenPos();
6702 // Add the finally block to the exit points recorded so far. 6702 // Add the finally block to the exit points recorded so far.
(...skipping 3789 matching lines...) Expand 10 before | Expand all | Expand 10 after
10492 void Parser::SkipQualIdent() { 10492 void Parser::SkipQualIdent() {
10493 ASSERT(IsIdentifier()); 10493 ASSERT(IsIdentifier());
10494 ConsumeToken(); 10494 ConsumeToken();
10495 if (CurrentToken() == Token::kPERIOD) { 10495 if (CurrentToken() == Token::kPERIOD) {
10496 ConsumeToken(); // Consume the kPERIOD token. 10496 ConsumeToken(); // Consume the kPERIOD token.
10497 ExpectIdentifier("identifier expected after '.'"); 10497 ExpectIdentifier("identifier expected after '.'");
10498 } 10498 }
10499 } 10499 }
10500 10500
10501 } // namespace dart 10501 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/intermediate_language_x64.cc ('k') | tests/language/stack_trace_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698