Fix use of non-constexpr C++14 addressof

llvm-svn: 284325

diff --git a/libcxx/include/experimental/optional b/libcxx/include/experimental/optional
index ebe11e6b9343499cfbd7d4372a6111e22c197b02..57c5335f63797fa751a958ebe576a008e668cdf9 100644 (file)
--- a/libcxx/include/experimental/optional
+++ b/libcxx/include/experimental/optional
@@ -488,7 +488,7 @@ public:
     {
         _LIBCPP_ASSERT(this->__engaged_, "optional operator-> called for disengaged value");
 #ifndef _LIBCPP_HAS_NO_BUILTIN_ADDRESSOF
-        return _VSTD::addressof(this->__val_);
+        return __builtin_addressof(this->__val_);
 #else
         return __operator_arrow(__has_operator_addressof<value_type>{});
 #endif