diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2012-12-11 10:28:35 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2012-12-11 10:28:35 +0000 |
| commit | a4ee212a463872eef93c99280caf41a32e0e1ad8 (patch) | |
| tree | 007614e41453c6215b782fce18607934e878b4f2 /gcc/cfgcleanup.c | |
| parent | 078be5a7e0bd191fd3ec97febf2afc1bc9f5efa9 (diff) | |
* sanitizer.def: Add comment about importance of ordering of
BUILT_IN_ASAN_REPORT* builtins.
* cfgcleanup.c (old_insns_match_p): Don't cross-jump __asan_report_*
builtins.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@194391 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cfgcleanup.c')
| -rw-r--r-- | gcc/cfgcleanup.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c index 94267b6e15d..5d142e9e465 100644 --- a/gcc/cfgcleanup.c +++ b/gcc/cfgcleanup.c @@ -1138,6 +1138,28 @@ old_insns_match_p (int mode ATTRIBUTE_UNUSED, rtx i1, rtx i2) CALL_INSN_FUNCTION_USAGE (i2)) || SIBLING_CALL_P (i1) != SIBLING_CALL_P (i2)) return dir_none; + + /* For address sanitizer, never crossjump __asan_report_* builtins, + otherwise errors might be reported on incorrect lines. */ + if (flag_asan) + { + rtx call = get_call_rtx_from (i1); + if (call && GET_CODE (XEXP (XEXP (call, 0), 0)) == SYMBOL_REF) + { + rtx symbol = XEXP (XEXP (call, 0), 0); + if (SYMBOL_REF_DECL (symbol) + && TREE_CODE (SYMBOL_REF_DECL (symbol)) == FUNCTION_DECL) + { + if ((DECL_BUILT_IN_CLASS (SYMBOL_REF_DECL (symbol)) + == BUILT_IN_NORMAL) + && DECL_FUNCTION_CODE (SYMBOL_REF_DECL (symbol)) + >= BUILT_IN_ASAN_REPORT_LOAD1 + && DECL_FUNCTION_CODE (SYMBOL_REF_DECL (symbol)) + <= BUILT_IN_ASAN_REPORT_STORE16) + return dir_none; + } + } + } } #ifdef STACK_REGS |