summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-21 09:12:45 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-21 09:12:45 +0000
commit4f187ca271877fd2d0f6ad5d0ad2044c12a7676f (patch)
tree5740b1bdc11ed26549781264436b44125d326867
parentfbcea800f105bb3e57bcbab845d2c95032467590 (diff)
downloadgcc-4f187ca271877fd2d0f6ad5d0ad2044c12a7676f.tar.gz
2016-04-21 Philippe Gil <gil@adacore.com>
* krunch.adb (Krunch): Fix krunching of i-java. 2016-04-21 Arnaud Charlet <charlet@adacore.com> * exp_ch8.adb (Evaluation_Required): Always return True when Modify_Tree_For_C. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235320 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ada/ChangeLog9
-rw-r--r--gcc/ada/exp_ch8.adb9
-rw-r--r--gcc/ada/krunch.adb1
3 files changed, 17 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ced75bf61e0..c06c004f2c9 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2016-04-21 Philippe Gil <gil@adacore.com>
+
+ * krunch.adb (Krunch): Fix krunching of i-java.
+
+2016-04-21 Arnaud Charlet <charlet@adacore.com>
+
+ * exp_ch8.adb (Evaluation_Required): Always return
+ True when Modify_Tree_For_C.
+
2016-04-21 Eric Botcazou <ebotcazou@adacore.com>
* gnatlink.adb (Gnatlink): Robustify detection of Windows target.
diff --git a/gcc/ada/exp_ch8.adb b/gcc/ada/exp_ch8.adb
index dfd1796ac77..9e06db27417 100644
--- a/gcc/ada/exp_ch8.adb
+++ b/gcc/ada/exp_ch8.adb
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2015, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2016, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
@@ -116,6 +116,8 @@ package body Exp_Ch8 is
-- interested in these operations if they occur as part of the name
-- itself, subscripts are just values that are computed as part of the
-- evaluation, so their form is unimportant.
+ -- In addition, always return True for Modify_Tree_For_C since the
+ -- code generator doesn't know how to handle renamings.
-------------------------
-- Evaluation_Required --
@@ -123,7 +125,10 @@ package body Exp_Ch8 is
function Evaluation_Required (Nam : Node_Id) return Boolean is
begin
- if Nkind_In (Nam, N_Indexed_Component, N_Slice) then
+ if Modify_Tree_For_C then
+ return True;
+
+ elsif Nkind_In (Nam, N_Indexed_Component, N_Slice) then
if Is_Packed (Etype (Prefix (Nam))) then
return True;
else
diff --git a/gcc/ada/krunch.adb b/gcc/ada/krunch.adb
index 12b8f713711..a4e0caba3cb 100644
--- a/gcc/ada/krunch.adb
+++ b/gcc/ada/krunch.adb
@@ -107,6 +107,7 @@ begin
or else (Curlen = 9 and then Buffer (3 .. 9) = "fortran")
or else (Curlen = 16 and then Buffer (3 .. 16) = "packed_decimal")
or else (Curlen > 8 and then Buffer (3 .. 9) = "vxworks")
+ or else (Curlen > 5 and then Buffer (3 .. 6) = "java")
then
Krlen := 8;
else