Fix compatibility for CI tests and clang-tidy suggestions

vgvassilev · Nov 3, 2024 · 34815b4 · 34815b4
1 parent b0faf5e
commit 34815b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/Differentiator/ReverseModeVisitor.cpp b/lib/Differentiator/ReverseModeVisitor.cpp
@@ -1911,8 +1911,10 @@ Expr* getArraySizeExpr(const ArrayType* AT, ASTContext& context,
           m_Sema.LookupName(result, m_Sema.getCurScope());
           EnumDecl* cudaMemcpyKindDecl = nullptr;
           for (NamedDecl* decl : result)
-            if ((cudaMemcpyKindDecl = dyn_cast<EnumDecl>(decl)))
+            if (auto* enumDecl = dyn_cast<EnumDecl>(decl)) {
+              cudaMemcpyKindDecl = enumDecl;
               break;
+            }
           assert(cudaMemcpyKindDecl && "cudaMemcpyKind not found");
           QualType cudaMemcpyKindType =
               m_Context.getTypeDeclType(cudaMemcpyKindDecl);
@@ -1925,10 +1927,10 @@ Expr* getArraySizeExpr(const ArrayType* AT, ASTContext& context,
             }
           }
           assert(deviceToHostEnumDecl && "cudaMemcpyDeviceToHost not found");
-          DeclRefExpr* deviceToHostDeclRef =
+          auto* deviceToHostDeclRef = clad_compat::GetResult<Expr*>(
               m_Sema.BuildDeclRefExpr(deviceToHostEnumDecl, cudaMemcpyKindType,
                                       CLAD_COMPAT_ExprValueKind_R_or_PR_Value,
-                                      SourceLocation(), nullptr);
+                                      SourceLocation(), nullptr));
 
           PreCallStmts.push_back(BuildDeclStmt(dArgDeclCUDA));
           Expr* refOp = BuildOp(UO_AddrOf, BuildDeclRef(dArgDeclCUDA));

diff --git a/test/CUDA/tensor_demo.cu b/test/CUDA/tensor_demo.cu
@@ -1,6 +1,7 @@
 // RUN: %cladclang_cuda -I%S/../../include --cuda-path=%cudapath \
 // RUN:     --cuda-gpu-arch=%cudaarch %cudaldflags -otensor_demo.out %s
 // RUN: ./tensor_demo.out | %filecheck_exec %s
+// REQUIRES: cuda-runtime
 
 
 #include "clad/Differentiator/Differentiator.h"