diff mbox series

[Ada] Make pragma Inspection_Point work for constants

Message ID 20220110094139.GA586162@adacore.com
State Committed
Commit 0c6fbbfc83a8faefb74232cbb29fa1f79348b3e5
Headers
Series [Ada] Make pragma Inspection_Point work for constants |

Commit Message

Pierre-Marie de Rodat Jan. 10, 2022, 9:41 a.m. UTC 
  This entails marking the pragma as requiring an lvalue and explicitly going
to the corresponding variable of the constants, which is always built since
the front-end marks the constants as having their address taken.

Tested on x86_64-pc-linux-gnu, committed on trunk

gcc/ada/

	* gcc-interface/trans.c (lvalue_required_p) <N_Pragma>: New case.
	<N_Pragma_Argument_Association>: Likewise.
	(Pragma_to_gnu) <Pragma_Inspection_Point>: Fetch the corresponding
	variable of a constant before marking it as addressable.
diff mbox series

Patch

diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -865,6 +865,20 @@  lvalue_required_p (Node_Id gnat_node, tree gnu_type, bool constant,
 	      || must_pass_by_ref (gnu_type)
 	      || default_pass_by_ref (gnu_type));
 
+    case N_Pragma_Argument_Association:
+      return lvalue_required_p (gnat_parent, gnu_type, constant,
+				address_of_constant);
+
+    case N_Pragma:
+      if (Is_Pragma_Name (Chars (Pragma_Identifier (gnat_parent))))
+	{
+	  const unsigned char id
+	    = Get_Pragma_Id (Chars (Pragma_Identifier (gnat_parent)));
+	  return id == Pragma_Inspection_Point;
+	}
+      else
+	return 0;
+
     case N_Indexed_Component:
       /* Only the array expression can require an lvalue.  */
       if (Prefix (gnat_parent) != gnat_node)
@@ -1387,6 +1401,9 @@  Pragma_to_gnu (Node_Id gnat_node)
 	  char *comment;
 #endif
 	  gnu_expr = maybe_unconstrained_array (gnu_expr);
+	  if (TREE_CODE (gnu_expr) == CONST_DECL
+	      && DECL_CONST_CORRESPONDING_VAR (gnu_expr))
+	    gnu_expr = DECL_CONST_CORRESPONDING_VAR (gnu_expr);
 	  gnat_mark_addressable (gnu_expr);
 
 #ifdef ASM_COMMENT_START