For CFGAutomaticObjDtor, the type may be reference type, e.g., const A &c = A();

Also apply some new coding style.

llvm-svn: 120144

1 files changed, 17 insertions, 10 deletions

diff --git a/clang/lib/Checker/GRExprEngine.cpp b/clang/lib/Checker/GRExprEngine.cpp
index 6db8dbab7d8..4121144fad2 100644
--- a/clang/lib/Checker/GRExprEngine.cpp
+++ b/clang/lib/Checker/GRExprEngine.cpp
@@ -738,19 +738,26 @@ void GRExprEngine::ProcessImplicitDtor(const CFGImplicitDtor D,
   }
 }
 
-void GRExprEngine::ProcessAutomaticObjDtor(const CFGAutomaticObjDtor D,
+void GRExprEngine::ProcessAutomaticObjDtor(const CFGAutomaticObjDtor dtor,
                                            GRStmtNodeBuilder &builder) {
-  ExplodedNode *Pred = builder.getBasePredecessor();
-  const GRState *state = Pred->getState();
-  const VarDecl *VD = D.getVarDecl();
-  const CXXRecordDecl *CD = VD->getType()->getAsCXXRecordDecl();
-  const CXXDestructorDecl *DD = CD->getDestructor();
+  ExplodedNode *pred = builder.getBasePredecessor();
+  const GRState *state = pred->getState();
+  const VarDecl *varDecl = dtor.getVarDecl();
+
+  QualType varType = varDecl->getType();
+
+  if (const ReferenceType *refType = varType->getAs<ReferenceType>())
+    varType = refType->getPointeeType();
+
+  const CXXRecordDecl *recordDecl = varType->getAsCXXRecordDecl();
+  assert(recordDecl && "get CXXRecordDecl fail");
+  const CXXDestructorDecl *dtorDecl = recordDecl->getDestructor();
 
-  Loc Dest = state->getLValue(VD, Pred->getLocationContext());
+  Loc dest = state->getLValue(varDecl, pred->getLocationContext());
 
-  ExplodedNodeSet Dst;
-  VisitCXXDestructor(DD, cast<loc::MemRegionVal>(Dest).getRegion(),
-                     D.getTriggerStmt(), Pred, Dst);
+  ExplodedNodeSet dstSet;
+  VisitCXXDestructor(dtorDecl, cast<loc::MemRegionVal>(dest).getRegion(),
+                     dtor.getTriggerStmt(), pred, dstSet);
 }
 
 void GRExprEngine::ProcessBaseDtor(const CFGBaseDtor D,