From 5b99f3a34fef527beb8767eb12657f81ee65b969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@qt.io>
Date: Mon, 24 Sep 2018 11:28:46 +0200
Subject: Use std::addressof for taking an address instead of operator& in moc

Moc shouldn't artificially introduce calls to possibly overloaded
operator&. It can cause odd side effects in a user code.

Change-Id: Iaa1b491fe6a1a5ebd4dfa1172359dc792cc7604f
Fixes: QTBUG-68191
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/tools/moc/tst_moc.cpp | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'tests/auto/tools/moc/tst_moc.cpp')

diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 92a94055a4..f1888aebab 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -682,6 +682,7 @@ private slots:
     void finalClasses();
     void explicitOverrideControl_data();
     void explicitOverrideControl();
+    void overloadedAddressOperator();
     void autoPropertyMetaTypeRegistration();
     void autoMethodArgumentMetaTypeRegistration();
     void autoSignalSpyMetaTypeRegistration();
@@ -2939,6 +2940,34 @@ void tst_Moc::explicitOverrideControl()
 #endif
 }
 
+class OverloadedAddressOperator : public QObject
+{
+   Q_OBJECT
+public:
+   void* operator&() { return nullptr; }
+signals:
+   void self(OverloadedAddressOperator&);
+public slots:
+    void assertSelf(OverloadedAddressOperator &o)
+    {
+        QCOMPARE(std::addressof(o), this);
+        testResult = (std::addressof(o) == this);
+    }
+public:
+    bool testResult = false;
+};
+
+void tst_Moc::overloadedAddressOperator()
+{
+    OverloadedAddressOperator o;
+    OverloadedAddressOperator *p = std::addressof(o);
+    QCOMPARE(&o, nullptr);
+    QVERIFY(p);
+    QObject::connect(p, &OverloadedAddressOperator::self, p, &OverloadedAddressOperator::assertSelf);
+    emit o.self(o);
+    QVERIFY(o.testResult);
+}
+
 class CustomQObject : public QObject
 {
     Q_OBJECT
-- 
cgit v1.2.3