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

Unified Diff: vm/allocation.h

Issue 10008030: Inline the StackResource constructor/destructor. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/
Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | vm/allocation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: vm/allocation.h
===================================================================
--- vm/allocation.h (revision 6287)
+++ vm/allocation.h (working copy)
@@ -6,6 +6,7 @@
#define VM_ALLOCATION_H_
#include "platform/assert.h"
+#include "vm/base_isolate.h"
#include "vm/globals.h"
namespace dart {
@@ -36,17 +37,36 @@
// to a stack frame above the frame where these objects were allocated.
class StackResource {
public:
- explicit StackResource(Isolate* isolate);
- virtual ~StackResource();
+ explicit StackResource(BaseIsolate* isolate)
+ : isolate_(isolate), previous_(NULL) {
+ // We can only have longjumps and exceptions when there is a current
+ // isolate. If there is no current isolate, we don't need to
+ // protect this case.
+ if (isolate) {
+ previous_ = isolate->top_resource();
+ isolate->set_top_resource(this);
+ }
+ }
- Isolate* isolate() const { return isolate_; }
+ virtual ~StackResource() {
+ if (isolate()) {
+ StackResource* top = isolate()->top_resource();
+ ASSERT(top == this);
+ isolate()->set_top_resource(previous_);
+ }
+#if defined(DEBUG)
+ BaseIsolate::AssertCurrent(isolate());
+#endif
+ }
+ BaseIsolate* isolate() const { return isolate_; }
+
// The delete operator should be private instead of public, but unfortunately
// the compiler complains when compiling the destructors for subclasses.
void operator delete(void* pointer) { UNREACHABLE(); }
private:
- Isolate* isolate_; // Current isolate for this stack resource.
+ BaseIsolate* isolate_; // Current isolate for this stack resource.
StackResource* previous_;
void* operator new(uword size);
« no previous file with comments | « no previous file | vm/allocation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698