Mark some of the places we leave V8 via callbacks as transitions to...

src/log.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1107 matching lines @@
     LOG(UncheckedStringEvent("Entering", StateToString(state_)));
     if (previous_ != NULL) {
       LOG(UncheckedStringEvent("From", StateToString(previous_->state_)));
     }
   }
 
 #ifdef ENABLE_HEAP_PROTECTION
   if (FLAG_protect_heap && previous_ != NULL) {
     if (state_ == EXTERNAL) {
       // We are leaving V8.
-      ASSERT(previous_ == NULL || previous_->state_ != EXTERNAL);
+      ASSERT(previous_->state_ != EXTERNAL);
       Heap::Protect();
-    } else {
-      // Are we entering V8?
-      if (previous_->state_ == EXTERNAL) Heap::Unprotect();
+    } else if (previous_->state_ == EXTERNAL) {
+      // We are entering V8.
+      Heap::Unprotect();
     }
   }
 #endif
 }
 
 
 VMState::~VMState() {
   Logger::current_state_ = previous_;
 
   if (FLAG_log_state_changes) {
     LOG(UncheckedStringEvent("Leaving", StateToString(state_)));
     if (previous_ != NULL) {
       LOG(UncheckedStringEvent("To", StateToString(previous_->state_)));
     }
   }
 
 #ifdef ENABLE_HEAP_PROTECTION
   if (FLAG_protect_heap && previous_ != NULL) {
     if (state_ == EXTERNAL) {
-      // Are we (re)entering V8?
-      if (previous_->state_ != EXTERNAL) Heap::Unprotect();
-    } else {
-      // Are we leaving V8?
-      if (previous_->state_ == EXTERNAL) Heap::Protect();
+      // We are reentering V8.
+      ASSERT(previous_->state_ != EXTERNAL);
+      Heap::Unprotect();
+    } else if (previous_->state_ == EXTERNAL) {
+      // We are leaving V8.
+      Heap::Protect();
     }
   }
 #endif
 }
 #endif
 
 } }  // namespace v8::internal