From 531351e8f4b0290e252009d5667498db4570a3fb Mon Sep 17 00:00:00 2001 From: Ed Schonberg Date: Tue, 22 May 2018 13:22:06 +0000 Subject: [PATCH] [Ada] Crash on pragma Compile_Time_Warning with declared string constant This patch fixes a compiler abort on a pragma Compile_Time_Warning when its second argument is a reference to a constsant string (rather than a string literal or an expression that evaluates to a string literal). Compiling msain.adb must yield: main.adb:5:33: warning: Good main.adb:6:33: warning: VALLUE main.adb:7:33: warning: Test ---- procedure Main is Value : constant String := "Test"; Switch : constant Boolean := True; begin pragma Compile_Time_Warning (Switch, "Good"); pragma Compile_Time_Warning (Switch, "VAL" & "LUE"); pragma Compile_Time_Warning (Switch, value); null; end Main; 2018-05-22 Ed Schonberg gcc/ada/ * sem_prag.adb (Process_Compile_Time_Warning_Or_Error): Handle properly a second argument that is a constant of a given string value. From-SVN: r260514 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/sem_prag.adb | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 707ca720d6a..c67e473f1f9 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2018-05-22 Ed Schonberg + + * sem_prag.adb (Process_Compile_Time_Warning_Or_Error): Handle properly + a second argument that is a constant of a given string value. + 2018-05-22 Doug Rupp * sigtramp-vxworks-target.inc: Align stack to 128bits on AArch64. diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index ed7441ae7f4..8dae23dc5d6 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -30359,11 +30359,18 @@ package body Sem_Prag is if Compile_Time_Known_Value (Arg1x) then if Is_True (Expr_Value (Arg1x)) then + + -- We have already verified that the second argument is a static + -- string expression. Its string value must be retrieved + -- explicitly if it is a declared constant, otherwise it has + -- been constant-folded previously. + declare Cent : constant Entity_Id := Cunit_Entity (Current_Sem_Unit); Pname : constant Name_Id := Pragma_Name_Unmapped (N); Prag_Id : constant Pragma_Id := Get_Pragma_Id (Pname); - Str : constant String_Id := Strval (Get_Pragma_Arg (Arg2)); + Str : constant String_Id := + Strval (Expr_Value_S (Get_Pragma_Arg (Arg2))); Str_Len : constant Nat := String_Length (Str); Force : constant Boolean := -- 2.30.2