aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/CodeGen/TargetInfo.cpp
diff options
context:
space:
mode:
authorArtem Belevich <tra@google.com>2018-04-03 18:29:31 +0000
committerArtem Belevich <tra@google.com>2018-04-03 18:29:31 +0000
commit55ebd6cc26422fbcf6dfb75fa63ed9c36bd9a4c0 (patch)
tree4073f23d596c77601dda4acc4907df1f34580154 /clang/lib/CodeGen/TargetInfo.cpp
parentbb0ad1e88221aa56a70484aaf02ec418ebc753e7 (diff)
downloadllvm-55ebd6cc26422fbcf6dfb75fa63ed9c36bd9a4c0.zip
llvm-55ebd6cc26422fbcf6dfb75fa63ed9c36bd9a4c0.tar.gz
llvm-55ebd6cc26422fbcf6dfb75fa63ed9c36bd9a4c0.tar.bz2
Revert "Set calling convention for CUDA kernel"
This reverts r328795 which introduced an issue with referencing __global__ function templates. More details in the original review D44747. llvm-svn: 329099
Diffstat (limited to 'clang/lib/CodeGen/TargetInfo.cpp')
-rw-r--r--clang/lib/CodeGen/TargetInfo.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/clang/lib/CodeGen/TargetInfo.cpp b/clang/lib/CodeGen/TargetInfo.cpp
index 68edb32..f98faeb 100644
--- a/clang/lib/CodeGen/TargetInfo.cpp
+++ b/clang/lib/CodeGen/TargetInfo.cpp
@@ -431,10 +431,6 @@ unsigned TargetCodeGenInfo::getOpenCLKernelCallingConv() const {
return llvm::CallingConv::SPIR_KERNEL;
}
-unsigned TargetCodeGenInfo::getCUDAKernelCallingConv() const {
- return llvm::CallingConv::C;
-}
-
llvm::Constant *TargetCodeGenInfo::getNullPointer(const CodeGen::CodeGenModule &CGM,
llvm::PointerType *T, QualType QT) const {
return llvm::ConstantPointerNull::get(T);
@@ -7639,7 +7635,6 @@ public:
void setTargetAttributes(const Decl *D, llvm::GlobalValue *GV,
CodeGen::CodeGenModule &M) const override;
unsigned getOpenCLKernelCallingConv() const override;
- unsigned getCUDAKernelCallingConv() const override;
llvm::Constant *getNullPointer(const CodeGen::CodeGenModule &CGM,
llvm::PointerType *T, QualType QT) const override;
@@ -7727,10 +7722,6 @@ unsigned AMDGPUTargetCodeGenInfo::getOpenCLKernelCallingConv() const {
return llvm::CallingConv::AMDGPU_KERNEL;
}
-unsigned AMDGPUTargetCodeGenInfo::getCUDAKernelCallingConv() const {
- return llvm::CallingConv::AMDGPU_KERNEL;
-}
-
// Currently LLVM assumes null pointers always have value 0,
// which results in incorrectly transformed IR. Therefore, instead of
// emitting null pointers in private and local address spaces, a null