From b7babd5d428f7439b7cd83077b7c3d902570e0ea Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Wed, 22 Apr 2009 22:32:54 +0000 Subject: [PATCH] utils2.c (build_binary_op): If operation's type is an enumeral or a boolean type... * gcc-interface/utils2.c (build_binary_op) : If operation's type is an enumeral or a boolean type, change it to an integer type with the same mode and signedness. From-SVN: r146625 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/gcc-interface/utils2.c | 18 +++++++++++------- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gnat.dg/enum2.adb | 11 +++++++++++ gcc/testsuite/gnat.dg/enum2_pkg.ads | 8 ++++++++ 5 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/enum2.adb create mode 100644 gcc/testsuite/gnat.dg/enum2_pkg.ads diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index acdc11cfc85..6f31942e869 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2009-04-22 Eric Botcazou + + * gcc-interface/utils2.c (build_binary_op) : If operation's + type is an enumeral or a boolean type, change it to an integer type + with the same mode and signedness. + 2009-04-22 Eric Botcazou * gcc-interface/utils.c (create_var_decl_1): Do not emit debug info diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c index 77a0389674d..d6b7d684de7 100644 --- a/gcc/ada/gcc-interface/utils2.c +++ b/gcc/ada/gcc-interface/utils2.c @@ -6,7 +6,7 @@ * * * C Implementation File * * * - * Copyright (C) 1992-2008, Free Software Foundation, Inc. * + * Copyright (C) 1992-2009, 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- * @@ -1010,11 +1010,15 @@ build_binary_op (enum tree_code op_code, tree result_type, case PLUS_EXPR: case MINUS_EXPR: - /* Avoid doing arithmetics in BOOLEAN_TYPE like the other compilers. - Contrary to C, Ada doesn't allow arithmetics in Standard.Boolean - but we can generate addition or subtraction for 'Succ and 'Pred. */ - if (operation_type && TREE_CODE (operation_type) == BOOLEAN_TYPE) - operation_type = left_base_type = right_base_type = integer_type_node; + /* Avoid doing arithmetics in ENUMERAL_TYPE or BOOLEAN_TYPE like the + other compilers. Contrary to C, Ada doesn't allow arithmetics in + these types but can generate addition/subtraction for Succ/Pred. */ + if (operation_type + && (TREE_CODE (operation_type) == ENUMERAL_TYPE + || TREE_CODE (operation_type) == BOOLEAN_TYPE)) + operation_type = left_base_type = right_base_type + = gnat_type_for_mode (TYPE_MODE (operation_type), + TYPE_UNSIGNED (operation_type)); /* ... fall through ... */ @@ -2199,7 +2203,7 @@ fill_vms_descriptor (tree expr, Entity_Id gnat_formal, Node_Id gnat_actual) add_stmt (build3 (COND_EXPR, void_type_node, build_binary_op (GE_EXPR, long_integer_type_node, convert (long_integer_type_node, - addr64expr), + addr64expr), malloc64low), build_call_raise (CE_Range_Check_Failed, gnat_actual, N_Raise_Constraint_Error), diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7af7fccfe02..8002f79601a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-04-22 Eric Botcazou + + * gnat.dg/enum2.adb: New test. + * gnat.dg/enum2_pkg.ads: New helper. + 2009-04-22 Jakub Jelinek PR c/39855 diff --git a/gcc/testsuite/gnat.dg/enum2.adb b/gcc/testsuite/gnat.dg/enum2.adb new file mode 100644 index 00000000000..e98252a1926 --- /dev/null +++ b/gcc/testsuite/gnat.dg/enum2.adb @@ -0,0 +1,11 @@ +-- { dg-do run } +-- { dg-options "-gnat05 -O2" } + +with Enum2_Pkg; use Enum2_Pkg; + +procedure Enum2 is + type Enum is (A, B, C, D); + Table : array (B .. C, 1 .. 1) of F_String := (others => (others => Null_String)); +begin + Table := (others => (others => Null_String)); +end; diff --git a/gcc/testsuite/gnat.dg/enum2_pkg.ads b/gcc/testsuite/gnat.dg/enum2_pkg.ads new file mode 100644 index 00000000000..20112d23c5c --- /dev/null +++ b/gcc/testsuite/gnat.dg/enum2_pkg.ads @@ -0,0 +1,8 @@ +with Ada.Finalization; use Ada.Finalization; + +package Enum2_Pkg is + type F_String is new Controlled with record + Data : access String; + end record; + Null_String : constant F_String := (Controlled with Data => null); +end Enum2_Pkg;