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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@329099 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 16 insertions, 17 deletions

diff --git a/include/clang/Basic/Specifiers.h b/include/clang/Basic/Specifiers.h
index c5d2e26ecf..377534baab 100644
--- a/include/clang/Basic/Specifiers.h
+++ b/include/clang/Basic/Specifiers.h
@@ -231,24 +231,23 @@ namespace clang {
 
   /// \brief CallingConv - Specifies the calling convention that a function uses.
   enum CallingConv {
-    CC_C,             // __attribute__((cdecl))
-    CC_X86StdCall,    // __attribute__((stdcall))
-    CC_X86FastCall,   // __attribute__((fastcall))
-    CC_X86ThisCall,   // __attribute__((thiscall))
+    CC_C,           // __attribute__((cdecl))
+    CC_X86StdCall,  // __attribute__((stdcall))
+    CC_X86FastCall, // __attribute__((fastcall))
+    CC_X86ThisCall, // __attribute__((thiscall))
     CC_X86VectorCall, // __attribute__((vectorcall))
-    CC_X86Pascal,     // __attribute__((pascal))
-    CC_Win64,         // __attribute__((ms_abi))
-    CC_X86_64SysV,    // __attribute__((sysv_abi))
-    CC_X86RegCall,    // __attribute__((regcall))
-    CC_AAPCS,         // __attribute__((pcs("aapcs")))
-    CC_AAPCS_VFP,     // __attribute__((pcs("aapcs-vfp")))
-    CC_IntelOclBicc,  // __attribute__((intel_ocl_bicc))
-    CC_SpirFunction,  // default for OpenCL functions on SPIR target
-    CC_OpenCLKernel,  // inferred for OpenCL kernels
-    CC_Swift,         // __attribute__((swiftcall))
-    CC_PreserveMost,  // __attribute__((preserve_most))
-    CC_PreserveAll,   // __attribute__((preserve_all))
-    CC_CUDAKernel,    // inferred for CUDA kernels
+    CC_X86Pascal,   // __attribute__((pascal))
+    CC_Win64,       // __attribute__((ms_abi))
+    CC_X86_64SysV,  // __attribute__((sysv_abi))
+    CC_X86RegCall, // __attribute__((regcall))
+    CC_AAPCS,       // __attribute__((pcs("aapcs")))
+    CC_AAPCS_VFP,   // __attribute__((pcs("aapcs-vfp")))
+    CC_IntelOclBicc, // __attribute__((intel_ocl_bicc))
+    CC_SpirFunction, // default for OpenCL functions on SPIR target
+    CC_OpenCLKernel, // inferred for OpenCL kernels
+    CC_Swift,        // __attribute__((swiftcall))
+    CC_PreserveMost, // __attribute__((preserve_most))
+    CC_PreserveAll,  // __attribute__((preserve_all))
   };
 
   /// \brief Checks whether the given calling convention supports variadic