From 7c2b3c9dda37ab25a6849a3670f1bfda6aa17e5e Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Thu, 12 Mar 2020 14:56:32 +0000 Subject: [PATCH] Replace getAs with castAs to fix null dereference static analyzer warnings. Use castAs as we know the cast should succeed (and castAs will assert if it doesn't) and we're dereferencing it directly in the getThisType/getThisObjectType calls. --- clang/lib/AST/DeclCXX.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp index 3645169b8901a..8e9258a8ab88e 100644 --- a/clang/lib/AST/DeclCXX.cpp +++ b/clang/lib/AST/DeclCXX.cpp @@ -2364,17 +2364,15 @@ QualType CXXMethodDecl::getThisType() const { // volatile X*, and if the member function is declared const volatile, // the type of this is const volatile X*. assert(isInstance() && "No 'this' for static methods!"); - - return CXXMethodDecl::getThisType(getType()->getAs(), + return CXXMethodDecl::getThisType(getType()->castAs(), getParent()); } QualType CXXMethodDecl::getThisObjectType() const { // Ditto getThisType. assert(isInstance() && "No 'this' for static methods!"); - - return CXXMethodDecl::getThisObjectType(getType()->getAs(), - getParent()); + return CXXMethodDecl::getThisObjectType( + getType()->castAs(), getParent()); } bool CXXMethodDecl::hasInlineBody() const {