Proposed resolution:

This wording is relative to N5008.

1. Modify [memory.syn] as indicated:

   
   // 20.4.1, class template indirect
   template<class T, class Allocator = allocator<T>>
     class indirect;
   
   template<class T, class Allocator>
   constexpr void swap(indirect<T, Allocator>& lhs, indirect<T, Allocator>& rhs) noexcept(see below);
   
   // 20.4.1.10, hash support
   template<class T, class Alloc> struct hash<indirect<T, Alloc>>;
   
   // 20.4.2, class template polymorphic
   template<class T, class Allocator = allocator<T>>
     class polymorphic;
   
   template<class T, class Allocator>
   constexpr void swap(polymorphic<T, Allocator>& lhs, polymorphic<T, Allocator>& rhs) noexcept(see below);
   
   

2. Modify [indirect.syn] as indicated:

   
   // 20.4.1.7, swap
   constexpr void swap(indirect& other) noexcept(see below);
   friend constexpr void swap(indirect& lhs, indirect& rhs) noexcept(see below);
   

3. Modify [indirect.swap] as indicated:

   
   template<class T, class Allocator>
   constexpr void swap(indirect<T, Allocator>& lhs, indirect<T, Allocator>& rhs) noexcept(noexcept(lhs.swap(rhs)));
   

   -3- Effects: Equivalent to `lhs.swap(rhs)`.

4. Modify [polymorphic.syn] as indicated:

   
   // 20.4.2.7, swap
   constexpr void swap(polymorphic& other) noexcept(see below);
   friend constexpr void swap(polymorphic& lhs, polymorphic& rhs) noexcept(see below);
   

5. Modify [polymorphic.swap] as indicated:

   
   template<class T, class Allocator>
   constexpr void swap(polymorphic<T, Allocator>& lhs, polymorphic<T, Allocator>& rhs) noexcept(noexcept(lhs.swap(rhs)));
   

   -3- Effects: Equivalent to `lhs.swap(rhs)`.

The non-member `swap` overloads for `std::indirect` and `std::polymorphic` are defined as hidden friends, so are only available via ADL. This means that calling `std::swap(i1, i2)` will always use the generic `std::swap` instead of the custom overload for `std::indirect`.