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

Side by Side Diff: vm/dart_api_state.h

Issue 12118002: Fix for issue-7157 - set the stack marker in the top API local scope just before entering dart code… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/
Patch Set: Created 7 years, 10 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 | « vm/dart_api_impl.cc ('k') | no next file » | 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 #ifndef VM_DART_API_STATE_H_ 5 #ifndef VM_DART_API_STATE_H_
6 #define VM_DART_API_STATE_H_ 6 #define VM_DART_API_STATE_H_
7 7
8 #include "include/dart_api.h" 8 #include "include/dart_api.h"
9 9
10 #include "platform/thread.h" 10 #include "platform/thread.h"
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 } 562 }
563 563
564 WeakReferenceSet* delayed_weak_reference_sets() { 564 WeakReferenceSet* delayed_weak_reference_sets() {
565 return delayed_weak_reference_sets_; 565 return delayed_weak_reference_sets_;
566 } 566 }
567 void set_delayed_weak_reference_sets(WeakReferenceSet* reference_set) { 567 void set_delayed_weak_reference_sets(WeakReferenceSet* reference_set) {
568 delayed_weak_reference_sets_ = reference_set; 568 delayed_weak_reference_sets_ = reference_set;
569 } 569 }
570 570
571 void UnwindScopes(uword sp) { 571 void UnwindScopes(uword sp) {
572 while (top_scope_ != NULL && top_scope_->stack_marker() < sp) { 572 while (top_scope_ != NULL &&
573 top_scope_->stack_marker() != 0 &&
574 top_scope_->stack_marker() <= sp) {
573 ApiLocalScope* scope = top_scope_; 575 ApiLocalScope* scope = top_scope_;
574 top_scope_ = top_scope_->previous(); 576 top_scope_ = top_scope_->previous();
575 delete scope; 577 delete scope;
576 } 578 }
577 } 579 }
578 580
579 void VisitObjectPointers(ObjectPointerVisitor* visitor, 581 void VisitObjectPointers(ObjectPointerVisitor* visitor,
580 bool visit_prologue_weak_handles) { 582 bool visit_prologue_weak_handles) {
581 ApiLocalScope* scope = top_scope_; 583 ApiLocalScope* scope = top_scope_;
582 while (scope != NULL) { 584 while (scope != NULL) {
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 ApiNativeScope::Current()->zone()) {} 736 ApiNativeScope::Current()->zone()) {}
735 ApiGrowableArray() 737 ApiGrowableArray()
736 : BaseGrowableArray<T, ValueObject>( 738 : BaseGrowableArray<T, ValueObject>(
737 ApiNativeScope::Current()->zone()) {} 739 ApiNativeScope::Current()->zone()) {}
738 }; 740 };
739 741
740 742
741 } // namespace dart 743 } // namespace dart
742 744
743 #endif // VM_DART_API_STATE_H_ 745 #endif // VM_DART_API_STATE_H_
OLDNEW
« no previous file with comments | « vm/dart_api_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698