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

Side by Side Diff: src/isolate.h

Issue 321763002: Don't clear exception pending message if we have externally TryCatch and finally on top of stack. (Closed) Base URL: git://github.com/v8/v8.git@master
Patch Set: Created 6 years, 6 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
« no previous file with comments | « no previous file | src/isolate.cc » ('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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef V8_ISOLATE_H_ 5 #ifndef V8_ISOLATE_H_
6 #define V8_ISOLATE_H_ 6 #define V8_ISOLATE_H_
7 7
8 #include "include/v8-debug.h" 8 #include "include/v8-debug.h"
9 #include "src/allocation.h" 9 #include "src/allocation.h"
10 #include "src/assert-scope.h" 10 #include "src/assert-scope.h"
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 } 597 }
598 bool has_scheduled_exception() { 598 bool has_scheduled_exception() {
599 ASSERT(!thread_local_top_.scheduled_exception_->IsException()); 599 ASSERT(!thread_local_top_.scheduled_exception_->IsException());
600 return thread_local_top_.scheduled_exception_ != heap_.the_hole_value(); 600 return thread_local_top_.scheduled_exception_ != heap_.the_hole_value();
601 } 601 }
602 void clear_scheduled_exception() { 602 void clear_scheduled_exception() {
603 ASSERT(!thread_local_top_.scheduled_exception_->IsException()); 603 ASSERT(!thread_local_top_.scheduled_exception_->IsException());
604 thread_local_top_.scheduled_exception_ = heap_.the_hole_value(); 604 thread_local_top_.scheduled_exception_ = heap_.the_hole_value();
605 } 605 }
606 606
607 bool IsExternallyCaught(); 607 bool HasExternalTryCatch();
608 bool IsFinallyOnTop();
608 609
609 bool is_catchable_by_javascript(Object* exception) { 610 bool is_catchable_by_javascript(Object* exception) {
610 return exception != heap()->termination_exception(); 611 return exception != heap()->termination_exception();
611 } 612 }
612 613
613 // Serializer. 614 // Serializer.
614 void PushToPartialSnapshotCache(Object* obj); 615 void PushToPartialSnapshotCache(Object* obj);
615 616
616 // JS execution stack (see frames.h). 617 // JS execution stack (see frames.h).
617 static Address c_entry_fp(ThreadLocalTop* thread) { 618 static Address c_entry_fp(ThreadLocalTop* thread) {
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
1172 1173
1173 void InitializeThreadLocal(); 1174 void InitializeThreadLocal();
1174 1175
1175 void MarkCompactPrologue(bool is_compacting, 1176 void MarkCompactPrologue(bool is_compacting,
1176 ThreadLocalTop* archived_thread_data); 1177 ThreadLocalTop* archived_thread_data);
1177 void MarkCompactEpilogue(bool is_compacting, 1178 void MarkCompactEpilogue(bool is_compacting,
1178 ThreadLocalTop* archived_thread_data); 1179 ThreadLocalTop* archived_thread_data);
1179 1180
1180 void FillCache(); 1181 void FillCache();
1181 1182
1182 void PropagatePendingExceptionToExternalTryCatch(); 1183 // Propagate pending exception message to the v8::TryCatch.
1184 // If there is no external try-catch or message was successfully propagated,
1185 // then return true.
1186 bool PropagatePendingExceptionToExternalTryCatch();
1183 1187
1184 // Traverse prototype chain to find out whether the object is derived from 1188 // Traverse prototype chain to find out whether the object is derived from
1185 // the Error object. 1189 // the Error object.
1186 bool IsErrorObject(Handle<Object> obj); 1190 bool IsErrorObject(Handle<Object> obj);
1187 1191
1188 base::Atomic32 id_; 1192 base::Atomic32 id_;
1189 EntryStackItem* entry_stack_; 1193 EntryStackItem* entry_stack_;
1190 int stack_trace_nesting_level_; 1194 int stack_trace_nesting_level_;
1191 StringStream* incomplete_message_; 1195 StringStream* incomplete_message_;
1192 Address isolate_addresses_[kIsolateAddressCount + 1]; // NOLINT 1196 Address isolate_addresses_[kIsolateAddressCount + 1]; // NOLINT
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
1489 } 1493 }
1490 1494
1491 EmbeddedVector<char, 128> filename_; 1495 EmbeddedVector<char, 128> filename_;
1492 FILE* file_; 1496 FILE* file_;
1493 int scope_depth_; 1497 int scope_depth_;
1494 }; 1498 };
1495 1499
1496 } } // namespace v8::internal 1500 } } // namespace v8::internal
1497 1501
1498 #endif // V8_ISOLATE_H_ 1502 #endif // V8_ISOLATE_H_
OLDNEW
« no previous file with comments | « no previous file | src/isolate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698