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

Side by Side Diff: src/isolate.h

Issue 318773006: Revert "V8 can clear exception pending message, when should not do this." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
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 | Annotate | Revision Log
« 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 HasExternalTryCatch(); 607 bool IsExternallyCaught();
608 bool IsFinallyOnTop();
609 608
610 bool is_catchable_by_javascript(Object* exception) { 609 bool is_catchable_by_javascript(Object* exception) {
611 return exception != heap()->termination_exception(); 610 return exception != heap()->termination_exception();
612 } 611 }
613 612
614 // Serializer. 613 // Serializer.
615 void PushToPartialSnapshotCache(Object* obj); 614 void PushToPartialSnapshotCache(Object* obj);
616 615
617 // JS execution stack (see frames.h). 616 // JS execution stack (see frames.h).
618 static Address c_entry_fp(ThreadLocalTop* thread) { 617 static Address c_entry_fp(ThreadLocalTop* thread) {
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
1173 1172
1174 void InitializeThreadLocal(); 1173 void InitializeThreadLocal();
1175 1174
1176 void MarkCompactPrologue(bool is_compacting, 1175 void MarkCompactPrologue(bool is_compacting,
1177 ThreadLocalTop* archived_thread_data); 1176 ThreadLocalTop* archived_thread_data);
1178 void MarkCompactEpilogue(bool is_compacting, 1177 void MarkCompactEpilogue(bool is_compacting,
1179 ThreadLocalTop* archived_thread_data); 1178 ThreadLocalTop* archived_thread_data);
1180 1179
1181 void FillCache(); 1180 void FillCache();
1182 1181
1183 // Propagate pending exception message to the v8::TryCatch. 1182 void PropagatePendingExceptionToExternalTryCatch();
1184 // If there is no external try-catch or message was successfully propagated,
1185 // then return true.
1186 bool PropagatePendingExceptionToExternalTryCatch();
1187 1183
1188 // Traverse prototype chain to find out whether the object is derived from 1184 // Traverse prototype chain to find out whether the object is derived from
1189 // the Error object. 1185 // the Error object.
1190 bool IsErrorObject(Handle<Object> obj); 1186 bool IsErrorObject(Handle<Object> obj);
1191 1187
1192 base::Atomic32 id_; 1188 base::Atomic32 id_;
1193 EntryStackItem* entry_stack_; 1189 EntryStackItem* entry_stack_;
1194 int stack_trace_nesting_level_; 1190 int stack_trace_nesting_level_;
1195 StringStream* incomplete_message_; 1191 StringStream* incomplete_message_;
1196 Address isolate_addresses_[kIsolateAddressCount + 1]; // NOLINT 1192 Address isolate_addresses_[kIsolateAddressCount + 1]; // NOLINT
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 } 1489 }
1494 1490
1495 EmbeddedVector<char, 128> filename_; 1491 EmbeddedVector<char, 128> filename_;
1496 FILE* file_; 1492 FILE* file_;
1497 int scope_depth_; 1493 int scope_depth_;
1498 }; 1494 };
1499 1495
1500 } } // namespace v8::internal 1496 } } // namespace v8::internal
1501 1497
1502 #endif // V8_ISOLATE_H_ 1498 #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