Skip to content

Commit 037f952

Browse files
author
anikelal
committed
Minor fixes
1 parent 7429b97 commit 037f952

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
@@ -2504,10 +2504,9 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
25042504

25052505
if (TargetDecl->hasAttr<OpenCLKernelAttr>() &&
25062506
CallingConv != CallingConv::CC_C &&
2507-
CallingConv !=
2508-
CallingConv::CC_SpirFunction) { // Check CallingConv to avoid adding
2509-
// uniform-work-group-size attribute
2510-
// to OpenCL Kernel Stub
2507+
CallingConv != CallingConv::CC_SpirFunction) {
2508+
// Check CallingConv to avoid adding uniform-work-group-size attribute to
2509+
// OpenCL Kernel Stub
25112510
if (getLangOpts().OpenCLVersion <= 120) {
25122511
// OpenCL v1.2 Work groups are always uniform
25132512
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
@@ -1602,7 +1602,7 @@ void CodeGenFunction::GenerateCode(GlobalDecl GD, llvm::Function *Fn,
16021602
CGM.getRawFunctionPointer(GDStub, FTy);
16031603
CGCallee GDStubCallee = CGCallee::forDirect(GDStubFunctionPointer, GDStub);
16041604
EmitCall(FnInfo, GDStubCallee, ReturnValueSlot(), CallArgs, nullptr, false,
1605-
Loc); // set IsMustTail=true?
1605+
Loc);
16061606
} else if (Body) {
16071607
EmitFunctionBody(Body);
16081608
} else

clang/lib/CodeGen/CodeGenModule.cpp

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

38963896
// Ignore declarations, they will be emitted on their first use.
38973897
if (const auto *FD = dyn_cast<FunctionDecl>(Global)) {
3898-
38993898
if (FD->hasAttr<OpenCLKernelAttr>() && FD->doesThisDeclarationHaveABody())
39003899
addDeferredDeclToEmit(GlobalDecl(FD, KernelReferenceKind::Stub));
39013900

@@ -6150,7 +6149,6 @@ void CodeGenModule::EmitGlobalFunctionDefinition(GlobalDecl GD,
61506149
CodeGenFunction(*this).GenerateCode(GD, Fn, FI);
61516150

61526151
setNonAliasAttributes(GD, Fn);
6153-
61546152
SetLLVMFunctionAttributesForDefinition(D, Fn);
61556153

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

0 commit comments

Comments
 (0)