maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CUDA] Do a better job at detecting wrong-side calls. 

Summary:
Move CheckCUDACall from ActOnCallExpr and BuildDeclRefExpr to
DiagnoseUseOfDecl.  This lets us catch some edge cases we were missing,
specifically around class operators.

This necessitates a few other changes:

 - Avoid emitting duplicate deferred diags in CheckCUDACall.

   Previously we'd carefully placed our call to CheckCUDACall such that
   it would only ever run once for a particular callsite.  But now this
   isn't the case.

 - Emit deferred diagnostics from a template
   specialization/instantiation's primary template, in addition to from
   the specialization/instantiation itself.  DiagnoseUseOfDecl ends up
   putting the deferred diagnostics on the template, rather than the
   specialization, so we need to check both.

Reviewers: rsmith

Subscribers: cfe-commits, tra

Differential Revision: https://reviews.llvm.org/D24573

llvm-svn: 283637
This commit is contained in:
Justin Lebar 2016-10-08 01:07:11 +00:00
parent a1a944e3cb
commit 9fdb46e71c
6 changed files with 119 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clang/include/clang/Sema/Sema.h
View File

@ -9267,16 +9267,27 @@ public:
void maybeAddCUDAHostDeviceAttrs(Scope *S, FunctionDecl *FD, void maybeAddCUDAHostDeviceAttrs(Scope *S, FunctionDecl *FD,
const LookupResult &Previous); const LookupResult &Previous);
private:
/// Raw encodings of SourceLocations for which CheckCUDACall has emitted a
/// deferred "bad call" diagnostic. We use this to avoid emitting the same
/// deferred diag twice.
llvm::DenseSet<unsigned> LocsWithCUDACallDeferredDiags;
public:
/// Check whether we're allowed to call Callee from the current context. /// Check whether we're allowed to call Callee from the current context.
/// ///
/// If the call is never allowed in a semantically-correct program /// - If the call is never allowed in a semantically-correct program
/// (CFP_Never), emits an error and returns false. /// (CFP_Never), emits an error and returns false.
/// ///
/// If the call is allowed in semantically-correct programs, but only if it's /// - If the call is allowed in semantically-correct programs, but only if
/// never codegen'ed (CFP_WrongSide), creates a deferred diagnostic to be /// it's never codegen'ed (CFP_WrongSide), creates a deferred diagnostic to
/// emitted if and when the caller is codegen'ed, and returns true. /// be emitted if and when the caller is codegen'ed, and returns true.
/// ///
/// Otherwise, returns true without emitting any diagnostics. /// Will only create deferred diagnostics for a given SourceLocation once,
/// so you can safely call this multiple times without generating duplicate
/// deferred errors.
///
/// - Otherwise, returns true without emitting any diagnostics.
bool CheckCUDACall(SourceLocation Loc, FunctionDecl *Callee); bool CheckCUDACall(SourceLocation Loc, FunctionDecl *Callee);
/// Check whether a 'try' or 'throw' expression is allowed within the current /// Check whether a 'try' or 'throw' expression is allowed within the current

4
clang/lib/CodeGen/CodeGenModule.cpp
View File

@ -2923,6 +2923,10 @@ void CodeGenModule::EmitGlobalFunctionDefinition(GlobalDecl GD,
// non-error diags here, because order can be significant, e.g. with notes // non-error diags here, because order can be significant, e.g. with notes
// that follow errors.) // that follow errors.)
auto Diags = D->takeDeferredDiags(); auto Diags = D->takeDeferredDiags();
if (auto *Templ = D->getPrimaryTemplate()) {
auto TemplDiags = Templ->getAsFunction()->takeDeferredDiags();
Diags.insert(Diags.end(), TemplDiags.begin(), TemplDiags.end());
}
bool HasError = llvm::any_of(Diags, [this](const PartialDiagnosticAt &PDAt) { bool HasError = llvm::any_of(Diags, [this](const PartialDiagnosticAt &PDAt) {
return getDiags().getDiagnosticLevel(PDAt.second.getDiagID(), PDAt.first) >= return getDiags().getDiagnosticLevel(PDAt.second.getDiagID(), PDAt.first) >=
DiagnosticsEngine::Error; DiagnosticsEngine::Error;

8
clang/lib/Sema/SemaCUDA.cpp
View File

@ -495,7 +495,13 @@ bool Sema::CheckCUDACall(SourceLocation Loc, FunctionDecl *Callee) {
Diag(Callee->getLocation(), diag::note_previous_decl) << Callee; Diag(Callee->getLocation(), diag::note_previous_decl) << Callee;
return false; return false;
} }
if (Pref == Sema::CFP_WrongSide) {
// Insert into LocsWithCUDADeferredDiags to avoid emitting duplicate deferred
// diagnostics for the same location. Duplicate deferred diags are otherwise
// tricky to avoid, because, unlike with regular errors, sema checking
// proceeds unhindered when we omit a deferred diagnostic.
if (Pref == Sema::CFP_WrongSide &&
LocsWithCUDACallDeferredDiags.insert(Loc.getRawEncoding()).second) {
// We have to do this odd dance to create our PartialDiagnostic because we // We have to do this odd dance to create our PartialDiagnostic because we
// want its storage to be allocated with operator new, not in an arena. // want its storage to be allocated with operator new, not in an arena.
PartialDiagnostic ErrPD{PartialDiagnostic::NullDiagnostic()}; PartialDiagnostic ErrPD{PartialDiagnostic::NullDiagnostic()};

120
clang/lib/Sema/SemaExpr.cpp
View File

@ -374,6 +374,9 @@ bool Sema::DiagnoseUseOfDecl(NamedDecl *D, SourceLocation Loc,
if (getLangOpts().CPlusPlus14 && FD->getReturnType()->isUndeducedType() && if (getLangOpts().CPlusPlus14 && FD->getReturnType()->isUndeducedType() &&
DeduceReturnType(FD, Loc)) DeduceReturnType(FD, Loc))
return true; return true;
if (getLangOpts().CUDA && !CheckCUDACall(Loc, FD))
return true;
} }
// [OpenMP 4.0], 2.15 declare reduction Directive, Restrictions // [OpenMP 4.0], 2.15 declare reduction Directive, Restrictions
@ -1743,11 +1746,6 @@ Sema::BuildDeclRefExpr(ValueDecl *D, QualType Ty, ExprValueKind VK,
const DeclarationNameInfo &NameInfo, const DeclarationNameInfo &NameInfo,
const CXXScopeSpec *SS, NamedDecl *FoundD, const CXXScopeSpec *SS, NamedDecl *FoundD,
const TemplateArgumentListInfo *TemplateArgs) { const TemplateArgumentListInfo *TemplateArgs) {
if (getLangOpts().CUDA)
if (FunctionDecl *Callee = dyn_cast<FunctionDecl>(D))
if (!CheckCUDACall(NameInfo.getLoc(), Callee))
return ExprError();
bool RefersToCapturedVariable = bool RefersToCapturedVariable =
isa<VarDecl>(D) && isa<VarDecl>(D) &&
NeedToCaptureVariable(cast<VarDecl>(D), NameInfo.getLoc()); NeedToCaptureVariable(cast<VarDecl>(D), NameInfo.getLoc());
@ -5142,35 +5140,36 @@ static bool isNumberOfArgsValidForCall(Sema &S, const FunctionDecl *Callee,
return Callee->getMinRequiredArguments() <= NumArgs; return Callee->getMinRequiredArguments() <= NumArgs;
} }
static ExprResult ActOnCallExprImpl(Sema &S, Scope *Scope, Expr *Fn, /// ActOnCallExpr - Handle a call to Fn with the specified array of arguments.
SourceLocation LParenLoc, /// This provides the location of the left/right parens and a list of comma
MultiExprArg ArgExprs, /// locations.
SourceLocation RParenLoc, Expr *ExecConfig, ExprResult Sema::ActOnCallExpr(Scope *Scope, Expr *Fn, SourceLocation LParenLoc,
bool IsExecConfig) { MultiExprArg ArgExprs, SourceLocation RParenLoc,
Expr *ExecConfig, bool IsExecConfig) {
// Since this might be a postfix expression, get rid of ParenListExprs. // Since this might be a postfix expression, get rid of ParenListExprs.
ExprResult Result = S.MaybeConvertParenListExprToParenExpr(Scope, Fn); ExprResult Result = MaybeConvertParenListExprToParenExpr(Scope, Fn);
if (Result.isInvalid()) return ExprError(); if (Result.isInvalid()) return ExprError();
Fn = Result.get(); Fn = Result.get();
if (checkArgsForPlaceholders(S, ArgExprs)) if (checkArgsForPlaceholders(*this, ArgExprs))
return ExprError(); return ExprError();
if (S.getLangOpts().CPlusPlus) { if (getLangOpts().CPlusPlus) {
// If this is a pseudo-destructor expression, build the call immediately. // If this is a pseudo-destructor expression, build the call immediately.
if (isa<CXXPseudoDestructorExpr>(Fn)) { if (isa<CXXPseudoDestructorExpr>(Fn)) {
if (!ArgExprs.empty()) { if (!ArgExprs.empty()) {
// Pseudo-destructor calls should not have any arguments. // Pseudo-destructor calls should not have any arguments.
S.Diag(Fn->getLocStart(), diag::err_pseudo_dtor_call_with_args) Diag(Fn->getLocStart(), diag::err_pseudo_dtor_call_with_args)
<< FixItHint::CreateRemoval( << FixItHint::CreateRemoval(
SourceRange(ArgExprs.front()->getLocStart(), SourceRange(ArgExprs.front()->getLocStart(),
ArgExprs.back()->getLocEnd())); ArgExprs.back()->getLocEnd()));
} }
return new (S.Context) return new (Context)
CallExpr(S.Context, Fn, None, S.Context.VoidTy, VK_RValue, RParenLoc); CallExpr(Context, Fn, None, Context.VoidTy, VK_RValue, RParenLoc);
} }
if (Fn->getType() == S.Context.PseudoObjectTy) { if (Fn->getType() == Context.PseudoObjectTy) {
ExprResult result = S.CheckPlaceholderExpr(Fn); ExprResult result = CheckPlaceholderExpr(Fn);
if (result.isInvalid()) return ExprError(); if (result.isInvalid()) return ExprError();
Fn = result.get(); Fn = result.get();
} }
@ -5185,35 +5184,34 @@ static ExprResult ActOnCallExprImpl(Sema &S, Scope *Scope, Expr *Fn,
if (Dependent) { if (Dependent) {
if (ExecConfig) { if (ExecConfig) {
return new (S.Context) CUDAKernelCallExpr( return new (Context) CUDAKernelCallExpr(
S.Context, Fn, cast<CallExpr>(ExecConfig), ArgExprs, Context, Fn, cast<CallExpr>(ExecConfig), ArgExprs,
S.Context.DependentTy, VK_RValue, RParenLoc); Context.DependentTy, VK_RValue, RParenLoc);
} else { } else {
return new (S.Context) return new (Context) CallExpr(
CallExpr(S.Context, Fn, ArgExprs, S.Context.DependentTy, VK_RValue, Context, Fn, ArgExprs, Context.DependentTy, VK_RValue, RParenLoc);
RParenLoc);
} }
} }
// Determine whether this is a call to an object (C++ [over.call.object]). // Determine whether this is a call to an object (C++ [over.call.object]).
if (Fn->getType()->isRecordType()) if (Fn->getType()->isRecordType())
return S.BuildCallToObjectOfClassType(Scope, Fn, LParenLoc, ArgExprs, return BuildCallToObjectOfClassType(Scope, Fn, LParenLoc, ArgExprs,
RParenLoc); RParenLoc);
if (Fn->getType() == S.Context.UnknownAnyTy) { if (Fn->getType() == Context.UnknownAnyTy) {
ExprResult result = rebuildUnknownAnyFunction(S, Fn); ExprResult result = rebuildUnknownAnyFunction(*this, Fn);
if (result.isInvalid()) return ExprError(); if (result.isInvalid()) return ExprError();
Fn = result.get(); Fn = result.get();
} }
if (Fn->getType() == S.Context.BoundMemberTy) { if (Fn->getType() == Context.BoundMemberTy) {
return S.BuildCallToMemberFunction(Scope, Fn, LParenLoc, ArgExprs, return BuildCallToMemberFunction(Scope, Fn, LParenLoc, ArgExprs,
RParenLoc); RParenLoc);
} }
} }
// Check for overloaded calls. This can happen even in C due to extensions. // Check for overloaded calls. This can happen even in C due to extensions.
if (Fn->getType() == S.Context.OverloadTy) { if (Fn->getType() == Context.OverloadTy) {
OverloadExpr::FindResult find = OverloadExpr::find(Fn); OverloadExpr::FindResult find = OverloadExpr::find(Fn);
// We aren't supposed to apply this logic for if there'Scope an '&' // We aren't supposed to apply this logic for if there'Scope an '&'
@ -5221,17 +5219,17 @@ static ExprResult ActOnCallExprImpl(Sema &S, Scope *Scope, Expr *Fn,
if (!find.HasFormOfMemberPointer) { if (!find.HasFormOfMemberPointer) {
OverloadExpr *ovl = find.Expression; OverloadExpr *ovl = find.Expression;
if (UnresolvedLookupExpr *ULE = dyn_cast<UnresolvedLookupExpr>(ovl)) if (UnresolvedLookupExpr *ULE = dyn_cast<UnresolvedLookupExpr>(ovl))
return S.BuildOverloadedCallExpr( return BuildOverloadedCallExpr(
Scope, Fn, ULE, LParenLoc, ArgExprs, RParenLoc, ExecConfig, Scope, Fn, ULE, LParenLoc, ArgExprs, RParenLoc, ExecConfig,
/*AllowTypoCorrection=*/true, find.IsAddressOfOperand); /*AllowTypoCorrection=*/true, find.IsAddressOfOperand);
return S.BuildCallToMemberFunction(Scope, Fn, LParenLoc, ArgExprs, return BuildCallToMemberFunction(Scope, Fn, LParenLoc, ArgExprs,
RParenLoc); RParenLoc);
} }
} }
// If we're directly calling a function, get the appropriate declaration. // If we're directly calling a function, get the appropriate declaration.
if (Fn->getType() == S.Context.UnknownAnyTy) { if (Fn->getType() == Context.UnknownAnyTy) {
ExprResult result = rebuildUnknownAnyFunction(S, Fn); ExprResult result = rebuildUnknownAnyFunction(*this, Fn);
if (result.isInvalid()) return ExprError(); if (result.isInvalid()) return ExprError();
Fn = result.get(); Fn = result.get();
} }
@ -5256,10 +5254,10 @@ static ExprResult ActOnCallExprImpl(Sema &S, Scope *Scope, Expr *Fn,
// with no explicit address space with the address space of the arguments // with no explicit address space with the address space of the arguments
// in ArgExprs. // in ArgExprs.
if ((FDecl = if ((FDecl =
rewriteBuiltinFunctionDecl(&S, S.Context, FDecl, ArgExprs))) { rewriteBuiltinFunctionDecl(this, Context, FDecl, ArgExprs))) {
NDecl = FDecl; NDecl = FDecl;
Fn = DeclRefExpr::Create( Fn = DeclRefExpr::Create(
S.Context, FDecl->getQualifierLoc(), SourceLocation(), FDecl, false, Context, FDecl->getQualifierLoc(), SourceLocation(), FDecl, false,
SourceLocation(), FDecl->getType(), Fn->getValueKind(), FDecl); SourceLocation(), FDecl->getType(), Fn->getValueKind(), FDecl);
} }
} }
@ -5268,8 +5266,8 @@ static ExprResult ActOnCallExprImpl(Sema &S, Scope *Scope, Expr *Fn,
if (FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(NDecl)) { if (FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(NDecl)) {
if (CallingNDeclIndirectly && if (CallingNDeclIndirectly &&
!S.checkAddressOfFunctionIsAvailable(FD, /*Complain=*/true, !checkAddressOfFunctionIsAvailable(FD, /*Complain=*/true,
Fn->getLocStart())) Fn->getLocStart()))
return ExprError(); return ExprError();
// CheckEnableIf assumes that the we're passing in a sane number of args for // CheckEnableIf assumes that the we're passing in a sane number of args for
@ -5279,42 +5277,22 @@ static ExprResult ActOnCallExprImpl(Sema &S, Scope *Scope, Expr *Fn,
// number of args looks incorrect, don't do enable_if checks; we should've // number of args looks incorrect, don't do enable_if checks; we should've
// already emitted an error about the bad call. // already emitted an error about the bad call.
if (FD->hasAttr<EnableIfAttr>() && if (FD->hasAttr<EnableIfAttr>() &&
isNumberOfArgsValidForCall(S, FD, ArgExprs.size())) { isNumberOfArgsValidForCall(*this, FD, ArgExprs.size())) {
if (const EnableIfAttr *Attr = S.CheckEnableIf(FD, ArgExprs, true)) { if (const EnableIfAttr *Attr = CheckEnableIf(FD, ArgExprs, true)) {
S.Diag(Fn->getLocStart(), Diag(Fn->getLocStart(),
isa<CXXMethodDecl>(FD) isa<CXXMethodDecl>(FD)
? diag::err_ovl_no_viable_member_function_in_call ? diag::err_ovl_no_viable_member_function_in_call
: diag::err_ovl_no_viable_function_in_call) : diag::err_ovl_no_viable_function_in_call)
<< FD << FD->getSourceRange(); << FD << FD->getSourceRange();
S.Diag(FD->getLocation(), Diag(FD->getLocation(),
diag::note_ovl_candidate_disabled_by_enable_if_attr) diag::note_ovl_candidate_disabled_by_enable_if_attr)
<< Attr->getCond()->getSourceRange() << Attr->getMessage(); << Attr->getCond()->getSourceRange() << Attr->getMessage();
} }
} }
} }
return S.BuildResolvedCallExpr(Fn, NDecl, LParenLoc, ArgExprs, RParenLoc, return BuildResolvedCallExpr(Fn, NDecl, LParenLoc, ArgExprs, RParenLoc,
ExecConfig, IsExecConfig); ExecConfig, IsExecConfig);
}
/// ActOnCallExpr - Handle a call to Fn with the specified array of arguments.
/// This provides the location of the left/right parens and a list of comma
/// locations.
ExprResult Sema::ActOnCallExpr(Scope *S, Expr *Fn, SourceLocation LParenLoc,
MultiExprArg ArgExprs, SourceLocation RParenLoc,
Expr *ExecConfig, bool IsExecConfig) {
ExprResult Ret = ActOnCallExprImpl(*this, S, Fn, LParenLoc, ArgExprs,
RParenLoc, ExecConfig, IsExecConfig);
// If appropriate, check that this is a valid CUDA call (and emit an error if
// the call is not allowed).
if (getLangOpts().CUDA && Ret.isUsable())
if (auto *Call = dyn_cast<CallExpr>(Ret.get()))
if (auto *FD = Call->getDirectCallee())
if (!CheckCUDACall(Call->getLocStart(), FD))
return ExprError();
return Ret;
} }
/// ActOnAsTypeExpr - create a new asType (bitcast) from the arguments. /// ActOnAsTypeExpr - create a new asType (bitcast) from the arguments.

4
clang/test/SemaCUDA/Inputs/cuda.h
View File

@ -22,7 +22,9 @@ typedef struct cudaStream *cudaStream_t;
int cudaConfigureCall(dim3 gridSize, dim3 blockSize, size_t sharedSize = 0, int cudaConfigureCall(dim3 gridSize, dim3 blockSize, size_t sharedSize = 0,
cudaStream_t stream = 0); cudaStream_t stream = 0);
// Device-side placement new overloads. // Host- and device-side placement new overloads.
void *operator new(__SIZE_TYPE__, void *p) { return p; }
void *operator new[](__SIZE_TYPE__, void *p) { return p; }
__device__ void *operator new(__SIZE_TYPE__, void *p) { return p; } __device__ void *operator new(__SIZE_TYPE__, void *p) { return p; }
__device__ void *operator new[](__SIZE_TYPE__, void *p) { return p; } __device__ void *operator new[](__SIZE_TYPE__, void *p) { return p; }

39
clang/test/SemaCUDA/call-host-fn-from-device.cu
View File

@ -12,6 +12,9 @@ extern "C" void host_fn() {}
// expected-note@-4 {{'host_fn' declared here}} // expected-note@-4 {{'host_fn' declared here}}
// expected-note@-5 {{'host_fn' declared here}} // expected-note@-5 {{'host_fn' declared here}}
// expected-note@-6 {{'host_fn' declared here}} // expected-note@-6 {{'host_fn' declared here}}
// expected-note@-7 {{'host_fn' declared here}}
struct Dummy {};
struct S { struct S {
S() {} S() {}
@ -34,6 +37,15 @@ struct T {
void h() {} void h() {}
// expected-note@-1 {{'h' declared here}} // expected-note@-1 {{'h' declared here}}
void operator+();
// expected-note@-1 {{'operator+' declared here}}
void operator-(const T&) {}
// expected-note@-1 {{'operator-' declared here}}
operator Dummy() { return Dummy(); }
// expected-note@-1 {{'operator Dummy' declared here}}
}; };
__host__ __device__ void T::hd3() { __host__ __device__ void T::hd3() {
@ -92,3 +104,30 @@ template <typename T>
__host__ __device__ void fn_ptr_template() { __host__ __device__ void fn_ptr_template() {
auto* ptr = &host_fn; // Not an error because the template isn't instantiated. auto* ptr = &host_fn; // Not an error because the template isn't instantiated.
} }
__host__ __device__ void unaryOp() {
T t;
(void) +t; // expected-error {{reference to __host__ function 'operator+' in __host__ __device__ function}}
}
__host__ __device__ void binaryOp() {
T t;
(void) (t - t); // expected-error {{reference to __host__ function 'operator-' in __host__ __device__ function}}
}
__host__ __device__ void implicitConversion() {
T t;
Dummy d = t; // expected-error {{reference to __host__ function 'operator Dummy' in __host__ __device__ function}}
}
template <typename T>
struct TmplStruct {
template <typename U> __host__ __device__ void fn() {}
};
template <>
template <>
__host__ __device__ void TmplStruct<int>::fn<int>() { host_fn(); }
// expected-error@-1 {{reference to __host__ function 'host_fn' in __host__ __device__ function}}
__device__ void double_specialization() { TmplStruct<int>().fn<int>(); }