commit 4a90d5fbbb6802c59093b866f3478a814bf02b95
author Ben Murdoch <benm@google.com> Tue Mar 22 12:00:34 2016 +0000
committer Dirk Vogt <dirk@fairphone.com> Fri Mar 17 16:05:42 2017 +0100
tree 486867e3a04e7f17454c94a4c97891bb0e237f1f
parent 3821a70061b1b2077ee51c70eda717bddac94f58

Upgrade V8 to version 4.9.385.28

https://chromium.googlesource.com/v8/v8/+/4.9.385.28

FPIIM-449

Change-Id: I4b2e74289d4bf3667f2f3dc8aa2e541f63e26eb4

src/assert-scope.cc

diff --git a/src/assert-scope.cc b/src/assert-scope.cc
index 4c10fdd..3852709 100644
--- a/src/assert-scope.cc
+++ b/src/assert-scope.cc
@@ -6,7 +6,8 @@
 
 #include "src/base/lazy-instance.h"
 #include "src/base/platform/platform.h"
-#include "src/isolate-inl.h"
+#include "src/debug/debug.h"
+#include "src/isolate.h"
 #include "src/utils.h"
 
 namespace v8 {
@@ -14,7 +15,7 @@
 
 namespace {
 
-struct PerThreadAssertKeyConstructTrait FINAL {
+struct PerThreadAssertKeyConstructTrait final {
   static void Construct(base::Thread::LocalStorageKey* key) {
     *key = base::Thread::CreateThreadLocalKey();
   }
@@ -31,7 +32,7 @@
 }  // namespace
 
 
-class PerThreadAssertData FINAL {
+class PerThreadAssertData final {
  public:
   PerThreadAssertData() : nesting_level_(0) {
     for (int i = 0; i < LAST_PER_THREAD_ASSERT_TYPE; i++) {
@@ -144,8 +145,6 @@
 template class PerIsolateAssertScope<JAVASCRIPT_EXECUTION_ASSERT, true>;
 template class PerIsolateAssertScope<JAVASCRIPT_EXECUTION_THROWS, false>;
 template class PerIsolateAssertScope<JAVASCRIPT_EXECUTION_THROWS, true>;
-template class PerIsolateAssertScope<ALLOCATION_FAILURE_ASSERT, false>;
-template class PerIsolateAssertScope<ALLOCATION_FAILURE_ASSERT, true>;
 template class PerIsolateAssertScope<DEOPTIMIZATION_ASSERT, false>;
 template class PerIsolateAssertScope<DEOPTIMIZATION_ASSERT, true>;
 template class PerIsolateAssertScope<COMPILATION_ASSERT, false>;