@@ -1589,7 +1589,7 @@ class SyclKernelBodyCreator
1589
1589
class SyclKernelIntHeaderCreator
1590
1590
: public SyclKernelFieldHandler<SyclKernelIntHeaderCreator> {
1591
1591
SYCLIntegrationHeader &Header;
1592
- const CXXRecordDecl *KernelLambda ;
1592
+ const CXXRecordDecl *KernelObj ;
1593
1593
// Necessary to figure out the offset of the base class.
1594
1594
const CXXRecordDecl *CurStruct = nullptr ;
1595
1595
int64_t CurOffset = 0 ;
@@ -1608,11 +1608,10 @@ class SyclKernelIntHeaderCreator
1608
1608
1609
1609
public:
1610
1610
SyclKernelIntHeaderCreator (Sema &S, SYCLIntegrationHeader &H,
1611
- const CXXRecordDecl *KernelLambda,
1612
- QualType NameType, StringRef Name,
1613
- StringRef StableName)
1614
- : SyclKernelFieldHandler(S), Header(H), KernelLambda(KernelLambda) {
1615
- Header.startKernel (Name, NameType, StableName, KernelLambda->getLocation ());
1611
+ const CXXRecordDecl *KernelObj, QualType NameType,
1612
+ StringRef Name, StringRef StableName)
1613
+ : SyclKernelFieldHandler(S), Header(H), KernelObj(KernelObj) {
1614
+ Header.startKernel (Name, NameType, StableName, KernelObj->getLocation ());
1616
1615
}
1617
1616
1618
1617
bool handleSyclAccessorType (const CXXBaseSpecifier &BC,
@@ -1773,8 +1772,8 @@ class SyclKernelIntHeaderCreator
1773
1772
void Sema::ConstructOpenCLKernel (FunctionDecl *KernelCallerFunc,
1774
1773
MangleContext &MC) {
1775
1774
// The first argument to the KernelCallerFunc is the lambda object.
1776
- CXXRecordDecl *KernelLambda = getKernelObjectType (KernelCallerFunc);
1777
- assert (KernelLambda && " invalid kernel caller" );
1775
+ CXXRecordDecl *KernelObj = getKernelObjectType (KernelCallerFunc);
1776
+ assert (KernelObj && " invalid kernel caller" );
1778
1777
1779
1778
// Calculate both names, since Integration headers need both.
1780
1779
std::string CalculatedName, StableName;
@@ -1784,17 +1783,17 @@ void Sema::ConstructOpenCLKernel(FunctionDecl *KernelCallerFunc,
1784
1783
: CalculatedName);
1785
1784
SyclKernelFieldChecker checker (*this );
1786
1785
SyclKernelDeclCreator kernel_decl (
1787
- *this , checker, KernelName, KernelLambda ->getLocation (),
1786
+ *this , checker, KernelName, KernelObj ->getLocation (),
1788
1787
KernelCallerFunc->isInlined (), KernelCallerFunc->hasAttr <SYCLSimdAttr>());
1789
- SyclKernelBodyCreator kernel_body (*this , kernel_decl, KernelLambda ,
1788
+ SyclKernelBodyCreator kernel_body (*this , kernel_decl, KernelObj ,
1790
1789
KernelCallerFunc);
1791
1790
SyclKernelIntHeaderCreator int_header (
1792
- *this , getSyclIntegrationHeader (), KernelLambda ,
1791
+ *this , getSyclIntegrationHeader (), KernelObj ,
1793
1792
calculateKernelNameType (Context, KernelCallerFunc), KernelName,
1794
1793
StableName);
1795
1794
1796
1795
ConstructingOpenCLKernel = true ;
1797
- VisitRecordFields (KernelLambda ->fields (), checker, kernel_decl, kernel_body,
1796
+ VisitRecordFields (KernelObj ->fields (), checker, kernel_decl, kernel_body,
1798
1797
int_header);
1799
1798
ConstructingOpenCLKernel = false ;
1800
1799
}
0 commit comments