address comments

Author: ziqingluo-90

clang/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp

@@ -701,7 +701,6 @@ void ExprEngine::handleConstructor(const Expr *E,
   if (CE) {
     // FIXME: Is it possible and/or useful to do this before PreStmt?
     StmtNodeBuilder Bldr(DstPreVisit, PreInitialized, *currBldrCtx);
-    ASTContext &Ctx = LCtx->getAnalysisDeclContext()->getASTContext();
     for (ExplodedNode *N : DstPreVisit) {
       ProgramStateRef State = N->getState();
       if (CE->requiresZeroInitialization()) {
@@ -718,7 +717,7 @@ void ExprEngine::handleConstructor(const Expr *E,
         // since it's then possible to be initializing one part of a multi-
         // dimensional array.
         const CXXRecordDecl *TargetHeldRecord =
-            Target.getType(Ctx)->getPointeeCXXRecordDecl();
+            dyn_cast_or_null<CXXRecordDecl>(CE->getType()->getAsRecordDecl());
 
         if (!TargetHeldRecord || !TargetHeldRecord->isEmpty())
           State = State->bindDefaultZero(Target, LCtx);

clang/test/Analysis/issue-137252.cpp

@@ -10,20 +10,20 @@
 namespace std {
 #ifdef EMPTY_CLASS
 
+  struct default_delete {};
+  template <class _Tp, class _Dp = default_delete >
+#else
+  // Class with methods and static members is still empty:
   template <typename T>
   class default_delete {
     T dump();
     static T x;
   };
   template <class _Tp, class _Dp = default_delete<_Tp> >
-#else
-
-  struct default_delete {};
-  template <class _Tp, class _Dp = default_delete >
 #endif
   class unique_ptr {
-    [[__no_unique_address__]]  _Tp * __ptr_;
-    [[__no_unique_address__]] _Dp __deleter_;
+    [[no_unique_address]]  _Tp * __ptr_;
+    [[no_unique_address]] _Dp __deleter_;
 
   public:
     explicit unique_ptr(_Tp* __p) noexcept
@@ -40,6 +40,11 @@ struct X {};
 
 int main()
 {
-    std::unique_ptr<X> a(new X());          // previously leak falsely reported
-    return 0;
+  // Previously a leak falsely reported here.  It was because the
+  // Static Analyzer engine simulated the initialization of
+  // `__deleter__` incorrectly.  The engine assigned zero to
+  // `__deleter__`--an empty record sharing offset with `__ptr__`.
+  // The assignment over wrote `__ptr__`.
+  std::unique_ptr<X> a(new X()); 
+  return 0;
 }