roll clang 163674:165787

tools/clang/plugins/FindBadConstructs.cpp

Index: tools/clang/plugins/FindBadConstructs.cpp
diff --git a/tools/clang/plugins/FindBadConstructs.cpp b/tools/clang/plugins/FindBadConstructs.cpp
index b79a64dbd19959bc449719681212961ed39b382b..0d2c7cd179f372ba5368fe4ff2e149b5d55a86f4 100644
--- a/tools/clang/plugins/FindBadConstructs.cpp
+++ b/tools/clang/plugins/FindBadConstructs.cpp
@@ -29,7 +29,7 @@ using namespace clang;
 namespace {
 
 bool TypeHasNonTrivialDtor(const Type* type) {
-  if (const CXXRecordDecl* cxx_r = type->getCXXRecordDeclForPointerType())
+  if (const CXXRecordDecl* cxx_r = type->getPointeeCXXRecordDecl())
     return cxx_r->hasTrivialDestructor();
 
   return false;
@@ -417,7 +417,7 @@ class FindBadConstructsAction : public PluginASTAction {
         check_virtuals_in_implementations_ = false;
       } else {
         parsed = false;
-        llvm::errs() << "Unknown argument: " << args[i] << "\n";
+        llvm::errs() << "Unknown clang plugin argument: " << args[i] << "\n";
       }
     }