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

Side by Side Diff: src/isolate.h

Issue 6665063: [Isolates] Fix the crash in AssertNoContextChange ctor when current context i... (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/isolates/
Patch Set: '' Created 9 years, 9 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 | 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 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 1162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1173 #endif 1173 #endif
1174 SaveContext* prev_; 1174 SaveContext* prev_;
1175 Address js_sp_; // The top JS frame's sp when saving context. 1175 Address js_sp_; // The top JS frame's sp when saving context.
1176 }; 1176 };
1177 1177
1178 1178
1179 class AssertNoContextChange BASE_EMBEDDED { 1179 class AssertNoContextChange BASE_EMBEDDED {
1180 #ifdef DEBUG 1180 #ifdef DEBUG
1181 public: 1181 public:
1182 AssertNoContextChange() : 1182 AssertNoContextChange() :
1183 context_(Isolate::Current()->context()) { 1183 scope_(Isolate::Current()),
1184 context_(Isolate::Current()->context(), Isolate::Current()) {
1184 } 1185 }
1185 1186
1186 ~AssertNoContextChange() { 1187 ~AssertNoContextChange() {
1187 ASSERT(Isolate::Current()->context() == *context_); 1188 ASSERT(Isolate::Current()->context() == *context_);
1188 } 1189 }
1189 1190
1190 private: 1191 private:
1191 HandleScope scope_; 1192 HandleScope scope_;
1192 Handle<Context> context_; 1193 Handle<Context> context_;
1193 #else 1194 #else
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 1295
1295 } } // namespace v8::internal 1296 } } // namespace v8::internal
1296 1297
1297 // TODO(isolates): Get rid of these -inl.h includes and place them only where 1298 // TODO(isolates): Get rid of these -inl.h includes and place them only where
1298 // they're needed. 1299 // they're needed.
1299 #include "allocation-inl.h" 1300 #include "allocation-inl.h"
1300 #include "zone-inl.h" 1301 #include "zone-inl.h"
1301 #include "frames-inl.h" 1302 #include "frames-inl.h"
1302 1303
1303 #endif // V8_ISOLATE_H_ 1304 #endif // V8_ISOLATE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698