commit 85c98032854cb1059cc9ba2003839e3fcf530c60
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 02:39:18 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 02:39:18 2020 +0000
tree 1f6fbbcbf9ef15b9161b2171181c4a89f443702a
parent 56a928f4dc2ba684037d76bee20d061f77d5352c
parent 88ead34317d86d60bf6eb7a9cee8e4dcfa1e8ce5

Merge "rs: silence static analyzer complaints" am: 73215be5ee am: 88ead34317

Change-Id: I01671dbe0b18133b74ad1a9b3f6e4b8116d7490c

slang_rs_check_ast.cpp

diff --git a/slang_rs_check_ast.cpp b/slang_rs_check_ast.cpp
index 778f530..61a218d 100644
--- a/slang_rs_check_ast.cpp
+++ b/slang_rs_check_ast.cpp
@@ -61,7 +61,7 @@
   const clang::BuiltinType *ElementTy;
   Ty = ImplCast->getSubExpr()->getType()->getPointeeType()
     ->getUnqualifiedDesugaredType();
-  VectorTy = clang::dyn_cast_or_null<clang::VectorType>(Ty);
+  VectorTy = clang::dyn_cast<clang::VectorType>(Ty);
 
   if (VectorTy) {
     ElementTy = clang::dyn_cast_or_null<clang::BuiltinType>(

slang_rs_context.cpp

diff --git a/slang_rs_context.cpp b/slang_rs_context.cpp
index b58c7a8..b2c3179 100644
--- a/slang_rs_context.cpp
+++ b/slang_rs_context.cpp
@@ -235,7 +235,7 @@
     clang::Decl* D = *I;
     switch (D->getKind()) {
     case clang::Decl::Var: {
-      clang::VarDecl* VD = llvm::dyn_cast<clang::VarDecl>(D);
+      clang::VarDecl* VD = llvm::cast<clang::VarDecl>(D);
       bool ShouldExportVariable = true;
       if (VD->getFormalLinkage() == clang::ExternalLinkage) {
         clang::QualType QT = VD->getTypeSourceInfo()->getType();
@@ -263,7 +263,7 @@
       break;
     }
     case clang::Decl::Function: {
-      clang::FunctionDecl* FD = llvm::dyn_cast<clang::FunctionDecl>(D);
+      clang::FunctionDecl* FD = llvm::cast<clang::FunctionDecl>(D);
       if (FD->getFormalLinkage() == clang::ExternalLinkage) {
         if (!processExportFunc(FD)) {
           valid = false;