Commit 59ae6391 by Robert Dewar Committed by Arnaud Charlet

exp_ch4.adb (Expand_N_Op_Concat): Remove special tests for No_Run_Time_Mode

2008-03-26  Robert Dewar  <dewar@adacore.com>

	* exp_ch4.adb (Expand_N_Op_Concat): Remove special tests for
	No_Run_Time_Mode

From-SVN: r133562
parent df89ab66
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1992-2007, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2008, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -4451,18 +4451,10 @@ package body Exp_Ch4 is ...@@ -4451,18 +4451,10 @@ package body Exp_Ch4 is
if Max_Available_String_Operands < 1 then if Max_Available_String_Operands < 1 then
-- In No_Run_Time mode, consider that no entities are available -- See what routines are available and set max operand count
-- according to the highest count available in the run-time.
-- This seems wrong, RTE_Available should return False for any entity if not RTE_Available (RE_Str_Concat) then
-- that is not in the special No_Run_Time list of allowed entities???
if No_Run_Time_Mode then
Max_Available_String_Operands := 0;
-- Otherwise see what routines are available and set max operand
-- count according to the highest count available in the run-time.
elsif not RTE_Available (RE_Str_Concat) then
Max_Available_String_Operands := 0; Max_Available_String_Operands := 0;
elsif not RTE_Available (RE_Str_Concat_3) then elsif not RTE_Available (RE_Str_Concat_3) then
...@@ -4479,8 +4471,6 @@ package body Exp_Ch4 is ...@@ -4479,8 +4471,6 @@ package body Exp_Ch4 is
end if; end if;
Char_Concat_Available := Char_Concat_Available :=
not No_Run_Time_Mode
and then
RTE_Available (RE_Str_Concat_CC) RTE_Available (RE_Str_Concat_CC)
and then and then
RTE_Available (RE_Str_Concat_CS) RTE_Available (RE_Str_Concat_CS)
...@@ -8850,8 +8840,8 @@ package body Exp_Ch4 is ...@@ -8850,8 +8840,8 @@ package body Exp_Ch4 is
and then Comes_From_Source (Original_Node (N)) and then Comes_From_Source (Original_Node (N))
and then Nkind (Original_Node (N)) = N_Op_Ge and then Nkind (Original_Node (N)) = N_Op_Ge
and then not In_Instance and then not In_Instance
and then not Warnings_Off (Etype (Left_Opnd (N)))
and then Is_Integer_Type (Etype (Left_Opnd (N))) and then Is_Integer_Type (Etype (Left_Opnd (N)))
and then not Has_Warnings_Off (Etype (Left_Opnd (N)))
then then
Error_Msg_N Error_Msg_N
("can never be greater than, could replace by ""'=""?", N); ("can never be greater than, could replace by ""'=""?", N);
...@@ -8874,8 +8864,8 @@ package body Exp_Ch4 is ...@@ -8874,8 +8864,8 @@ package body Exp_Ch4 is
and then Comes_From_Source (Original_Node (N)) and then Comes_From_Source (Original_Node (N))
and then Nkind (Original_Node (N)) = N_Op_Le and then Nkind (Original_Node (N)) = N_Op_Le
and then not In_Instance and then not In_Instance
and then not Warnings_Off (Etype (Left_Opnd (N)))
and then Is_Integer_Type (Etype (Left_Opnd (N))) and then Is_Integer_Type (Etype (Left_Opnd (N)))
and then not Has_Warnings_Off (Etype (Left_Opnd (N)))
then then
Error_Msg_N Error_Msg_N
("can never be less than, could replace by ""'=""?", N); ("can never be less than, could replace by ""'=""?", N);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment