diff options
Diffstat (limited to 'clang/lib/CodeGen/CGCUDANV.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGCUDANV.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGCUDANV.cpp b/clang/lib/CodeGen/CGCUDANV.cpp index c7f4bf8a2135..cb16fe1b36c6 100644 --- a/clang/lib/CodeGen/CGCUDANV.cpp +++ b/clang/lib/CodeGen/CGCUDANV.cpp @@ -94,7 +94,7 @@ private: /// where the C code specifies const char*. llvm::Constant *makeConstantString(const std::string &Str, const std::string &Name = "") { - return CGM.GetAddrOfConstantCString(Str, Name.c_str()).getPointer(); + return CGM.GetAddrOfConstantCString(Str, Name).getPointer(); } /// Helper function which generates an initialized constant array from Str, @@ -1131,8 +1131,7 @@ void CGNVCUDARuntime::handleVarRegistration(const VarDecl *D, // Builtin surfaces and textures and their template arguments are // also registered with CUDA runtime. const auto *TD = cast<ClassTemplateSpecializationDecl>( - D->getType()->castAs<RecordType>()->getOriginalDecl()) - ->getDefinitionOrSelf(); + D->getType()->castAsCXXRecordDecl()); const TemplateArgumentList &Args = TD->getTemplateArgs(); if (TD->hasAttr<CUDADeviceBuiltinSurfaceTypeAttr>()) { assert(Args.size() == 2 && |