diff options
| author | Erich Keane <erich.keane@intel.com> | 2020-04-08 13:14:33 -0700 |
|---|---|---|
| committer | Erich Keane <erich.keane@intel.com> | 2020-04-08 13:19:55 -0700 |
| commit | 30588a739584bb8ac41715d68656d22bd85198e7 (patch) | |
| tree | dfd35280a3d4d1d8739d438ed419fce3fccf9dbc /clang/lib/CodeGen/CodeGenFunction.cpp | |
| parent | eceae25f6d9a29303573859841481c24033f58e6 (diff) | |
| download | llvm-30588a739584bb8ac41715d68656d22bd85198e7.zip llvm-30588a739584bb8ac41715d68656d22bd85198e7.tar.gz llvm-30588a739584bb8ac41715d68656d22bd85198e7.tar.bz2 | |
Make target features check work with ctor and dtor-
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.
Diffstat (limited to 'clang/lib/CodeGen/CodeGenFunction.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index 618c9a0..b01a5a4 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -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))) |