From 47b22472b25d4b0d23df9ea99ae4ba7cd8a08f87 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Thu, 26 Jan 2017 00:50:31 -0800
Subject: [PATCH] Revert "Revert "Ignore warning for instantiation after
 specialization.""

This reverts commit ee7a1c5d327e132c923cd45b5b2de091204f07dd.

Bug: http://b/31532493
Test: Manual validation
---
 runtime/base/arena_allocator.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/base/arena_allocator.cc b/runtime/base/arena_allocator.cc
index 61e0aabba..1caf0c075 100644
--- a/runtime/base/arena_allocator.cc
+++ b/runtime/base/arena_allocator.cc
@@ -144,8 +144,11 @@ void ArenaAllocatorStatsImpl<kCount>::Dump(std::ostream& os, const Arena* first,
   }
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Winstantiation-after-specialization"
 // Explicitly instantiate the used implementation.
 template class ArenaAllocatorStatsImpl<kArenaAllocatorCountAllocations>;
+#pragma GCC diagnostic pop
 
 void ArenaAllocatorMemoryTool::DoMakeDefined(void* ptr, size_t size) {
   MEMORY_TOOL_MAKE_DEFINED(ptr, size);
-- 
2.11.0