diff options
| author | aldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-04 14:32:54 +0000 |
|---|---|---|
| committer | aldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-04 14:32:54 +0000 |
| commit | 300eddbaf63d9c1e15e4d65948363826b8bf04a0 (patch) | |
| tree | d76d4e9878a22fccb8ef2ffc332071f5ac6e5712 /gcc | |
| parent | 4fd5163b8c4c4f51555f8e37e8db015a7b1005d0 (diff) | |
| download | gcc-300eddbaf63d9c1e15e4d65948363826b8bf04a0.tar.gz | |
PR middle-end/51696
* trans-mem.c (diagnose_tm_1): Display indirect calls with no name
correctly.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182876 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tm/pr51696.c | 14 | ||||
| -rw-r--r-- | gcc/trans-mem.c | 26 |
3 files changed, 40 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 33caab17d6a..fc644564971 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-01-04 Aldy Hernandez <aldyh@redhat.com> + + PR middle-end/51696 + * trans-mem.c (diagnose_tm_1): Display indirect calls with no name + correctly. + 2012-01-04 Richard Guenther <rguenther@suse.de> PR middle-end/51750 diff --git a/gcc/testsuite/gcc.dg/tm/pr51696.c b/gcc/testsuite/gcc.dg/tm/pr51696.c new file mode 100644 index 00000000000..02ee3f517c0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tm/pr51696.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-fgnu-tm" } */ + +struct list { + void (*compare)(); +} *listPtr; + +static void (*compare)(); + +__attribute__((transaction_safe)) +static void func () { + listPtr->compare(); /* { dg-error "unsafe indirect function call" } */ + compare(); /* { dg-error "unsafe function call" } */ +} diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c index c0a8b8c8ac4..750f3a18624 100644 --- a/gcc/trans-mem.c +++ b/gcc/trans-mem.c @@ -664,9 +664,16 @@ diagnose_tm_1 (gimple_stmt_iterator *gsi, bool *handled_ops_p, "unsafe function call %qD within " "atomic transaction", fn); else - error_at (gimple_location (stmt), - "unsafe function call %qE within " - "atomic transaction", fn); + { + if (!DECL_P (fn) || DECL_NAME (fn)) + error_at (gimple_location (stmt), + "unsafe function call %qE within " + "atomic transaction", fn); + else + error_at (gimple_location (stmt), + "unsafe indirect function call within " + "atomic transaction"); + } } else { @@ -675,9 +682,16 @@ diagnose_tm_1 (gimple_stmt_iterator *gsi, bool *handled_ops_p, "unsafe function call %qD within " "%<transaction_safe%> function", fn); else - error_at (gimple_location (stmt), - "unsafe function call %qE within " - "%<transaction_safe%> function", fn); + { + if (!DECL_P (fn) || DECL_NAME (fn)) + error_at (gimple_location (stmt), + "unsafe function call %qE within " + "%<transaction_safe%> function", fn); + else + error_at (gimple_location (stmt), + "unsafe indirect function call within " + "%<transaction_safe%> function"); + } } } } |