diff options
| author | Olivier Hainque <hainque@adacore.com> | 2019-08-19 08:35:24 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2019-08-19 08:35:24 +0000 |
| commit | 04d933fd48d7e7cbedb761d660229cac9f36fab2 (patch) | |
| tree | 33121678fa1ee560c5164912b09ba5cef04b1dba /gcc | |
| parent | c9d57552ed85ddfa6b76c755855d112e4cfe277d (diff) | |
| download | gcc-04d933fd48d7e7cbedb761d660229cac9f36fab2.zip gcc-04d933fd48d7e7cbedb761d660229cac9f36fab2.tar.gz gcc-04d933fd48d7e7cbedb761d660229cac9f36fab2.tar.bz2 | |
[Ada] Fix thinko in Acc_Loop_to_gnu
This fixes a glitch introduced during the initial OpenACC work import
process, causing crashes on any Acc_Parallel + Acc_Loop combination.
2019-08-19 Olivier Hainque <hainque@adacore.com>
gcc/ada/
* gcc-interface/trans.c (Acc_Loop_to_gnu): Return the openacc
BIND_EXPR node we have constructed on purpose. Remove unused
variable.
gcc/testsuite/
* gnat.dg/openacc1.adb: New testcase.
From-SVN: r274638
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/trans.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gnat.dg/openacc1.adb | 12 |
4 files changed, 23 insertions, 4 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d6367e1..0ead307 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2019-08-19 Olivier Hainque <hainque@adacore.com> + + * gcc-interface/trans.c (Acc_Loop_to_gnu): Return the openacc + BIND_EXPR node we have constructed on purpose. Remove unused + variable. + 2019-08-19 Pierre-Marie de Rodat <derodat@adacore.com> * gcc-interface/lang.opt (fdump-scos): Define. diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index 95991bd..6c696b9 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -3398,9 +3398,6 @@ independent_iterations_p (tree stmt_list) static tree Acc_Loop_to_gnu (Node_Id gnat_loop) { - const struct loop_info_d * const gnu_loop_info = gnu_loop_stack->last (); - tree gnu_loop_stmt = gnu_loop_info->stmt; - tree acc_loop = make_node (OACC_LOOP); tree acc_bind_expr = NULL_TREE; Node_Id cur_loop = gnat_loop; @@ -3517,7 +3514,7 @@ Acc_Loop_to_gnu (Node_Id gnat_loop) BIND_EXPR_BODY (acc_bind_expr) = acc_loop; - return gnu_loop_stmt; + return acc_bind_expr; } /* Helper for Loop_Statement_to_gnu, to translate the body of a loop not diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 96f259e..b68ff86 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-08-19 Olivier Hainque <hainque@adacore.com> + + * gnat.dg/openacc1.adb: New testcase. + 2019-08-19 Kito Cheng <kito.cheng@sifive.com> PR target/91441 diff --git a/gcc/testsuite/gnat.dg/openacc1.adb b/gcc/testsuite/gnat.dg/openacc1.adb new file mode 100644 index 0000000..ce27a5f --- /dev/null +++ b/gcc/testsuite/gnat.dg/openacc1.adb @@ -0,0 +1,12 @@ +-- { dg-do compile } + +procedure OpenAcc1 is + type Integer_Array is array (1 .. 32) of Integer; + Data : Integer_Array; +begin + for i in Data'Range loop + pragma Acc_Parallel; + pragma Acc_Loop(Worker); + Data (i) := i; + end loop; +end; |