Revert of [handles] Sanitize Handle and friends. (patchset #4 id:50001 of...

Revert of [handles] Sanitize Handle and friends. (patchset #4 id:50001 of https://codereview.chromium.org/1128533002/)

Reason for revert:
[Sheriff] Breaks mac asan:
http://build.chromium.org/p/client.v8/builders/V8%20Mac64%20ASAN/builds/1198

Original issue's description:
> [handles] Sanitize Handle and friends.
>
> This almost allows us to get rid of handles-inl.h, once we fix the
> cyclic dependencies (follow up CL).
>
> R=yangguo@chromium.org
>
> Committed: https://crrev.com/3283195d0408333cce552cf4087577e6f41054e5
> Cr-Commit-Position: refs/heads/master@{#28222}

TBR=yangguo@chromium.org,bmeurer@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1128543004

Cr-Commit-Position: refs/heads/master@{#28235}

src/handles-inl.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+//
+
+#ifndef V8_HANDLES_INL_H_
+#define V8_HANDLES_INL_H_
 
 #include "src/api.h"
 #include "src/handles.h"
 #include "src/heap/heap.h"
 #include "src/isolate.h"
 
-// TODO(bmeurer): Break all include cycles and remove this file!
+namespace v8 {
+namespace internal {
+
+template<typename T>
+Handle<T>::Handle(T* obj) {
+  location_ = HandleScope::CreateHandle(obj->GetIsolate(), obj);
+}
+
+
+template<typename T>
+Handle<T>::Handle(T* obj, Isolate* isolate) {
+  location_ = HandleScope::CreateHandle(isolate, obj);
+}
+
+
+template <typename T>
+inline bool Handle<T>::is_identical_to(const Handle<T> o) const {
+  // Dereferencing deferred handles to check object equality is safe.
+  SLOW_DCHECK(
+      (location_ == NULL || IsDereferenceAllowed(NO_DEFERRED_CHECK)) &&
+      (o.location_ == NULL || o.IsDereferenceAllowed(NO_DEFERRED_CHECK)));
+  if (location_ == o.location_) return true;
+  if (location_ == NULL || o.location_ == NULL) return false;
+  return *location_ == *o.location_;
+}
+
+
+template <typename T>
+inline T* Handle<T>::operator*() const {
+  SLOW_DCHECK(IsDereferenceAllowed(INCLUDE_DEFERRED_CHECK));
+  return *bit_cast<T**>(location_);
+}
+
+template <typename T>
+inline T** Handle<T>::location() const {
+  SLOW_DCHECK(location_ == NULL ||
+              IsDereferenceAllowed(INCLUDE_DEFERRED_CHECK));
+  return location_;
+}
+
+#ifdef DEBUG
+template <typename T>
+bool Handle<T>::IsDereferenceAllowed(DereferenceCheckMode mode) const {
+  DCHECK(location_ != NULL);
+  Object* object = *bit_cast<T**>(location_);
+  if (object->IsSmi()) return true;
+  HeapObject* heap_object = HeapObject::cast(object);
+  Heap* heap = heap_object->GetHeap();
+  Object** handle = reinterpret_cast<Object**>(location_);
+  Object** roots_array_start = heap->roots_array_start();
+  if (roots_array_start <= handle &&
+      handle < roots_array_start + Heap::kStrongRootListLength &&
+      heap->RootCanBeTreatedAsConstant(
+        static_cast<Heap::RootListIndex>(handle - roots_array_start))) {
+    return true;
+  }
+  if (!AllowHandleDereference::IsAllowed()) return false;
+  if (mode == INCLUDE_DEFERRED_CHECK &&
+      !AllowDeferredHandleDereference::IsAllowed()) {
+    // Accessing cells, maps and internalized strings is safe.
+    if (heap_object->IsCell()) return true;
+    if (heap_object->IsMap()) return true;
+    if (heap_object->IsInternalizedString()) return true;
+    return !heap->isolate()->IsDeferredHandle(handle);
+  }
+  return true;
+}
+#endif
+
+
+
+HandleScope::HandleScope(Isolate* isolate) {
+  HandleScopeData* current = isolate->handle_scope_data();
+  isolate_ = isolate;
+  prev_next_ = current->next;
+  prev_limit_ = current->limit;
+  current->level++;
+}
+
+
+HandleScope::~HandleScope() {
+  CloseScope(isolate_, prev_next_, prev_limit_);
+}
+
+
+void HandleScope::CloseScope(Isolate* isolate,
+                             Object** prev_next,
+                             Object** prev_limit) {
+  HandleScopeData* current = isolate->handle_scope_data();
+
+  std::swap(current->next, prev_next);
+  current->level--;
+  if (current->limit != prev_limit) {
+    current->limit = prev_limit;
+    DeleteExtensions(isolate);
+#ifdef ENABLE_HANDLE_ZAPPING
+    ZapRange(current->next, prev_limit);
+  } else {
+    ZapRange(current->next, prev_next);
+#endif
+  }
+}
+
+
+template <typename T>
+Handle<T> HandleScope::CloseAndEscape(Handle<T> handle_value) {
+  HandleScopeData* current = isolate_->handle_scope_data();
+
+  T* value = *handle_value;
+  // Throw away all handles in the current scope.
+  CloseScope(isolate_, prev_next_, prev_limit_);
+  // Allocate one handle in the parent scope.
+  DCHECK(current->level > 0);
+  Handle<T> result(CreateHandle<T>(isolate_, value));
+  // Reinitialize the current scope (so that it's ready
+  // to be used or closed again).
+  prev_next_ = current->next;
+  prev_limit_ = current->limit;
+  current->level++;
+  return result;
+}
+
+
+template <typename T>
+T** HandleScope::CreateHandle(Isolate* isolate, T* value) {
+  DCHECK(AllowHandleAllocation::IsAllowed());
+  HandleScopeData* current = isolate->handle_scope_data();
+
+  internal::Object** cur = current->next;
+  if (cur == current->limit) cur = Extend(isolate);
+  // Update the current next field, set the value in the created
+  // handle, and return the result.
+  DCHECK(cur < current->limit);
+  current->next = cur + 1;
+
+  T** result = reinterpret_cast<T**>(cur);
+  *result = value;
+  return result;
+}
+
+
+#ifdef DEBUG
+inline SealHandleScope::SealHandleScope(Isolate* isolate) : isolate_(isolate) {
+  // Make sure the current thread is allowed to create handles to begin with.
+  CHECK(AllowHandleAllocation::IsAllowed());
+  HandleScopeData* current = isolate_->handle_scope_data();
+  // Shrink the current handle scope to make it impossible to do
+  // handle allocations without an explicit handle scope.
+  limit_ = current->limit;
+  current->limit = current->next;
+  level_ = current->level;
+  current->level = 0;
+}
+
+
+inline SealHandleScope::~SealHandleScope() {
+  // Restore state in current handle scope to re-enable handle
+  // allocations.
+  HandleScopeData* current = isolate_->handle_scope_data();
+  DCHECK_EQ(0, current->level);
+  current->level = level_;
+  DCHECK_EQ(current->next, current->limit);
+  current->limit = limit_;
+}
+
+#endif
+
+} }  // namespace v8::internal
+
+#endif  // V8_HANDLES_INL_H_

src/handles.cc

@@ -2,64 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/handles.h"
+#include "src/v8.h"
 
-#include "src/api.h"
-#include "src/isolate.h"
+#include "src/handles.h"
 
 namespace v8 {
 namespace internal {
 
-HandleBase::HandleBase(HeapObject* object)
-    : HandleBase(object, object->GetIsolate()) {}
-
-
-HandleBase::HandleBase(Object* object, Isolate* isolate)
-    : HandleBase(HandleScope::CreateHandle(isolate, object)) {}
-
-
-#ifdef DEBUG
-
-bool HandleBase::IsDereferenceAllowed(DereferenceCheckMode mode) const {
-  DCHECK_NOT_NULL(location_);
-  Object* const object = *location_;
-  if (object->IsSmi()) return true;
-  HeapObject* const heap_object = HeapObject::cast(object);
-  Heap* const heap = heap_object->GetHeap();
-  Object** roots_array_start = heap->roots_array_start();
-  if (roots_array_start <= location_ &&
-      location_ < roots_array_start + Heap::kStrongRootListLength &&
-      heap->RootCanBeTreatedAsConstant(
-          static_cast<Heap::RootListIndex>(location_ - roots_array_start))) {
-    return true;
-  }
-  if (!AllowHandleDereference::IsAllowed()) return false;
-  if (mode == INCLUDE_DEFERRED_CHECK &&
-      !AllowDeferredHandleDereference::IsAllowed()) {
-    // Accessing cells, maps and internalized strings is safe.
-    if (heap_object->IsCell()) return true;
-    if (heap_object->IsMap()) return true;
-    if (heap_object->IsInternalizedString()) return true;
-    return !heap->isolate()->IsDeferredHandle(location_);
-  }
-  return true;
-}
-
-#endif  // DEBUG
-
-
-HandleScope::HandleScope(Isolate* isolate) : isolate_(isolate) {
-  HandleScopeData* const current = isolate->handle_scope_data();
-  prev_next_ = current->next;
-  prev_limit_ = current->limit;
-  current->level++;
-}
 
-
-HandleScope::~HandleScope() { CloseScope(isolate_, prev_next_, prev_limit_); }
-
-
-// static
 int HandleScope::NumberOfHandles(Isolate* isolate) {
   HandleScopeImplementer* impl = isolate->handle_scope_implementer();
   int n = impl->blocks()->length();
@@ -69,73 +19,12 @@ int HandleScope::NumberOfHandles(Isolate* isolate) {
 }
 
 
-// static
-Object** HandleScope::CreateHandle(Isolate* isolate, Object* value) {
-  DCHECK(AllowHandleAllocation::IsAllowed());
-  HandleScopeData* const current = isolate->handle_scope_data();
-
-  Object** result = current->next;
-  if (result == current->limit) result = Extend(isolate);
-  // Update the current next field, set the value in the created
-  // handle, and return the result.
-  DCHECK_LT(result, current->limit);
-  current->next = result + 1;
-
-  *result = value;
-  return result;
-}
-
-
-// static
-void HandleScope::DeleteExtensions(Isolate* isolate) {
-  HandleScopeData* const current = isolate->handle_scope_data();
-  isolate->handle_scope_implementer()->DeleteExtensions(current->limit);
-}
-
-
-Handle<Object> HandleScope::CloseAndEscape(Handle<Object> handle) {
-  HandleScopeData* const current = isolate_->handle_scope_data();
-
-  Object* value = *handle;
-  // Throw away all handles in the current scope.
-  CloseScope(isolate_, prev_next_, prev_limit_);
-  // Allocate one handle in the parent scope.
-  DCHECK_LT(0, current->level);
-  Handle<Object> result(CreateHandle(isolate_, value));
-  // Reinitialize the current scope (so that it's ready
-  // to be used or closed again).
-  prev_next_ = current->next;
-  prev_limit_ = current->limit;
-  current->level++;
-  return result;
-}
-
-
-// static
-void HandleScope::CloseScope(Isolate* isolate, Object** prev_next,
-                             Object** prev_limit) {
-  HandleScopeData* const current = isolate->handle_scope_data();
-
-  std::swap(current->next, prev_next);
-  current->level--;
-  if (current->limit != prev_limit) {
-    current->limit = prev_limit;
-    DeleteExtensions(isolate);
-#ifdef ENABLE_HANDLE_ZAPPING
-    ZapRange(current->next, prev_limit);
-  } else {
-    ZapRange(current->next, prev_next);
-#endif
-  }
-}
-
-
-// static
 Object** HandleScope::Extend(Isolate* isolate) {
   HandleScopeData* current = isolate->handle_scope_data();
 
   Object** result = current->next;
-  DCHECK_EQ(result, current->limit);
+
+  DCHECK(result == current->limit);
   // Make sure there's at least one scope on the stack and that the
   // top of the scope stack isn't a barrier.
   if (!Utils::ApiCheck(current->level != 0,
@@ -169,6 +58,12 @@ Object** HandleScope::Extend(Isolate* isolate) {
 }
 
 
+void HandleScope::DeleteExtensions(Isolate* isolate) {
+  HandleScopeData* current = isolate->handle_scope_data();
+  isolate->handle_scope_implementer()->DeleteExtensions(current->limit);
+}
+
+
 #ifdef ENABLE_HANDLE_ZAPPING
 void HandleScope::ZapRange(Object** start, Object** end) {
   DCHECK(end - start <= kHandleBlockSize);
@@ -232,33 +127,4 @@ DeferredHandles* DeferredHandleScope::Detach() {
   return deferred;
 }
 
-
-#ifdef DEBUG
-
-SealHandleScope::SealHandleScope(Isolate* isolate) : isolate_(isolate) {
-  // Make sure the current thread is allowed to create handles to begin with.
-  CHECK(AllowHandleAllocation::IsAllowed());
-  HandleScopeData* const current = isolate_->handle_scope_data();
-  // Shrink the current handle scope to make it impossible to do
-  // handle allocations without an explicit handle scope.
-  limit_ = current->limit;
-  current->limit = current->next;
-  level_ = current->level;
-  current->level = 0;
-}
-
-
-SealHandleScope::~SealHandleScope() {
-  // Restore state in current handle scope to re-enable handle
-  // allocations.
-  HandleScopeData* const current = isolate_->handle_scope_data();
-  DCHECK_EQ(0, current->level);
-  current->level = level_;
-  DCHECK_EQ(current->next, current->limit);
-  current->limit = limit_;
-}
-
-#endif  // DEBUG
-
-}  // namespace internal
-}  // namespace v8
+} }  // namespace v8::internal