Merge pull request #699 from andreasfertig/pseudoDestructor

Added support for pseudo destructor.

CodeGenerator.cpp

@@ -2111,6 +2111,14 @@ bool CodeGenerator::InsideDecltype() const
 }
 //-----------------------------------------------------------------------------
 
+void CodeGenerator::InsertArg(const CXXPseudoDestructorExpr* stmt)
+{
+    InsertArg(stmt->getBase());
+
+    mOutputFormatHelper.Append(ArrowOrDot(stmt->isArrow()), "~", GetName(stmt->getDestroyedType()));
+}
+//-----------------------------------------------------------------------------
+
 void CodeGenerator::InsertArg(const CXXMemberCallExpr* stmt)
 {
     CONDITIONAL_LAMBDA_SCOPE_HELPER(MemberCallExpr, not InsideDecltype())

CodeGeneratorTypes.h

@@ -135,6 +135,7 @@ SUPPORTED_STMT(StmtExpr)
 SUPPORTED_STMT(SourceLocExpr)
 SUPPORTED_STMT(CXXParenListInitExpr)
 SUPPORTED_STMT(CppInsightsCommentStmt)
+SUPPORTED_STMT(CXXPseudoDestructorExpr)
 
 #undef IGNORED_DECL
 #undef IGNORED_STMT

tests/PlacemenNew2Test.cpp

@@ -0,0 +1,36 @@
+#include <new>
+
+namespace Test {
+  template<typename T>
+  struct Apple
+  {
+    T x;
+  };
+
+  template<typename T>
+  void destroy(T* ptr) {
+    ptr->T::~T();
+  }
+}
+
+namespace West
+{
+  int y;
+}
+
+int main()
+{
+    char buffer[sizeof(Test::Apple<int>)];
+
+    auto f = new (&buffer) Test::Apple<int>;
+
+    f->Test::Apple<int>::~Apple<int>();
+    f->~Apple();
+
+    Test::destroy(f);
+
+    int x;
+    Test::destroy(&x);
+
+    Test::destroy(&West::y);
+}

tests/PlacemenNew2Test.expect

@@ -0,0 +1,66 @@
+#include <new>
+
+namespace Test
+{
+  template<typename T>
+  struct Apple
+  {
+    T x;
+  };
+
+  /* First instantiated from: PlacemenNew2Test.cpp:23 */
+  #ifdef INSIGHTS_USE_TEMPLATE
+  template<>
+  struct Apple<int>
+  {
+    int x;
+    // inline Apple() noexcept = default;
+  };
+
+  #endif
+  template<typename T>
+  void destroy(T * ptr)
+  {
+    ptr->~T();
+  }
+
+  /* First instantiated from: PlacemenNew2Test.cpp:30 */
+  #ifdef INSIGHTS_USE_TEMPLATE
+  template<>
+  void destroy<Apple<int> >(Apple<int> * ptr)
+  {
+    ptr->~Apple();
+  }
+  #endif
+
+
+  /* First instantiated from: PlacemenNew2Test.cpp:33 */
+  #ifdef INSIGHTS_USE_TEMPLATE
+  template<>
+  void destroy<int>(int * ptr)
+  {
+    ptr->~int();
+  }
+  #endif
+
+
+}
+
+namespace West
+{
+  int y;
+
+}
+
+int main()
+{
+  char buffer[4];
+  Test::Apple<int> * f = new (reinterpret_cast<void *>(&buffer))Test::Apple<int>();
+  f->~Apple();
+  f->~Apple();
+  Test::destroy(f);
+  int x;
+  Test::destroy(&x);
+  Test::destroy(&West::y);
+  return 0;
+}

tests/PlacemenNewTest.cpp

@@ -0,0 +1,21 @@
+#include <new>
+
+template<typename T>
+struct Apple
+{
+    T x;
+};
+
+
+int main()
+{
+    char buffer[sizeof(Apple<int>)];
+
+    auto* f = new (&buffer) Apple<int>;
+
+    auto& r = *f;
+
+    r.~Apple<int>();
+
+    f->~Apple<int>();
+}

tests/PlacemenNewTest.expect

@@ -0,0 +1,28 @@
+#include <new>
+
+template<typename T>
+struct Apple
+{
+  T x;
+};
+
+/* First instantiated from: PlacemenNewTest.cpp:12 */
+#ifdef INSIGHTS_USE_TEMPLATE
+template<>
+struct Apple<int>
+{
+  int x;
+  // inline Apple() noexcept = default;
+};
+
+#endif
+
+int main()
+{
+  char buffer[4];
+  Apple<int> * f = new (reinterpret_cast<void *>(&buffer))Apple<int>();
+  Apple<int> & r = *f;
+  r.~Apple();
+  f->~Apple();
+  return 0;
+}