[llvm-branch-commits] [cfe-branch] r296001 - Merging r295843:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Feb 23 12:36:11 2017
New Revision: 296001

URL: http://llvm.org/viewvc/llvm-project?rev=296001&view=rev
Log:
Merging r295843:
------------------------------------------------------------------------
r295843 | jvesely | 2017-02-22 07:01:42 -0800 (Wed, 22 Feb 2017) | 3 lines

[OpenCL] r600 needs OpenCL kernel calling convention

Differential Revision: https://reviews.llvm.org/D30236
------------------------------------------------------------------------

Modified:
    cfe/branches/release_40/   (props changed)
    cfe/branches/release_40/lib/Sema/SemaType.cpp
    cfe/branches/release_40/test/CodeGenOpenCL/amdgpu-abi-struct-coerce.cl

Propchange: cfe/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 23 12:36:11 2017
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291955,291963-291964,292032,292052,292183,292194,292247,292265,292497,292555,292558-292559,292561,292590,292800,292847,292874,292991,293043,293134,293360,293369,293596,293678,293787,294008,294800,294855,294954,295149-295150,295224,295313,295473,295592,295610
+/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291955,291963-291964,292032,292052,292183,292194,292247,292265,292497,292555,292558-292559,292561,292590,292800,292847,292874,292991,293043,293134,293360,293369,293596,293678,293787,294008,294800,294855,294954,295149-295150,295224,295313,295473,295592,295610,295843
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_40/lib/Sema/SemaType.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/Sema/SemaType.cpp?rev=296001&r1=296000&r2=296001&view=diff
==============================================================================
--- cfe/branches/release_40/lib/Sema/SemaType.cpp (original)
+++ cfe/branches/release_40/lib/Sema/SemaType.cpp Thu Feb 23 12:36:11 2017
@@ -3154,7 +3154,7 @@ getCCForDeclaratorChunk(Sema &S, Declara
       if (Attr->getKind() == AttributeList::AT_OpenCLKernel) {
         llvm::Triple::ArchType arch = S.Context.getTargetInfo().getTriple().getArch();
         if (arch == llvm::Triple::spir || arch == llvm::Triple::spir64 ||
-            arch == llvm::Triple::amdgcn) {
+            arch == llvm::Triple::amdgcn || arch == llvm::Triple::r600) {
           CC = CC_OpenCLKernel;
         }
         break;

Modified: cfe/branches/release_40/test/CodeGenOpenCL/amdgpu-abi-struct-coerce.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/test/CodeGenOpenCL/amdgpu-abi-struct-coerce.cl?rev=296001&r1=296000&r2=296001&view=diff
==============================================================================
--- cfe/branches/release_40/test/CodeGenOpenCL/amdgpu-abi-struct-coerce.cl (original)
+++ cfe/branches/release_40/test/CodeGenOpenCL/amdgpu-abi-struct-coerce.cl Thu Feb 23 12:36:11 2017
@@ -1,5 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 // RUN: %clang_cc1 -triple amdgcn-unknown-unknown -S -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple r600-unknown-unknown -S -emit-llvm -o - %s | FileCheck %s
 
 // CHECK-NOT: %struct.single_element_struct_arg = type { i32 }
 typedef struct single_element_struct_arg