Remove illegal Ghost aspects

Ref. Componolit/Workarounds#48
AdaCore · May 9, 2022 · 6bc200c · 6bc200c
1 parent b7a812d
commit 6bc200c
Show file tree

Hide file tree

Showing 56 changed files with 116 additions and 332 deletions.
diff --git a/rflx/generator/message.py b/rflx/generator/message.py
@@ -1053,7 +1053,9 @@ def create_generic_read_procedure() -> UnitPart:
                     [Parameter(["Buffer"], const.TYPES_BYTES)],
                 ),
                 TRUE,
-                aspects=[Ghost()],
+                # ISSUE: Componolit/Workarounds#48
+                # Ghost entities are not allowed as formal generic parameters.
+                # aspects=[Ghost()],
             ),
             Pragma(
                 "Warnings",
@@ -1142,7 +1144,9 @@ def create_generic_write_procedure(message: Message) -> UnitPart:
                     ],
                 ),
                 TRUE,
-                aspects=[Ghost()],
+                # ISSUE: Componolit/Workarounds#48
+                # Ghost entities are not allowed as formal generic parameters.
+                # aspects=[Ghost()],
             ),
             Pragma(
                 "Warnings",

diff --git a/tests/integration/messages/generated/rflx-universal-message.ads b/tests/integration/messages/generated/rflx-universal-message.ads
@@ -179,9 +179,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -197,9 +195,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/messages/generated/rflx-universal-option.ads b/tests/integration/messages/generated/rflx-universal-option.ads
@@ -176,9 +176,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -194,9 +192,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/messages_with_implict_size/generated/rflx-universal-message.ads b/tests/integration/messages_with_implict_size/generated/rflx-universal-message.ads
@@ -179,9 +179,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -197,9 +195,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/messages_with_implict_size/generated/rflx-universal-option.ads b/tests/integration/messages_with_implict_size/generated/rflx-universal-option.ads
@@ -176,9 +176,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -194,9 +192,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/messages_with_single_opaque_field/generated/rflx-test-message.ads b/tests/integration/messages_with_single_opaque_field/generated/rflx-test-message.ads
@@ -176,9 +176,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -194,9 +192,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/parameterized_messages/generated/rflx-test-message.ads b/tests/integration/parameterized_messages/generated/rflx-test-message.ads
@@ -187,9 +187,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -205,9 +203,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/session_append_unconstrained/generated/rflx-universal-message.ads b/tests/integration/session_append_unconstrained/generated/rflx-universal-message.ads
@@ -179,9 +179,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -197,9 +195,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/session_append_unconstrained/generated/rflx-universal-option.ads b/tests/integration/session_append_unconstrained/generated/rflx-universal-option.ads
@@ -176,9 +176,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -194,9 +192,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/session_binding/generated/rflx-universal-message.ads b/tests/integration/session_binding/generated/rflx-universal-message.ads
@@ -179,9 +179,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -197,9 +195,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/session_binding/generated/rflx-universal-option.ads b/tests/integration/session_binding/generated/rflx-universal-option.ads
@@ -176,9 +176,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -194,9 +192,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/session_channel_multiplexing/generated/rflx-universal-message.ads b/tests/integration/session_channel_multiplexing/generated/rflx-universal-message.ads
@@ -179,9 +179,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -197,9 +195,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/session_channel_multiplexing/generated/rflx-universal-option.ads b/tests/integration/session_channel_multiplexing/generated/rflx-universal-option.ads
@@ -176,9 +176,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -194,9 +192,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/session_channels/generated/rflx-universal-message.ads b/tests/integration/session_channels/generated/rflx-universal-message.ads
@@ -179,9 +179,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -197,9 +195,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/session_channels/generated/rflx-universal-option.ads b/tests/integration/session_channels/generated/rflx-universal-option.ads
@@ -176,9 +176,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -194,9 +192,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/...s/integration/session_comprehension_on_message_field/generated/rflx-universal-message.ads b/...s/integration/session_comprehension_on_message_field/generated/rflx-universal-message.ads
@@ -179,9 +179,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -197,9 +195,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/session_comprehension_on_message_field/generated/rflx-universal-option.ads b/tests/integration/session_comprehension_on_message_field/generated/rflx-universal-option.ads
@@ -176,9 +176,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -194,9 +192,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 

diff --git a/tests/integration/session_comprehension_on_sequence/generated/rflx-universal-message.ads b/tests/integration/session_comprehension_on_sequence/generated/rflx-universal-message.ads
@@ -179,9 +179,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Buffer : RFLX_Types.Bytes) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");
 
@@ -197,9 +195,7 @@ is
    pragma Warnings (Off, "formal parameter ""*"" is not referenced");
 
    function Always_Valid (Context_Buffer_Length : RFLX_Types.Length; Offset : RFLX_Types.Length) return Boolean is
-     (True)
-    with
-     Ghost;
+     (True);
 
    pragma Warnings (On, "formal parameter ""*"" is not referenced");