Index: src/elements.cc |
diff --git a/src/elements.cc b/src/elements.cc |
index 76b9b03bf62d51a0ff4a59127f809f8f441fef84..121dd7d25eb0661dbe77432eb8345c11874b60ff 100644 |
--- a/src/elements.cc |
+++ b/src/elements.cc |
@@ -120,7 +120,7 @@ ELEMENTS_LIST(ELEMENTS_TRAITS) |
#undef ELEMENTS_TRAITS |
-ElementsAccessor** ElementsAccessor::elements_accessors_; |
+ElementsAccessor** ElementsAccessor::elements_accessors_ = NULL; |
static bool HasKey(Handle<FixedArray> array, Handle<Object> key_handle) { |
@@ -1735,6 +1735,7 @@ void ElementsAccessor::InitializeOncePerProcess() { |
void ElementsAccessor::TearDown() { |
+ if (elements_accessors_ == NULL) return; |
#define ACCESSOR_DELETE(Class, Kind, Store) delete elements_accessors_[Kind]; |
ELEMENTS_LIST(ACCESSOR_DELETE) |
#undef ACCESSOR_DELETE |