Index: runtime/vm/simulator_arm.cc |
=================================================================== |
--- runtime/vm/simulator_arm.cc (revision 18199) |
+++ runtime/vm/simulator_arm.cc (working copy) |
@@ -37,11 +37,11 @@ |
class StatsCounter { |
public: |
explicit StatsCounter(const char* name) { |
- UNIMPLEMENTED(); |
+ // UNIMPLEMENTED(); |
} |
void Increment() { |
- UNIMPLEMENTED(); |
+ // UNIMPLEMENTED(); |
} |
}; |
@@ -651,7 +651,10 @@ |
Simulator::~Simulator() { |
delete[] stack_; |
- Isolate::Current()->set_simulator(NULL); |
+ Isolate* isolate = Isolate::Current(); |
+ if (isolate != NULL) { |
+ isolate->set_simulator(NULL); |
+ } |
} |