[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rG280333021e95: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute (authored by melver). Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 Files: clang/docs/SanitizerCoverage.rst clang/include/clang/Basic/Attr.td clang/include/clang/Basic/AttrDocs.td clang/lib/CodeGen/CodeGenFunction.cpp clang/lib/Sema/SemaDeclAttr.cpp clang/test/CodeGen/sanitize-coverage.c llvm/bindings/go/llvm/ir_test.go llvm/docs/BitCodeFormat.rst llvm/docs/LangRef.rst llvm/include/llvm/AsmParser/LLToken.h llvm/include/llvm/Bitcode/LLVMBitCodes.h llvm/include/llvm/IR/Attributes.td llvm/lib/AsmParser/LLLexer.cpp llvm/lib/AsmParser/LLParser.cpp llvm/lib/Bitcode/Reader/BitcodeReader.cpp llvm/lib/Bitcode/Writer/BitcodeWriter.cpp llvm/lib/IR/Attributes.cpp llvm/lib/IR/Verifier.cpp llvm/lib/Transforms/IPO/ForceFunctionAttrs.cpp llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp llvm/lib/Transforms/Utils/CodeExtractor.cpp llvm/test/Bitcode/attributes.ll llvm/test/Bitcode/compatibility.ll llvm/utils/emacs/llvm-mode.el llvm/utils/llvm.grm llvm/utils/vim/syntax/llvm.vim llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml Index: llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml === --- llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml +++ llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml @@ -237,6 +237,7 @@ \\bnosync\\b|\ \\bnoundef\\b|\ \\bnounwind\\b|\ +\\bnosanitize_coverage\\b|\ \\bnull_pointer_is_valid\\b|\ \\boptforfuzzing\\b|\ \\boptnone\\b|\ Index: llvm/utils/vim/syntax/llvm.vim === --- llvm/utils/vim/syntax/llvm.vim +++ llvm/utils/vim/syntax/llvm.vim @@ -138,6 +138,7 @@ \ nosync \ noundef \ nounwind + \ nosanitize_coverage \ null_pointer_is_valid \ optforfuzzing \ optnone Index: llvm/utils/llvm.grm === --- llvm/utils/llvm.grm +++ llvm/utils/llvm.grm @@ -176,6 +176,7 @@ | sanitize_thread | sanitize_memory | mustprogress + | nosanitize_coverage ; OptFuncAttrs ::= + _ | OptFuncAttrs FuncAttr ; Index: llvm/utils/emacs/llvm-mode.el === --- llvm/utils/emacs/llvm-mode.el +++ llvm/utils/emacs/llvm-mode.el @@ -25,7 +25,7 @@ '("alwaysinline" "argmemonly" "allocsize" "builtin" "cold" "convergent" "dereferenceable" "dereferenceable_or_null" "hot" "inaccessiblememonly" "inaccessiblemem_or_argmemonly" "inalloca" "inlinehint" "jumptable" "minsize" "mustprogress" "naked" "nobuiltin" "nonnull" "nocallback" "nocf_check" "noduplicate" "nofree" "noimplicitfloat" "noinline" "nomerge" "nonlazybind" "noprofile" "noredzone" "noreturn" - "norecurse" "nosync" "noundef" "nounwind" "null_pointer_is_valid" "optforfuzzing" "optnone" "optsize" "preallocated" "readnone" "readonly" "returned" "returns_twice" + "norecurse" "nosync" "noundef" "nounwind" "nosanitize_coverage" "null_pointer_is_valid" "optforfuzzing" "optnone" "optsize" "preallocated" "readnone" "readonly" "returned" "returns_twice" "shadowcallstack" "speculatable" "speculative_load_hardening" "ssp" "sspreq" "sspstrong" "safestack" "sanitize_address" "sanitize_hwaddress" "sanitize_memtag" "sanitize_thread" "sanitize_memory" "strictfp" "swifterror" "uwtable" "vscale_range" "willreturn" "writeonly" "immarg") 'symbols) . font-lock-constant-face) ;; Variables Index: llvm/test/Bitcode/compatibility.ll === --- llvm/test/Bitcode/compatibility.ll +++ llvm/test/Bitcode/compatibility.ll @@ -1510,7 +1510,7 @@ ; CHECK: select <2 x i1> , <2 x i8> , <2 x i8> call void @f.nobuiltin() builtin - ; CHECK: call void @f.nobuiltin() #44 + ; CHECK: call void @f.nobuiltin() #45 call fastcc noalias i32* @f.noalias() noinline ; CHECK: call fastcc noalias i32* @f.noalias() #12 @@ -1904,6 +1904,9 @@ ret void } +declare void @f.nosanitize_coverage() nosanitize_coverage +; CHECK: declare void @f.nosanitize_coverage() #44 + ; immarg attribute declare void @llvm.test.immarg.intrinsic(i32 immarg) ; CHECK: declare void @llvm.test.immarg.intrinsic(i32 immarg) @@ -1961,7 +1964,8 @@ ; CHECK: attributes #41 = { writeonly } ; CHECK: attributes #42 = { speculatable } ; CHECK: attributes #43 = { strictfp } -; CHECK: attributes #44 = { builtin } +; CHECK: attributes #44 = { nosanitize_coverage } +; CHECK: attributes #45 = { builtin } ;; Metadata Index: llvm/test/Bitcod
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
melver added a comment. Please have a look at the other 2 patches which are now a dependency for this. Once you're happy with all 3 I'll push them all together. Thanks! Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
melver added inline comments. Comment at: clang/lib/CodeGen/CodeGenFunction.cpp:757-760 +bool HaveSanitizeCoverage = +CGM.getCodeGenOpts().SanitizeCoverageType || +CGM.getCodeGenOpts().SanitizeCoverageIndirectCalls || +CGM.getCodeGenOpts().SanitizeCoverageTraceCmp; vitalybuka wrote: > consider adding method into CodeGenOptions and replace here and and the rest > ideally in a separate patch > https://reviews.llvm.org/D102927 Comment at: clang/test/CodeGen/sanitize-coverage.c:23-87 +static inline __attribute__((__always_inline__)) void always_inlined_fn(int n) { + if (n) +x[n] = 42; +} +// CHECK-LABEL: define dso_local void @test_always_inline( +void test_always_inline(int n) { + // CHECK-DAG: call void @__sanitizer_cov_trace_pc melver wrote: > vitalybuka wrote: > > you are adding tests for unrelated code. > > Could you please land is as a separate NFC patch first? > Which bits in particular? Just the > > > ``` > static inline __attribute__((__always_inline__)) void always_inlined_fn(int > n) { > if (n) > x[n] = 42; > } > // CHECK-LABEL: define dso_local void @test_always_inline( > void test_always_inline(int n) { > // CHECK-DAG: call void @__sanitizer_cov_trace_pc > // CHECK-DAG: call void @__sanitizer_cov_trace_const_cmp > always_inlined_fn(n); > } > ``` > > part? https://reviews.llvm.org/D102929 Comment at: llvm/lib/AsmParser/LLLexer.cpp:674 KEYWORD(nounwind); + KEYWORD(no_sanitize_coverage); KEYWORD(null_pointer_is_valid); vitalybuka wrote: > looking at the rest, seems "nosanitize_coverage" follows pattern better :) I wasn't sure myself, it's a bit inconsistent with "no_sanitize", but I've changed it. ;-) Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
melver updated this revision to Diff 347062. melver marked 3 inline comments as done. melver added a comment. - Refactor test and SanitizeCoverage* checking. - s/no_sanitize_coverage/nosanitize_coverage/ Thanks! Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 Files: clang/docs/SanitizerCoverage.rst clang/include/clang/Basic/Attr.td clang/include/clang/Basic/AttrDocs.td clang/lib/CodeGen/CodeGenFunction.cpp clang/lib/Sema/SemaDeclAttr.cpp clang/test/CodeGen/sanitize-coverage.c llvm/bindings/go/llvm/ir_test.go llvm/docs/BitCodeFormat.rst llvm/docs/LangRef.rst llvm/include/llvm/AsmParser/LLToken.h llvm/include/llvm/Bitcode/LLVMBitCodes.h llvm/include/llvm/IR/Attributes.td llvm/lib/AsmParser/LLLexer.cpp llvm/lib/AsmParser/LLParser.cpp llvm/lib/Bitcode/Reader/BitcodeReader.cpp llvm/lib/Bitcode/Writer/BitcodeWriter.cpp llvm/lib/IR/Attributes.cpp llvm/lib/IR/Verifier.cpp llvm/lib/Transforms/IPO/ForceFunctionAttrs.cpp llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp llvm/lib/Transforms/Utils/CodeExtractor.cpp llvm/test/Bitcode/attributes.ll llvm/test/Bitcode/compatibility.ll llvm/utils/emacs/llvm-mode.el llvm/utils/llvm.grm llvm/utils/vim/syntax/llvm.vim llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml Index: llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml === --- llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml +++ llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml @@ -237,6 +237,7 @@ \\bnosync\\b|\ \\bnoundef\\b|\ \\bnounwind\\b|\ +\\bnosanitize_coverage\\b|\ \\bnull_pointer_is_valid\\b|\ \\boptforfuzzing\\b|\ \\boptnone\\b|\ Index: llvm/utils/vim/syntax/llvm.vim === --- llvm/utils/vim/syntax/llvm.vim +++ llvm/utils/vim/syntax/llvm.vim @@ -138,6 +138,7 @@ \ nosync \ noundef \ nounwind + \ nosanitize_coverage \ null_pointer_is_valid \ optforfuzzing \ optnone Index: llvm/utils/llvm.grm === --- llvm/utils/llvm.grm +++ llvm/utils/llvm.grm @@ -176,6 +176,7 @@ | sanitize_thread | sanitize_memory | mustprogress + | nosanitize_coverage ; OptFuncAttrs ::= + _ | OptFuncAttrs FuncAttr ; Index: llvm/utils/emacs/llvm-mode.el === --- llvm/utils/emacs/llvm-mode.el +++ llvm/utils/emacs/llvm-mode.el @@ -25,7 +25,7 @@ '("alwaysinline" "argmemonly" "allocsize" "builtin" "cold" "convergent" "dereferenceable" "dereferenceable_or_null" "hot" "inaccessiblememonly" "inaccessiblemem_or_argmemonly" "inalloca" "inlinehint" "jumptable" "minsize" "mustprogress" "naked" "nobuiltin" "nonnull" "nocallback" "nocf_check" "noduplicate" "nofree" "noimplicitfloat" "noinline" "nomerge" "nonlazybind" "noprofile" "noredzone" "noreturn" - "norecurse" "nosync" "noundef" "nounwind" "null_pointer_is_valid" "optforfuzzing" "optnone" "optsize" "preallocated" "readnone" "readonly" "returned" "returns_twice" + "norecurse" "nosync" "noundef" "nounwind" "nosanitize_coverage" "null_pointer_is_valid" "optforfuzzing" "optnone" "optsize" "preallocated" "readnone" "readonly" "returned" "returns_twice" "shadowcallstack" "speculatable" "speculative_load_hardening" "ssp" "sspreq" "sspstrong" "safestack" "sanitize_address" "sanitize_hwaddress" "sanitize_memtag" "sanitize_thread" "sanitize_memory" "strictfp" "swifterror" "uwtable" "vscale_range" "willreturn" "writeonly" "immarg") 'symbols) . font-lock-constant-face) ;; Variables Index: llvm/test/Bitcode/compatibility.ll === --- llvm/test/Bitcode/compatibility.ll +++ llvm/test/Bitcode/compatibility.ll @@ -1510,7 +1510,7 @@ ; CHECK: select <2 x i1> , <2 x i8> , <2 x i8> call void @f.nobuiltin() builtin - ; CHECK: call void @f.nobuiltin() #44 + ; CHECK: call void @f.nobuiltin() #45 call fastcc noalias i32* @f.noalias() noinline ; CHECK: call fastcc noalias i32* @f.noalias() #12 @@ -1904,6 +1904,9 @@ ret void } +declare void @f.nosanitize_coverage() nosanitize_coverage +; CHECK: declare void @f.nosanitize_coverage() #44 + ; immarg attribute declare void @llvm.test.immarg.intrinsic(i32 immarg) ; CHECK: declare void @llvm.test.immarg.intrinsic(i32 immarg) @@ -1961,7 +1964,8 @@ ; CHECK: attributes #41 = { writeonly } ; CHECK: attributes #42 = { speculatable } ; CHECK: attributes #43 = { strictfp } -; CHECK: attributes #44 = { builtin } +; CHECK: attributes #44 = { nosanitize_coverage } +; CHECK: attributes #45 = { builtin } ;; Metadata Index: llvm/test/Bitcode/attributes.ll
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
melver added inline comments. Comment at: clang/test/CodeGen/sanitize-coverage.c:23-87 +static inline __attribute__((__always_inline__)) void always_inlined_fn(int n) { + if (n) +x[n] = 42; +} +// CHECK-LABEL: define dso_local void @test_always_inline( +void test_always_inline(int n) { + // CHECK-DAG: call void @__sanitizer_cov_trace_pc vitalybuka wrote: > you are adding tests for unrelated code. > Could you please land is as a separate NFC patch first? Which bits in particular? Just the ``` static inline __attribute__((__always_inline__)) void always_inlined_fn(int n) { if (n) x[n] = 42; } // CHECK-LABEL: define dso_local void @test_always_inline( void test_always_inline(int n) { // CHECK-DAG: call void @__sanitizer_cov_trace_pc // CHECK-DAG: call void @__sanitizer_cov_trace_const_cmp always_inlined_fn(n); } ``` part? Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
vitalybuka accepted this revision. vitalybuka added inline comments. Comment at: clang/lib/CodeGen/CodeGenFunction.cpp:757-760 +bool HaveSanitizeCoverage = +CGM.getCodeGenOpts().SanitizeCoverageType || +CGM.getCodeGenOpts().SanitizeCoverageIndirectCalls || +CGM.getCodeGenOpts().SanitizeCoverageTraceCmp; consider adding method into CodeGenOptions and replace here and and the rest ideally in a separate patch Comment at: clang/test/CodeGen/sanitize-coverage.c:23-87 +static inline __attribute__((__always_inline__)) void always_inlined_fn(int n) { + if (n) +x[n] = 42; +} +// CHECK-LABEL: define dso_local void @test_always_inline( +void test_always_inline(int n) { + // CHECK-DAG: call void @__sanitizer_cov_trace_pc you are adding tests for unrelated code. Could you please land is as a separate NFC patch first? Comment at: llvm/lib/AsmParser/LLLexer.cpp:674 KEYWORD(nounwind); + KEYWORD(no_sanitize_coverage); KEYWORD(null_pointer_is_valid); looking at the rest, seems "nosanitize_coverage" follows pattern better :) Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
morehouse accepted this revision. morehouse added a comment. This revision is now accepted and ready to land. LGTM Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
melver updated this revision to Diff 346577. melver added a comment. Herald added a subscriber: steven_wu. Rest of long-tail of IR changes related to introducing a new attributes... Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 Files: clang/docs/SanitizerCoverage.rst clang/include/clang/Basic/Attr.td clang/include/clang/Basic/AttrDocs.td clang/lib/CodeGen/CodeGenFunction.cpp clang/lib/Sema/SemaDeclAttr.cpp clang/test/CodeGen/sanitize-coverage.c llvm/bindings/go/llvm/ir_test.go llvm/docs/BitCodeFormat.rst llvm/docs/LangRef.rst llvm/include/llvm/AsmParser/LLToken.h llvm/include/llvm/Bitcode/LLVMBitCodes.h llvm/include/llvm/IR/Attributes.td llvm/lib/AsmParser/LLLexer.cpp llvm/lib/AsmParser/LLParser.cpp llvm/lib/Bitcode/Reader/BitcodeReader.cpp llvm/lib/Bitcode/Writer/BitcodeWriter.cpp llvm/lib/IR/Attributes.cpp llvm/lib/IR/Verifier.cpp llvm/lib/Transforms/IPO/ForceFunctionAttrs.cpp llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp llvm/lib/Transforms/Utils/CodeExtractor.cpp llvm/test/Bitcode/attributes.ll llvm/test/Bitcode/compatibility.ll llvm/utils/emacs/llvm-mode.el llvm/utils/llvm.grm llvm/utils/vim/syntax/llvm.vim llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml Index: llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml === --- llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml +++ llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml @@ -237,6 +237,7 @@ \\bnosync\\b|\ \\bnoundef\\b|\ \\bnounwind\\b|\ +\\bno_sanitize_coverage\\b|\ \\bnull_pointer_is_valid\\b|\ \\boptforfuzzing\\b|\ \\boptnone\\b|\ Index: llvm/utils/vim/syntax/llvm.vim === --- llvm/utils/vim/syntax/llvm.vim +++ llvm/utils/vim/syntax/llvm.vim @@ -138,6 +138,7 @@ \ nosync \ noundef \ nounwind + \ no_sanitize_coverage \ null_pointer_is_valid \ optforfuzzing \ optnone Index: llvm/utils/llvm.grm === --- llvm/utils/llvm.grm +++ llvm/utils/llvm.grm @@ -176,6 +176,7 @@ | sanitize_thread | sanitize_memory | mustprogress + | no_sanitize_coverage ; OptFuncAttrs ::= + _ | OptFuncAttrs FuncAttr ; Index: llvm/utils/emacs/llvm-mode.el === --- llvm/utils/emacs/llvm-mode.el +++ llvm/utils/emacs/llvm-mode.el @@ -25,7 +25,7 @@ '("alwaysinline" "argmemonly" "allocsize" "builtin" "cold" "convergent" "dereferenceable" "dereferenceable_or_null" "hot" "inaccessiblememonly" "inaccessiblemem_or_argmemonly" "inalloca" "inlinehint" "jumptable" "minsize" "mustprogress" "naked" "nobuiltin" "nonnull" "nocallback" "nocf_check" "noduplicate" "nofree" "noimplicitfloat" "noinline" "nomerge" "nonlazybind" "noprofile" "noredzone" "noreturn" - "norecurse" "nosync" "noundef" "nounwind" "null_pointer_is_valid" "optforfuzzing" "optnone" "optsize" "preallocated" "readnone" "readonly" "returned" "returns_twice" + "norecurse" "nosync" "noundef" "nounwind" "no_sanitize_coverage" "null_pointer_is_valid" "optforfuzzing" "optnone" "optsize" "preallocated" "readnone" "readonly" "returned" "returns_twice" "shadowcallstack" "speculatable" "speculative_load_hardening" "ssp" "sspreq" "sspstrong" "safestack" "sanitize_address" "sanitize_hwaddress" "sanitize_memtag" "sanitize_thread" "sanitize_memory" "strictfp" "swifterror" "uwtable" "vscale_range" "willreturn" "writeonly" "immarg") 'symbols) . font-lock-constant-face) ;; Variables Index: llvm/test/Bitcode/compatibility.ll === --- llvm/test/Bitcode/compatibility.ll +++ llvm/test/Bitcode/compatibility.ll @@ -1510,7 +1510,7 @@ ; CHECK: select <2 x i1> , <2 x i8> , <2 x i8> call void @f.nobuiltin() builtin - ; CHECK: call void @f.nobuiltin() #44 + ; CHECK: call void @f.nobuiltin() #45 call fastcc noalias i32* @f.noalias() noinline ; CHECK: call fastcc noalias i32* @f.noalias() #12 @@ -1904,6 +1904,9 @@ ret void } +declare void @f.no_sanitize_coverage() no_sanitize_coverage +; CHECK: declare void @f.no_sanitize_coverage() #44 + ; immarg attribute declare void @llvm.test.immarg.intrinsic(i32 immarg) ; CHECK: declare void @llvm.test.immarg.intrinsic(i32 immarg) @@ -1961,7 +1964,8 @@ ; CHECK: attributes #41 = { writeonly } ; CHECK: attributes #42 = { speculatable } ; CHECK: attributes #43 = { strictfp } -; CHECK: attributes #44 = { builtin } +; CHECK: attributes #44 = { no_sanitize_coverage } +; CHECK: attributes #45 = { builtin } ;; Metadata Index: llvm/test/Bitcode/attributes.ll ===
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
aaron.ballman added inline comments. Comment at: clang/lib/Sema/SemaDeclAttr.cpp:7276-7278 if (parseSanitizerValue(SanitizerName, /*AllowGroups=*/true) == -SanitizerMask()) +SanitizerMask() && +SanitizerName != "coverage") melver wrote: > aaron.ballman wrote: > > The formatting looks rather off here to my eyes, but if this is what > > clang-format produces for you, then I'm fine with it. > Yeah, I had something else here, but then clang-format suggested this and I > don't like it either. > > Could remove the /*AllowGroups=*/ bit, for the sake of formatting better? I'd rather have the comment + ugly formatting than pretty formatting + mysterious boolean literal, so I'd say let's just leave it as-is. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
melver added inline comments. Comment at: clang/lib/Sema/SemaDeclAttr.cpp:7276-7278 if (parseSanitizerValue(SanitizerName, /*AllowGroups=*/true) == -SanitizerMask()) +SanitizerMask() && +SanitizerName != "coverage") aaron.ballman wrote: > The formatting looks rather off here to my eyes, but if this is what > clang-format produces for you, then I'm fine with it. Yeah, I had something else here, but then clang-format suggested this and I don't like it either. Could remove the /*AllowGroups=*/ bit, for the sake of formatting better? Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
aaron.ballman added a comment. The clang parts look good to me, but someone else should do the final sign-off. Comment at: clang/lib/Sema/SemaDeclAttr.cpp:7276-7278 if (parseSanitizerValue(SanitizerName, /*AllowGroups=*/true) == -SanitizerMask()) +SanitizerMask() && +SanitizerName != "coverage") The formatting looks rather off here to my eyes, but if this is what clang-format produces for you, then I'm fine with it. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
melver updated this revision to Diff 346484. melver added a comment. Test that always_inline works as expected with no_sanitize("coverage") Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 Files: clang/docs/SanitizerCoverage.rst clang/include/clang/Basic/Attr.td clang/include/clang/Basic/AttrDocs.td clang/lib/CodeGen/CodeGenFunction.cpp clang/lib/Sema/SemaDeclAttr.cpp clang/test/CodeGen/sanitize-coverage.c llvm/include/llvm/Bitcode/LLVMBitCodes.h llvm/include/llvm/IR/Attributes.td llvm/lib/Bitcode/Reader/BitcodeReader.cpp llvm/lib/Bitcode/Writer/BitcodeWriter.cpp llvm/lib/IR/Attributes.cpp llvm/lib/IR/Verifier.cpp llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp llvm/lib/Transforms/Utils/CodeExtractor.cpp Index: llvm/lib/Transforms/Utils/CodeExtractor.cpp === --- llvm/lib/Transforms/Utils/CodeExtractor.cpp +++ llvm/lib/Transforms/Utils/CodeExtractor.cpp @@ -954,6 +954,7 @@ case Attribute::NonLazyBind: case Attribute::NoRedZone: case Attribute::NoUnwind: + case Attribute::NoSanitizeCoverage: case Attribute::NullPointerIsValid: case Attribute::OptForFuzzing: case Attribute::OptimizeNone: Index: llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp === --- llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp +++ llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp @@ -621,6 +621,8 @@ return; if (Blocklist && Blocklist->inSection("coverage", "fun", F.getName())) return; + if (F.hasFnAttribute(Attribute::NoSanitizeCoverage)) +return; if (Options.CoverageType >= SanitizerCoverageOptions::SCK_Edge) SplitAllCriticalEdges(F, CriticalEdgeSplittingOptions().setIgnoreUnreachableDests()); SmallVector IndirCalls; Index: llvm/lib/IR/Verifier.cpp === --- llvm/lib/IR/Verifier.cpp +++ llvm/lib/IR/Verifier.cpp @@ -1661,6 +1661,7 @@ case Attribute::NoCfCheck: case Attribute::NoUnwind: case Attribute::NoInline: + case Attribute::NoSanitizeCoverage: case Attribute::AlwaysInline: case Attribute::OptimizeForSize: case Attribute::StackProtect: Index: llvm/lib/IR/Attributes.cpp === --- llvm/lib/IR/Attributes.cpp +++ llvm/lib/IR/Attributes.cpp @@ -442,6 +442,8 @@ return "noprofile"; if (hasAttribute(Attribute::NoUnwind)) return "nounwind"; + if (hasAttribute(Attribute::NoSanitizeCoverage)) +return "no_sanitize_coverage"; if (hasAttribute(Attribute::OptForFuzzing)) return "optforfuzzing"; if (hasAttribute(Attribute::OptimizeNone)) Index: llvm/lib/Bitcode/Writer/BitcodeWriter.cpp === --- llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -686,6 +686,8 @@ return bitc::ATTR_KIND_NO_PROFILE; case Attribute::NoUnwind: return bitc::ATTR_KIND_NO_UNWIND; + case Attribute::NoSanitizeCoverage: +return bitc::ATTR_KIND_NO_SANITIZE_COVERAGE; case Attribute::NullPointerIsValid: return bitc::ATTR_KIND_NULL_POINTER_IS_VALID; case Attribute::OptForFuzzing: Index: llvm/lib/Bitcode/Reader/BitcodeReader.cpp === --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1474,6 +1474,8 @@ return Attribute::NoCfCheck; case bitc::ATTR_KIND_NO_UNWIND: return Attribute::NoUnwind; + case bitc::ATTR_KIND_NO_SANITIZE_COVERAGE: +return Attribute::NoSanitizeCoverage; case bitc::ATTR_KIND_NULL_POINTER_IS_VALID: return Attribute::NullPointerIsValid; case bitc::ATTR_KIND_OPT_FOR_FUZZING: Index: llvm/include/llvm/IR/Attributes.td === --- llvm/include/llvm/IR/Attributes.td +++ llvm/include/llvm/IR/Attributes.td @@ -154,6 +154,9 @@ /// Function doesn't unwind stack. def NoUnwind : EnumAttr<"nounwind">; +/// No SanitizeCoverage instrumentation. +def NoSanitizeCoverage : EnumAttr<"no_sanitize_coverage">; + /// Null pointer in address space zero is valid. def NullPointerIsValid : EnumAttr<"null_pointer_is_valid">; Index: llvm/include/llvm/Bitcode/LLVMBitCodes.h === --- llvm/include/llvm/Bitcode/LLVMBitCodes.h +++ llvm/include/llvm/Bitcode/LLVMBitCodes.h @@ -666,6 +666,7 @@ ATTR_KIND_NO_PROFILE = 73, ATTR_KIND_VSCALE_RANGE = 74, ATTR_KIND_SWIFT_ASYNC = 75, + ATTR_KIND_NO_SANITIZE_COVERAGE = 76, }; enum ComdatSelectionKindCodes { Index: clang/test/CodeGen/sanitize-coverage.c === --- clang/te
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
melver updated this revision to Diff 346452. melver marked 2 inline comments as done. melver added a comment. Address Aaron's comments Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 Files: clang/docs/SanitizerCoverage.rst clang/include/clang/Basic/Attr.td clang/include/clang/Basic/AttrDocs.td clang/lib/CodeGen/CodeGenFunction.cpp clang/lib/Sema/SemaDeclAttr.cpp clang/test/CodeGen/sanitize-coverage.c llvm/include/llvm/Bitcode/LLVMBitCodes.h llvm/include/llvm/IR/Attributes.td llvm/lib/Bitcode/Reader/BitcodeReader.cpp llvm/lib/Bitcode/Writer/BitcodeWriter.cpp llvm/lib/IR/Attributes.cpp llvm/lib/IR/Verifier.cpp llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp llvm/lib/Transforms/Utils/CodeExtractor.cpp Index: llvm/lib/Transforms/Utils/CodeExtractor.cpp === --- llvm/lib/Transforms/Utils/CodeExtractor.cpp +++ llvm/lib/Transforms/Utils/CodeExtractor.cpp @@ -954,6 +954,7 @@ case Attribute::NonLazyBind: case Attribute::NoRedZone: case Attribute::NoUnwind: + case Attribute::NoSanitizeCoverage: case Attribute::NullPointerIsValid: case Attribute::OptForFuzzing: case Attribute::OptimizeNone: Index: llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp === --- llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp +++ llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp @@ -621,6 +621,8 @@ return; if (Blocklist && Blocklist->inSection("coverage", "fun", F.getName())) return; + if (F.hasFnAttribute(Attribute::NoSanitizeCoverage)) +return; if (Options.CoverageType >= SanitizerCoverageOptions::SCK_Edge) SplitAllCriticalEdges(F, CriticalEdgeSplittingOptions().setIgnoreUnreachableDests()); SmallVector IndirCalls; Index: llvm/lib/IR/Verifier.cpp === --- llvm/lib/IR/Verifier.cpp +++ llvm/lib/IR/Verifier.cpp @@ -1661,6 +1661,7 @@ case Attribute::NoCfCheck: case Attribute::NoUnwind: case Attribute::NoInline: + case Attribute::NoSanitizeCoverage: case Attribute::AlwaysInline: case Attribute::OptimizeForSize: case Attribute::StackProtect: Index: llvm/lib/IR/Attributes.cpp === --- llvm/lib/IR/Attributes.cpp +++ llvm/lib/IR/Attributes.cpp @@ -442,6 +442,8 @@ return "noprofile"; if (hasAttribute(Attribute::NoUnwind)) return "nounwind"; + if (hasAttribute(Attribute::NoSanitizeCoverage)) +return "no_sanitize_coverage"; if (hasAttribute(Attribute::OptForFuzzing)) return "optforfuzzing"; if (hasAttribute(Attribute::OptimizeNone)) Index: llvm/lib/Bitcode/Writer/BitcodeWriter.cpp === --- llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -686,6 +686,8 @@ return bitc::ATTR_KIND_NO_PROFILE; case Attribute::NoUnwind: return bitc::ATTR_KIND_NO_UNWIND; + case Attribute::NoSanitizeCoverage: +return bitc::ATTR_KIND_NO_SANITIZE_COVERAGE; case Attribute::NullPointerIsValid: return bitc::ATTR_KIND_NULL_POINTER_IS_VALID; case Attribute::OptForFuzzing: Index: llvm/lib/Bitcode/Reader/BitcodeReader.cpp === --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1474,6 +1474,8 @@ return Attribute::NoCfCheck; case bitc::ATTR_KIND_NO_UNWIND: return Attribute::NoUnwind; + case bitc::ATTR_KIND_NO_SANITIZE_COVERAGE: +return Attribute::NoSanitizeCoverage; case bitc::ATTR_KIND_NULL_POINTER_IS_VALID: return Attribute::NullPointerIsValid; case bitc::ATTR_KIND_OPT_FOR_FUZZING: Index: llvm/include/llvm/IR/Attributes.td === --- llvm/include/llvm/IR/Attributes.td +++ llvm/include/llvm/IR/Attributes.td @@ -154,6 +154,9 @@ /// Function doesn't unwind stack. def NoUnwind : EnumAttr<"nounwind">; +/// No SanitizeCoverage instrumentation. +def NoSanitizeCoverage : EnumAttr<"no_sanitize_coverage">; + /// Null pointer in address space zero is valid. def NullPointerIsValid : EnumAttr<"null_pointer_is_valid">; Index: llvm/include/llvm/Bitcode/LLVMBitCodes.h === --- llvm/include/llvm/Bitcode/LLVMBitCodes.h +++ llvm/include/llvm/Bitcode/LLVMBitCodes.h @@ -666,6 +666,7 @@ ATTR_KIND_NO_PROFILE = 73, ATTR_KIND_VSCALE_RANGE = 74, ATTR_KIND_SWIFT_ASYNC = 75, + ATTR_KIND_NO_SANITIZE_COVERAGE = 76, }; enum ComdatSelectionKindCodes { Index: clang/test/CodeGen/sanitize-coverage.c === --- clang/test/Co
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
aaron.ballman added inline comments. Comment at: clang/docs/SanitizerCoverage.rst:319 +It is possible to disable coverage instrumentation for select functions via the +function attribute ``__attribute__((no_sanitize("coverage")))``. + I would expect to see this documentation also in AttrDocs.td within the `NoSanitizeDocs`. Comment at: clang/include/clang/Basic/Attr.td:2902-2906 + for (auto SanitizerName : sanitizers()) { +if (SanitizerName == "coverage") + return true; + } + return false; Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D102772/new/ https://reviews.llvm.org/D102772 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D102772: [SanitizeCoverage] Add support for NoSanitizeCoverage function attribute
melver created this revision. melver added reviewers: vitalybuka, morehouse, glider, dvyukov. Herald added subscribers: dexonsmith, jdoerfert, pengfei, hiraditya. Herald added a reviewer: aaron.ballman. melver requested review of this revision. Herald added projects: clang, LLVM. Herald added subscribers: llvm-commits, cfe-commits. We really ought to support no_sanitize("coverage") in line with other sanitizers. This came up again in discussions on the Linux-kernel mailing lists, because we currently do workarounds using objtool to remove coverage instrumentation. Since that support is only on x86, to continue support coverage instrumentation on other architectures, we must support selectively disabling coverage instrumentation via function attributes. Unfortunately, for SanitizeCoverage, it has not been implemented as a sanitizer via fsanitize= and associated options in Sanitizers.def, but rolls its own option fsanitize-coverage. This meant that we never got "automatic" no_sanitize attribute support. Implement no_sanitize attribute support by special-casing the string "coverage" in the NoSanitizeAttr implementation. To keep the feature as unintrusive to existing IR generation as possible, define a new negative function attribute NoSanitizeCoverage to propagate the information through to the instrumentation pass. Fixes: https://bugs.llvm.org/show_bug.cgi?id=49035 Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D102772 Files: clang/docs/SanitizerCoverage.rst clang/include/clang/Basic/Attr.td clang/lib/CodeGen/CodeGenFunction.cpp clang/lib/Sema/SemaDeclAttr.cpp clang/test/CodeGen/sanitize-coverage.c llvm/include/llvm/Bitcode/LLVMBitCodes.h llvm/include/llvm/IR/Attributes.td llvm/lib/Bitcode/Reader/BitcodeReader.cpp llvm/lib/Bitcode/Writer/BitcodeWriter.cpp llvm/lib/IR/Attributes.cpp llvm/lib/IR/Verifier.cpp llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp llvm/lib/Transforms/Utils/CodeExtractor.cpp Index: llvm/lib/Transforms/Utils/CodeExtractor.cpp === --- llvm/lib/Transforms/Utils/CodeExtractor.cpp +++ llvm/lib/Transforms/Utils/CodeExtractor.cpp @@ -954,6 +954,7 @@ case Attribute::NonLazyBind: case Attribute::NoRedZone: case Attribute::NoUnwind: + case Attribute::NoSanitizeCoverage: case Attribute::NullPointerIsValid: case Attribute::OptForFuzzing: case Attribute::OptimizeNone: Index: llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp === --- llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp +++ llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp @@ -621,6 +621,8 @@ return; if (Blocklist && Blocklist->inSection("coverage", "fun", F.getName())) return; + if (F.hasFnAttribute(Attribute::NoSanitizeCoverage)) +return; if (Options.CoverageType >= SanitizerCoverageOptions::SCK_Edge) SplitAllCriticalEdges(F, CriticalEdgeSplittingOptions().setIgnoreUnreachableDests()); SmallVector IndirCalls; Index: llvm/lib/IR/Verifier.cpp === --- llvm/lib/IR/Verifier.cpp +++ llvm/lib/IR/Verifier.cpp @@ -1661,6 +1661,7 @@ case Attribute::NoCfCheck: case Attribute::NoUnwind: case Attribute::NoInline: + case Attribute::NoSanitizeCoverage: case Attribute::AlwaysInline: case Attribute::OptimizeForSize: case Attribute::StackProtect: Index: llvm/lib/IR/Attributes.cpp === --- llvm/lib/IR/Attributes.cpp +++ llvm/lib/IR/Attributes.cpp @@ -442,6 +442,8 @@ return "noprofile"; if (hasAttribute(Attribute::NoUnwind)) return "nounwind"; + if (hasAttribute(Attribute::NoSanitizeCoverage)) +return "no_sanitize_coverage"; if (hasAttribute(Attribute::OptForFuzzing)) return "optforfuzzing"; if (hasAttribute(Attribute::OptimizeNone)) Index: llvm/lib/Bitcode/Writer/BitcodeWriter.cpp === --- llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -686,6 +686,8 @@ return bitc::ATTR_KIND_NO_PROFILE; case Attribute::NoUnwind: return bitc::ATTR_KIND_NO_UNWIND; + case Attribute::NoSanitizeCoverage: +return bitc::ATTR_KIND_NO_SANITIZE_COVERAGE; case Attribute::NullPointerIsValid: return bitc::ATTR_KIND_NULL_POINTER_IS_VALID; case Attribute::OptForFuzzing: Index: llvm/lib/Bitcode/Reader/BitcodeReader.cpp === --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1474,6 +1474,8 @@ return Attribute::NoCfCheck; case bitc::ATTR_KIND_NO_UNWIND: return Attribute::NoUnwind; + case bitc::ATTR_KIND_NO_SANITIZE_COVERAGE: +return Attribute::NoSanitizeCoverage; case bitc::