Skip to content

Commit d82ca8b

Browse files
author
anikelal
committed
Minor fixes
1 parent 4fcc54b commit d82ca8b

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

clang/lib/CodeGen/CGCall.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2506,10 +2506,9 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
25062506

25072507
if (TargetDecl->hasAttr<OpenCLKernelAttr>() &&
25082508
CallingConv != CallingConv::CC_C &&
2509-
CallingConv !=
2510-
CallingConv::CC_SpirFunction) { // Check CallingConv to avoid adding
2511-
// uniform-work-group-size attribute
2512-
// to OpenCL Kernel Stub
2509+
CallingConv != CallingConv::CC_SpirFunction) {
2510+
// Check CallingConv to avoid adding uniform-work-group-size attribute to
2511+
// OpenCL Kernel Stub
25132512
if (getLangOpts().OpenCLVersion <= 120) {
25142513
// OpenCL v1.2 Work groups are always uniform
25152514
FuncAttrs.addAttribute("uniform-work-group-size", "true");

clang/lib/CodeGen/CodeGenFunction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,7 @@ void CodeGenFunction::GenerateCode(GlobalDecl GD, llvm::Function *Fn,
16141614
CGM.getRawFunctionPointer(GDStub, FTy);
16151615
CGCallee GDStubCallee = CGCallee::forDirect(GDStubFunctionPointer, GDStub);
16161616
EmitCall(FnInfo, GDStubCallee, ReturnValueSlot(), CallArgs, nullptr, false,
1617-
Loc); // set IsMustTail=true?
1617+
Loc);
16181618
} else if (Body) {
16191619
EmitFunctionBody(Body);
16201620
} else

clang/lib/CodeGen/CodeGenModule.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3906,7 +3906,6 @@ void CodeGenModule::EmitGlobal(GlobalDecl GD) {
39063906

39073907
// Ignore declarations, they will be emitted on their first use.
39083908
if (const auto *FD = dyn_cast<FunctionDecl>(Global)) {
3909-
39103909
if (FD->hasAttr<OpenCLKernelAttr>() && FD->doesThisDeclarationHaveABody())
39113910
addDeferredDeclToEmit(GlobalDecl(FD, KernelReferenceKind::Stub));
39123911

@@ -6161,7 +6160,6 @@ void CodeGenModule::EmitGlobalFunctionDefinition(GlobalDecl GD,
61616160
CodeGenFunction(*this).GenerateCode(GD, Fn, FI);
61626161

61636162
setNonAliasAttributes(GD, Fn);
6164-
61656163
SetLLVMFunctionAttributesForDefinition(D, Fn);
61666164

61676165
if (const ConstructorAttr *CA = D->getAttr<ConstructorAttr>())

0 commit comments

Comments
 (0)