Merged r11847, r11854 into 3.11 branch.

src/list.h

Index: src/list.h
diff --git a/src/list.h b/src/list.h
index 3ca4a3fba8a8d823016298239d72fdc233c10b92..7fd4f5cd2d6f6af7b8e2675252347b560c95dbdd 100644
--- a/src/list.h
+++ b/src/list.h
@@ -74,6 +74,11 @@ class List {
     AllocationPolicy::Delete(p);
   }
 
+  // Please the MSVC compiler.  We should never have to execute this.
+  INLINE(void operator delete(void* p, AllocationPolicy allocator)) {
+    UNREACHABLE();
+  }
+
   // Returns a reference to the element at index i.  This reference is
   // not safe to use after operations that can change the list's
   // backing store (e.g. Add).