Fix variant build errors with GCC 7

llvm-svn: 294141
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 46663d556781b4a11b240fdae61126d4004f7e56
diff --git a/include/variant b/include/variant
index 67d4e3c..fb7cb2e 100644
--- a/include/variant
+++ b/include/variant
@@ -480,8 +480,7 @@
   template <class _Fp, class... _Vs, size_t... _Is>
   inline _LIBCPP_INLINE_VISIBILITY
   static constexpr auto __make_dispatch(index_sequence<_Is...>) {
-    return _VSTD::addressof(
-        __dispatcher<_Is...>::template __dispatch<_Fp, _Vs...>);
+    return __dispatcher<_Is...>::template __dispatch<_Fp, _Vs...>;
   }
 
   template <size_t _Ip, class _Fp, class... _Vs>