Skip to content

Commit

Permalink
Make target features check work with ctor and dtor-
Browse files Browse the repository at this point in the history
The problem was reported in PR45468, applying target features to an
always_inline constructor/destructor runs afoul of GlobalDecl
construction assert when checking for target-feature compatibility.

The core problem is fixed by using the version of the check that takes a
FunctionDecl rather than the GlobalDecl. However, while writing the
test, I discovered that source locations weren't properly set for this
check on ctors/dtors. This patch also fixes constructors and CALLED destructors.

Unfortunately, it doesn't seem too possible to get a meaningful source
location for a 'cleanup' destructor, so those are still 'frontend' level
errors unfortunately. A fixme was added to the test to cover that
situation.
  • Loading branch information
Erich Keane committed Apr 8, 2020
1 parent eceae25 commit 30588a7
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 5 deletions.
2 changes: 1 addition & 1 deletion clang/lib/CodeGen/CGClass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2174,7 +2174,7 @@ void CodeGenFunction::EmitCXXConstructorCall(const CXXConstructorDecl *D,
const CGFunctionInfo &Info = CGM.getTypes().arrangeCXXConstructorCall(
Args, D, Type, ExtraArgs.Prefix, ExtraArgs.Suffix, PassPrototypeArgs);
CGCallee Callee = CGCallee::forDirect(CalleePtr, GlobalDecl(D, Type));
EmitCall(Info, Callee, ReturnValueSlot(), Args);
EmitCall(Info, Callee, ReturnValueSlot(), Args, nullptr, Loc);

// Generate vtable assumptions if we're constructing a complete object
// with a vtable. We don't do this for base subobjects for two reasons:
Expand Down
5 changes: 3 additions & 2 deletions clang/lib/CodeGen/CGExprCXX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ RValue CodeGenFunction::EmitCXXDestructorCall(
commonEmitCXXMemberOrOperatorCall(*this, DtorDecl, This, ImplicitParam,
ImplicitParamTy, CE, Args, nullptr);
return EmitCall(CGM.getTypes().arrangeCXXStructorDeclaration(Dtor), Callee,
ReturnValueSlot(), Args);
ReturnValueSlot(), Args, nullptr,
CE ? CE->getExprLoc() : SourceLocation{});
}

RValue CodeGenFunction::EmitCXXPseudoDestructorExpr(
Expand Down Expand Up @@ -380,7 +381,7 @@ RValue CodeGenFunction::EmitCXXMemberOrOperatorMemberCallExpr(
IsArrow ? Base->getType()->getPointeeType() : Base->getType();
EmitCXXDestructorCall(GD, Callee, This.getPointer(*this), ThisTy,
/*ImplicitParam=*/nullptr,
/*ImplicitParamTy=*/QualType(), nullptr);
/*ImplicitParamTy=*/QualType(), CE);
}
return RValue::get(nullptr);
}
Expand Down
3 changes: 1 addition & 2 deletions clang/lib/CodeGen/CodeGenFunction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2359,8 +2359,7 @@ void CodeGenFunction::checkTargetFeatures(SourceLocation Loc,

SmallVector<StringRef, 1> ReqFeatures;
llvm::StringMap<bool> CalleeFeatureMap;
CGM.getContext().getFunctionFeatureMap(CalleeFeatureMap,
GlobalDecl(TargetDecl));
CGM.getContext().getFunctionFeatureMap(CalleeFeatureMap, TargetDecl);

for (const auto &F : ParsedAttr.Features) {
if (F[0] == '+' && CalleeFeatureMap.lookup(F.substr(1)))
Expand Down
26 changes: 26 additions & 0 deletions clang/test/CodeGenCXX/target-features-error.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// RUN: %clang_cc1 %s -triple=x86_64-linux-gnu -S -verify -o - -DTEST1
// RUN: %clang_cc1 %s -triple=x86_64-linux-gnu -S -verify -o - -DTEST2
// RUN: %clang_cc1 %s -triple=x86_64-linux-gnu -S -verify -o - -DTEST3
// RUN: %clang_cc1 %s -triple=x86_64-linux-gnu -S -verify -o - -DTEST4

struct S {
__attribute__((always_inline, target("avx512f")))
Expand Down Expand Up @@ -59,3 +60,28 @@ void usage(S & s) {
}();
}
#endif

#ifdef TEST4
namespace PR45468 {
struct CtorAndDTor {
__attribute__((always_inline, target("avx512f"))) CtorAndDTor();
__attribute__((always_inline, target("avx512f"))) ~CtorAndDTor();
};

void usage() {
//expected-error@+1{{'CtorAndDTor' requires target feature 'avx512f'}}
CtorAndDTor c;
{
//expected-error@+1{{'CtorAndDTor' requires target feature 'avx512f'}}
CtorAndDTor c2;
//expected-error@+1{{'~CtorAndDTor' requires target feature 'avx512f'}}
c2.~CtorAndDTor();
}
// FIXME: These need to be given a line number, however theres no good way
// to get to the SourceLocation of anything by the time we're doing CodeGen
// cleanups.
//expected-error@*{{'~CtorAndDTor' requires target feature 'avx512f'}}
//expected-error@*{{'~CtorAndDTor' requires target feature 'avx512f'}}
}
}
#endif

0 comments on commit 30588a7

Please sign in to comment.