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

Side by Side Diff: src/api.cc

Issue 6461022: Merge a number of assertion failure fixes to the 3.0 branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.0/
Patch Set: '' Created 9 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 | « no previous file | src/arm/codegen-arm.cc » ('j') | src/ia32/macro-assembler-ia32.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 static i::HandleScopeImplementer thread_local; 108 static i::HandleScopeImplementer thread_local;
109 109
110 110
111 // --- E x c e p t i o n B e h a v i o r --- 111 // --- E x c e p t i o n B e h a v i o r ---
112 112
113 113
114 static FatalErrorCallback exception_behavior = NULL; 114 static FatalErrorCallback exception_behavior = NULL;
115 115
116 static void DefaultFatalErrorHandler(const char* location, 116 static void DefaultFatalErrorHandler(const char* location,
117 const char* message) { 117 const char* message) {
118 ENTER_V8; 118 #ifdef ENABLE_VMSTATE_TRACKING
119 i::VMState __state__(i::OTHER);
120 #endif
119 API_Fatal(location, message); 121 API_Fatal(location, message);
120 } 122 }
121 123
122 124
123 static FatalErrorCallback& GetFatalErrorHandler() { 125 static FatalErrorCallback& GetFatalErrorHandler() {
124 if (exception_behavior == NULL) { 126 if (exception_behavior == NULL) {
125 exception_behavior = DefaultFatalErrorHandler; 127 exception_behavior = DefaultFatalErrorHandler;
126 } 128 }
127 return exception_behavior; 129 return exception_behavior;
128 } 130 }
(...skipping 5031 matching lines...) Expand 10 before | Expand all | Expand 10 after
5160 5162
5161 5163
5162 char* HandleScopeImplementer::Iterate(ObjectVisitor* v, char* storage) { 5164 char* HandleScopeImplementer::Iterate(ObjectVisitor* v, char* storage) {
5163 HandleScopeImplementer* thread_local = 5165 HandleScopeImplementer* thread_local =
5164 reinterpret_cast<HandleScopeImplementer*>(storage); 5166 reinterpret_cast<HandleScopeImplementer*>(storage);
5165 thread_local->IterateThis(v); 5167 thread_local->IterateThis(v);
5166 return storage + ArchiveSpacePerThread(); 5168 return storage + ArchiveSpacePerThread();
5167 } 5169 }
5168 5170
5169 } } // namespace v8::internal 5171 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/arm/codegen-arm.cc » ('j') | src/ia32/macro-assembler-ia32.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698