diff options
| author | Andrew Paverd <andrew.paverd@microsoft.com> | 2020-01-10 11:08:18 +0000 |
|---|---|---|
| committer | David Chisnall <David.Chisnall@microsoft.com> | 2020-01-10 16:04:12 +0000 |
| commit | bdd88b7ed3956534a0a71b1ea2bc88c69d48f9b7 (patch) | |
| tree | 4f0a7aeaf0f6eb0a34d373c6c74c93763669d6c4 /clang/lib/CodeGen/CGCall.cpp | |
| parent | d864d93496c5fd0cc473953ab825f07e3d4c4e86 (diff) | |
| download | bcm5719-llvm-bdd88b7ed3956534a0a71b1ea2bc88c69d48f9b7.tar.gz bcm5719-llvm-bdd88b7ed3956534a0a71b1ea2bc88c69d48f9b7.zip | |
Add support for __declspec(guard(nocf))
Summary:
Avoid using the `nocf_check` attribute with Control Flow Guard. Instead, use a
new `"guard_nocf"` function attribute to indicate that checks should not be
added on indirect calls within that function. Add support for
`__declspec(guard(nocf))` following the same syntax as MSVC.
Reviewers: rnk, dmajor, pcc, hans, aaron.ballman
Reviewed By: aaron.ballman
Subscribers: aaron.ballman, tomrittervg, hiraditya, cfe-commits, llvm-commits
Tags: #clang, #llvm
Differential Revision: https://reviews.llvm.org/D72167
Diffstat (limited to 'clang/lib/CodeGen/CGCall.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGCall.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp index b49b194d611..e4803fde230 100644 --- a/clang/lib/CodeGen/CGCall.cpp +++ b/clang/lib/CodeGen/CGCall.cpp @@ -4415,6 +4415,17 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo, if (callOrInvoke) *callOrInvoke = CI; + // If this is within a function that has the guard(nocf) attribute and is an + // indirect call, add the "guard_nocf" attribute to this call to indicate that + // Control Flow Guard checks should not be added, even if the call is inlined. + if (const auto *FD = dyn_cast_or_null<FunctionDecl>(CurFuncDecl)) { + if (const auto *A = FD->getAttr<CFGuardAttr>()) { + if (A->getGuard() == CFGuardAttr::GuardArg::nocf && !CI->getCalledFunction()) + Attrs = Attrs.addAttribute( + getLLVMContext(), llvm::AttributeList::FunctionIndex, "guard_nocf"); + } + } + // Apply the attributes and calling convention. CI->setAttributes(Attrs); CI->setCallingConv(static_cast<llvm::CallingConv::ID>(CallingConv)); |

