Merge pull request #594 from andreasfertig/fixIssue593

Fixed #593: Don't show casts for user defined conversions.
andreasfertig · Oct 19, 2023 · 17b84a8 · 17b84a8
2 parents 0d8ad30 + baa5b4a
commit 17b84a8
Show file tree

Hide file tree

Showing 42 changed files with 100 additions and 85 deletions.
diff --git a/.clang-format b/.clang-format
@@ -56,7 +56,6 @@ ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 #   Priority:        3
 #   - Regex:           '.*'
 #    Priority:        1
-SortIncludes: false
 IncludeCategories: 
   - Regex:           '^<.*\.h>'
     Priority:        1

diff --git a/CodeGenerator.cpp b/CodeGenerator.cpp
@@ -1768,8 +1768,9 @@ void CodeGenerator::InsertArg(const ImplicitCastExpr* stmt)
             case CastKind::CK_PointerToIntegral: [[fallthrough]];
             case CastKind::CK_BitCast: [[fallthrough]];
             case CastKind::CK_UncheckedDerivedToBase: [[fallthrough]];
-            case CastKind::CK_ToUnion: [[fallthrough]];
-            case CastKind::CK_UserDefinedConversion: [[fallthrough]];
+            case CastKind::CK_ToUnion:
+                [[fallthrough]];
+                //            case CastKind::CK_UserDefinedConversion: [[fallthrough]];
             case CastKind::CK_AtomicToNonAtomic: [[fallthrough]];
             case CastKind::CK_DerivedToBase: [[fallthrough]];
             case CastKind::CK_FloatingCast: [[fallthrough]];

diff --git a/tests/CharLiteralTest.expect b/tests/CharLiteralTest.expect
@@ -89,25 +89,25 @@ class Test
   inline void Apply()
   {
     Foo<char> * data = this->mData;
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=('\0');
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=('\n');
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=('\\');
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=('\'');
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=('\a');
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=('\b');
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=('\f');
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=('\r');
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=('\t');
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=('\v');
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=(static_cast<char>(L'\n'));
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=(u8'\n');
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=(static_cast<char>(u'\n'));
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=(static_cast<char>(U'\n'));
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=(3U);
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=(3UL);
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=(3ULL);
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=(3LL);
-    data[static_cast<int>(this->GetLength().operator int()) + 1].operator=(3L);
+    data[this->GetLength().operator int() + 1].operator=('\0');
+    data[this->GetLength().operator int() + 1].operator=('\n');
+    data[this->GetLength().operator int() + 1].operator=('\\');
+    data[this->GetLength().operator int() + 1].operator=('\'');
+    data[this->GetLength().operator int() + 1].operator=('\a');
+    data[this->GetLength().operator int() + 1].operator=('\b');
+    data[this->GetLength().operator int() + 1].operator=('\f');
+    data[this->GetLength().operator int() + 1].operator=('\r');
+    data[this->GetLength().operator int() + 1].operator=('\t');
+    data[this->GetLength().operator int() + 1].operator=('\v');
+    data[this->GetLength().operator int() + 1].operator=(static_cast<char>(L'\n'));
+    data[this->GetLength().operator int() + 1].operator=(u8'\n');
+    data[this->GetLength().operator int() + 1].operator=(static_cast<char>(u'\n'));
+    data[this->GetLength().operator int() + 1].operator=(static_cast<char>(U'\n'));
+    data[this->GetLength().operator int() + 1].operator=(3U);
+    data[this->GetLength().operator int() + 1].operator=(3UL);
+    data[this->GetLength().operator int() + 1].operator=(3ULL);
+    data[this->GetLength().operator int() + 1].operator=(3LL);
+    data[this->GetLength().operator int() + 1].operator=(3L);
   }
 
   inline Foo<int> GetLength() const

diff --git a/tests/Class2Test.expect b/tests/Class2Test.expect
@@ -33,7 +33,7 @@ class Test
   {
     Test tmp = Test(*this) /* NRVO variable */;
     this->operator++();
-    return Test(static_cast<int>(static_cast<Test &&>(tmp).operator int()));
+    return Test(static_cast<Test &&>(tmp).operator int());
   }
 
   inline Test & operator+=(const Test & rhs)
@@ -72,7 +72,7 @@ int main()
   s.count.operator++(0);
   Test t = Test();
   char * raw = reinterpret_cast<char *>(&s + 1);
-  Test * p = reinterpret_cast<Test *>(&raw[static_cast<int>(s.count.operator int())]);
+  Test * p = reinterpret_cast<Test *>(&raw[s.count.operator int()]);
   (*p).operator=((t));
   (*p).operator=(s2.count);
   s.count.operator+=(Test(static_cast<int>(sizeof(p))));

diff --git a/tests/ClassTest.expect b/tests/ClassTest.expect
@@ -28,7 +28,7 @@ class Test
   {
     Test tmp = Test(*this) /* NRVO variable */;
     this->operator++();
-    return Test(static_cast<int>(static_cast<Test &&>(tmp).operator int()));
+    return Test(static_cast<Test &&>(tmp).operator int());
   }
 
   inline Test & operator+=(const Test & rhs)
@@ -55,7 +55,7 @@ int main()
   Test t = Test(2);
   t.operator=(Test(3 * 2));
   Test tt = Test(4);
-  t.operator+=(Test(static_cast<int>(tt.operator int()) * 2));
+  t.operator+=(Test(tt.operator int() * 2));
   return 0;
 }
 

diff --git a/tests/ConversionDeclTest.expect b/tests/ConversionDeclTest.expect
@@ -39,7 +39,7 @@ namespace test
 int main()
 {
   test::coroutine_handle<int> a = {};
-  test::coroutine_handle<void> b = static_cast<test::coroutine_handle<void>>(a.operator test::coroutine_handle<void>());
+  test::coroutine_handle<void> b = a.operator test::coroutine_handle<void>();
   return 0;
 }
 

diff --git a/tests/CoroutinesCoReturnPlusTest.expect b/tests/CoroutinesCoReturnPlusTest.expect
@@ -70,7 +70,7 @@ struct generator
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineAllocFailureTest.expect b/tests/EduCoroutineAllocFailureTest.expect
@@ -124,7 +124,7 @@ struct generator<int>
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineBinaryExprTest.expect b/tests/EduCoroutineBinaryExprTest.expect
@@ -55,7 +55,7 @@ struct generator
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineCaptureConstTest.expect b/tests/EduCoroutineCaptureConstTest.expect
@@ -55,7 +55,7 @@ struct generator
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineCaptureThisTest.expect b/tests/EduCoroutineCaptureThisTest.expect
@@ -54,7 +54,7 @@ struct my_resumable
 
   inline ~my_resumable() noexcept
   {
-    if(static_cast<bool>(this->m_handle.operator bool())) {
+    if(this->m_handle.operator bool()) {
       this->m_handle.destroy();
     } 
 

diff --git a/tests/EduCoroutineCoreturnWithCoawaitTest.expect b/tests/EduCoroutineCoreturnWithCoawaitTest.expect
@@ -76,7 +76,7 @@ struct generator
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineCustomYieldTypeTest.expect b/tests/EduCoroutineCustomYieldTypeTest.expect
@@ -110,7 +110,7 @@ struct generator
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineExprTest.expect b/tests/EduCoroutineExprTest.expect
@@ -45,7 +45,7 @@ struct task
           if(previous) {
             return previous;
           } else {
-            return static_cast<std::coroutine_handle<void>>(std::noop_coroutine().operator std::coroutine_handle<void>());
+            return std::noop_coroutine().operator std::coroutine_handle<void>();
           } 
 
         }
@@ -154,10 +154,10 @@ struct task<int>
       {
         {
           std::coroutine_handle<void> previous = std::coroutine_handle<void>(h.promise().previous);
-          if(static_cast<bool>(previous.operator bool())) {
+          if(previous.operator bool()) {
             return std::coroutine_handle<void>(static_cast<std::coroutine_handle<void> &&>(previous));
           } else {
-            return static_cast<std::coroutine_handle<void>>(std::noop_coroutine().operator std::coroutine_handle<void>());
+            return std::noop_coroutine().operator std::coroutine_handle<void>();
           } 
 
         }

diff --git a/tests/EduCoroutineSimpleTest.expect b/tests/EduCoroutineSimpleTest.expect
@@ -56,7 +56,7 @@ struct generator
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineSuspendNeverBoolTest.expect b/tests/EduCoroutineSuspendNeverBoolTest.expect
@@ -132,7 +132,7 @@ struct generator<int>
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineSuspendNeverTest.expect b/tests/EduCoroutineSuspendNeverTest.expect
@@ -114,7 +114,7 @@ struct generator<int>
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineTemplateGeneratorTest.expect b/tests/EduCoroutineTemplateGeneratorTest.expect
@@ -114,7 +114,7 @@ struct generator<int>
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineVoidTest.expect b/tests/EduCoroutineVoidTest.expect
@@ -116,7 +116,7 @@ struct generator<int>
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineWithDtorTest.expect b/tests/EduCoroutineWithDtorTest.expect
@@ -133,7 +133,7 @@ struct generator<Test>
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineWithExceptionHandlerTest.expect b/tests/EduCoroutineWithExceptionHandlerTest.expect
@@ -132,7 +132,7 @@ struct generator<int>
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/EduCoroutineWithLambdaTest.expect b/tests/EduCoroutineWithLambdaTest.expect
@@ -56,7 +56,7 @@ struct generator
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/IfSwitchInitHandler5Test.expect b/tests/IfSwitchInitHandler5Test.expect
@@ -7,7 +7,7 @@ int main()
   std::weak_ptr<int> weakPtr = std::weak_ptr<int>(sharedPtr, 0);
   {
     std::shared_ptr<int> sharedPtr1 = weakPtr.lock();
-    if(static_cast<bool>(sharedPtr1.operator bool())) {
+    if(sharedPtr1.operator bool()) {
       std::operator<<(std::cout, "*sharedPtr: ").operator<<(sharedPtr.operator*()).operator<<(std::endl);
     } else {
     } 

diff --git a/tests/Issue324.expect b/tests/Issue324.expect
@@ -22,6 +22,6 @@ Str globalString = Str("test");
 
 const char * getString(bool empty)
 {
-  return static_cast<const char *>((empty ? Str("") : Str(globalString)).operator const char *());
+  return (empty ? Str("") : Str(globalString)).operator const char *();
 }
 
diff --git a/tests/Issue467.expect b/tests/Issue467.expect
@@ -32,8 +32,8 @@ int main()
   l.operator()();
   l.operator()();
   l.operator()();
-  (+static_cast<void (*)()>(l.operator __lambda_5_14::retType_5_14()))();
-  (+static_cast<void (*)()>(l.operator __lambda_5_14::retType_5_14()))();
+  (+l.operator __lambda_5_14::retType_5_14())();
+  (+l.operator __lambda_5_14::retType_5_14())();
   return 0;
 }
 
diff --git a/tests/Issue491.expect b/tests/Issue491.expect
@@ -39,5 +39,5 @@ class __lambda_1_10
 
 };
 
-__lambda_1_10 x = __lambda_1_10{+static_cast<void (*)()>(__lambda_1_16{}.operator __lambda_1_16::retType_1_16())};
+__lambda_1_10 x = __lambda_1_10{+__lambda_1_16{}.operator __lambda_1_16::retType_1_16()};
 
diff --git a/tests/Issue518.expect b/tests/Issue518.expect
@@ -45,7 +45,7 @@ struct task
           if(previous) {
             return previous;
           } else {
-            return static_cast<std::coroutine_handle<void>>(std::noop_coroutine().operator std::coroutine_handle<void>());
+            return std::noop_coroutine().operator std::coroutine_handle<void>();
           } 
 
         }
@@ -154,10 +154,10 @@ struct task<int>
       {
         {
           std::coroutine_handle<void> previous = std::coroutine_handle<void>(h.promise().previous);
-          if(static_cast<bool>(previous.operator bool())) {
+          if(previous.operator bool()) {
             return std::coroutine_handle<void>(static_cast<std::coroutine_handle<void> &&>(previous));
           } else {
-            return static_cast<std::coroutine_handle<void>>(std::noop_coroutine().operator std::coroutine_handle<void>());
+            return std::noop_coroutine().operator std::coroutine_handle<void>();
           } 
 
         }

diff --git a/tests/Issue536.expect b/tests/Issue536.expect
@@ -54,7 +54,7 @@ struct my_resumable
 
   inline ~my_resumable() noexcept
   {
-    if(static_cast<bool>(this->m_handle.operator bool())) {
+    if(this->m_handle.operator bool()) {
       this->m_handle.destroy();
     } 
 

diff --git a/tests/Issue536_2.expect b/tests/Issue536_2.expect
@@ -54,7 +54,7 @@ struct my_resumable
 
   inline ~my_resumable() noexcept
   {
-    if(static_cast<bool>(this->m_handle.operator bool())) {
+    if(this->m_handle.operator bool()) {
       this->m_handle.destroy();
     } 
 

diff --git a/tests/Issue593.cpp b/tests/Issue593.cpp
@@ -0,0 +1,4 @@
+struct A { operator int&(); };
+
+int& ir = A();
+
diff --git a/tests/Issue593.expect b/tests/Issue593.expect
@@ -0,0 +1,11 @@
+struct A
+{
+  operator int & ();
+
+};
+
+
+
+int & ir = A().operator int &();
+
+
diff --git a/tests/Issue92.expect b/tests/Issue92.expect
@@ -220,7 +220,7 @@ struct generator<unsigned int>
 
   inline ~generator() noexcept
   {
-    if(static_cast<bool>(this->p.operator bool())) {
+    if(this->p.operator bool()) {
       this->p.destroy();
     } 
 

diff --git a/tests/LambdaHandler2Test.expect b/tests/LambdaHandler2Test.expect
@@ -25,7 +25,7 @@ int main()
   };
 
   using FuncPtr_8 = int (*)(int, char);
-  FuncPtr_8 fp = static_cast<int (*)(int, char)>(__lambda_8_26{}.operator __lambda_8_26::retType_8_26());
+  FuncPtr_8 fp = __lambda_8_26{}.operator __lambda_8_26::retType_8_26();
   return 0;
 }
 

diff --git a/tests/LambdaHandlerCaptureLessTest.cerr b/tests/LambdaHandlerCaptureLessTest.cerr
@@ -4,7 +4,7 @@
 .tmp.cpp:35:5: error: templates cannot be declared inside of a local class
    35 |     template<class type_parameter_0_0, class type_parameter_0_1>
       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.tmp.cpp:53:90: error: no type named 'retType_4_28' in '__lambda_4_28'
-   53 |   FuncPtr_4 fp = static_cast<int (*)(int, char)>(__lambda_4_28{}.operator __lambda_4_28::retType_4_28());
-      |                                                                           ~~~~~~~~~~~~~~~^
+.tmp.cpp:53:58: error: no type named 'retType_4_28' in '__lambda_4_28'
+   53 |   FuncPtr_4 fp = __lambda_4_28{}.operator __lambda_4_28::retType_4_28();
+      |                                           ~~~~~~~~~~~~~~~^
 3 errors generated.
diff --git a/tests/LambdaHandlerCaptureLessTest.expect b/tests/LambdaHandlerCaptureLessTest.expect
@@ -50,7 +50,7 @@ int main()
   };
 
   using FuncPtr_4 = int (*)(int, char);
-  FuncPtr_4 fp = static_cast<int (*)(int, char)>(__lambda_4_28{}.operator __lambda_4_28::retType_4_28());
+  FuncPtr_4 fp = __lambda_4_28{}.operator __lambda_4_28::retType_4_28();
   return 0;
 }