[counting_allocator] Chrome changes.

base/allocator/allocator_shim.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/allocator/allocator_shim.h"
 
 #include <errno.h>
 
 #include <new>
 
@@ skipping 155 matching lines @@
   do {
     void* context = nullptr;
 #if defined(OS_MACOSX)
     context = malloc_default_zone();
 #endif
     ptr = chain_head->alloc_function(chain_head, size, context);
   } while (!ptr && CallNewHandler(size));
   return ptr;
 }
 
+#if defined(_LIBCPP_COUNTING_ALLOCATOR)
+
+void* ShimTaggedCppNew(size_t size, std::new_tag tag) {
+  const allocator::AllocatorDispatch* const chain_head = GetChainHead();
+  void* ptr;
+  do {
+    if (chain_head->tagged_alloc_function) {
+      ptr = chain_head->tagged_alloc_function(chain_head, size, tag.value);
+    } else {
+      ptr = chain_head->alloc_function(chain_head, size, nullptr);
+    }
+  } while (!ptr && CallNewHandler(size));
+  return ptr;
+}
+
+#endif  // _LIBCPP_COUNTING_ALLOCATOR
+
 ALWAYS_INLINE void ShimCppDelete(void* address) {
   void* context = nullptr;
 #if defined(OS_MACOSX)
   context = malloc_default_zone();
 #endif
   const allocator::AllocatorDispatch* const chain_head = GetChainHead();
   return chain_head->free_function(chain_head, address, context);
 }
 
 ALWAYS_INLINE void* ShimMalloc(size_t size, void* context) {
@@ skipping 151 matching lines @@
 // Cross-checks.
 
 #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
 #error The allocator shim should not be compiled when building for memory tools.
 #endif
 
 #if (defined(__GNUC__) && defined(__EXCEPTIONS)) || \
     (defined(_HAS_EXCEPTIONS) && _HAS_EXCEPTIONS)
 #error This code cannot be used when exceptions are turned on.
 #endif