addressof misbehaving for type with an implicit conversion operator to char&. This fixes http://llvm.org/bugs/show_bug.cgi?id=15754

llvm-svn: 179608

1 files changed, 18 insertions, 0 deletions

diff --git a/libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp b/libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
index 3f1bef16a3f..e07bec4d0a4 100644
--- a/libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
+++ b/libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
@@ -19,8 +19,17 @@ struct A
     void operator&() const {}
 };
 
+struct nothing {
+    operator char&()
+    {
+        static char c;
+        return c;
+    }
+};
+
 int main()
 {
+    {
     int i;
     double d;
     assert(std::addressof(i) == &i);
@@ -30,4 +39,13 @@ int main()
     assert(std::addressof(*tp) == tp);
     assert(std::addressof(*ctp) == tp);
     delete tp;
+    }
+    {
+    union
+    {
+        nothing n;
+        int i;
+    };
+    assert(std::addressof(n) == (void*)std::addressof(i));
+    }
 }