fixup! [Sema] do not destruct fields of unions

Author: vtjnash

clang/test/Analysis/NewDelete-checker-test.cpp

@@ -457,7 +457,7 @@ namespace optional_union {
     unique_ptr<int> present;
     char notpresent;
     custom_union_t() : present(unique_ptr<int>()) {}
-    ~custom_union_t() {};
+    ~custom_union_t() {}
   };
 
   void testUnionCorrect() {

clang/test/Analysis/dtor-array.cpp

@@ -377,27 +377,3 @@ void directUnknownSymbol() {
 }
 
 }
-
-void testUnionDtor() {
-  static int unionDtorCalled;
-  InlineDtor::cnt = 0;
-  InlineDtor::dtorCalled = 0;
-  unionDtorCalled = 0;
-  {
-      union UnionDtor {
-          InlineDtor kind1;
-          char kind2;
-          ~UnionDtor() { unionDtorCalled++; }
-      };
-      UnionDtor u1{.kind1{}};
-      UnionDtor u2{.kind2{}};
-      auto u3 = new UnionDtor{.kind1{}};
-      auto u4 = new UnionDtor{.kind2{}};
-      delete u3;
-      delete u4;
-  }
-
-  clang_analyzer_eval(unionDtorCalled == 4); // expected-warning {{TRUE}}
-  clang_analyzer_eval(InlineDtor::dtorCalled != 4); // expected-warning {{TRUE}}
-  clang_analyzer_eval(InlineDtor::dtorCalled == 0); // expected-warning {{TRUE}}
-}

clang/test/Analysis/dtor-union.cpp

@@ -0,0 +1,38 @@
+// RUN: %clang_analyze_cc1 -analyzer-checker=core,debug.ExprInspection -analyzer-config c++-inlining=destructors -verify -std=c++11 %s
+// RUN: %clang_analyze_cc1 -analyzer-checker=core,debug.ExprInspection -analyzer-config c++-inlining=destructors -verify -std=c++17 %s
+
+void clang_analyzer_eval(bool);
+
+struct InlineDtor {
+  static int cnt;
+  static int dtorCalled;
+  ~InlineDtor() {
+    ++dtorCalled;
+  }
+};
+
+int InlineDtor::cnt = 0;
+int InlineDtor::dtorCalled = 0;
+
+void testUnionDtor() {
+  static int unionDtorCalled;
+  InlineDtor::cnt = 0;
+  InlineDtor::dtorCalled = 0;
+  unionDtorCalled = 0;
+  {
+      union UnionDtor {
+          InlineDtor kind1;
+          char kind2;
+          ~UnionDtor() { unionDtorCalled++; }
+      };
+      UnionDtor u1{.kind1{}};
+      UnionDtor u2{.kind2{}};
+      auto u3 = new UnionDtor{.kind1{}};
+      auto u4 = new UnionDtor{.kind2{}};
+      delete u3;
+      delete u4;
+  }
+
+  clang_analyzer_eval(unionDtorCalled == 4); // expected-warning {{TRUE}}
+  clang_analyzer_eval(InlineDtor::dtorCalled == 0); // expected-warning {{TRUE}}
+}