[Bug ada/115133] New: [15 regression] s-oslock__solaris.ads doesn't compile

[Bug ada/115133] New: [15 regression] s-oslock__solaris.ads doesn't compile

[ro at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115133

            Bug ID: 115133
           Summary: [15 regression] s-oslock__solaris.ads doesn't compile
           Product: gcc
           Version: 15.0
            Status: UNCONFIRMED
          Severity: normal
          Priority: P3
         Component: ada
          Assignee: unassigned at gcc dot gnu.org
          Reporter: ro at gcc dot gnu.org
                CC: dkm at gcc dot gnu.org, ebotcazou at gcc dot gnu.org
  Target Milestone: ---
            Target: *-*-solaris2.11

The new gcc/ada/libgnat/s-oslock__solaris.ads from

commit c8e5d90c4a0b736c2c4c5be3e8a3e9744e602d9d
Author: Eric Botcazou <ebotcazou@adacore.com>
Date:   Tue Mar 5 23:30:51 2024 +0100

    ada: Replace spinlocks with fully-fledged locks in finalization collections

breaks Solaris Ada bootstrap:

s-oslock.ads:50:10: error: "Ada" is not visible
s-oslock.ads:50:10: error: non-visible declaration at ada.ads:16

This snippet got me further along:

diff --git a/gcc/ada/libgnat/s-oslock__solaris.ads
b/gcc/ada/libgnat/s-oslock__solaris.ads
--- a/gcc/ada/libgnat/s-oslock__solaris.ads
+++ b/gcc/ada/libgnat/s-oslock__solaris.ads
@@ -32,6 +32,7 @@
 --  This is a Solaris (native) version of this package

 with Interfaces.C;
+with Ada.Unchecked_Conversion;

 package System.OS_Locks is
    pragma Preelaborate;
@@ -65,10 +66,10 @@ package System.OS_Locks is

 private

-   type array_type_9 is array (0 .. 3) of unsigned_char;
+   type array_type_9 is array (0 .. 3) of Interfaces.C.unsigned_char;
    type record_type_3 is record
       flag  : array_type_9;
-      Xtype : unsigned_long;
+      Xtype : Interfaces.C.unsigned_long;
    end record;
    pragma Convention (C, record_type_3);


but it may not be enough:

a-stbufi.ads:71:04: error: run-time library configuration error
a-stbufi.ads:71:04: error: file s-taskin.ads had semantic errors
a-stbufi.ads:71:04: error: entity "System.Tasking.Activation_Chain_Access" not
available
s-osinte.ads:301:29: error: "OS_Lock" not declared in "System"
s-osinte.ads:301:30: error: possible misspelling of "OS_Locks"
compilation abandoned
make[6]: *** [../gcc-interface/Makefile:306: a-stbufi.o] Error 1

This patch fixes the typo:

diff --git a/gcc/ada/libgnarl/s-osinte__solaris.ads
b/gcc/ada/libgnarl/s-osinte__solaris.ads
--- a/gcc/ada/libgnarl/s-osinte__solaris.ads
+++ b/gcc/ada/libgnarl/s-osinte__solaris.ads
@@ -298,7 +298,7 @@ package System.OS_Interface is

    function To_thread_t is new Ada.Unchecked_Conversion (Integer, thread_t);

-   subtype mutex_t is System.OS_Lock.mutex_t;
+   subtype mutex_t is System.OS_Locks.mutex_t;

    type cond_t is limited private;

until one runs into

s-oslock.ads:83:03: (style) bad indentation [-gnaty0]
make[6]: *** [../gcc-interface/Makefile:306: a-undesu.o] Error 1

No idea what's wrong here, though.

[Bug ada/115133] [15 regression] s-oslock__solaris.ads doesn't compile

[ro at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115133

Rainer Orth <ro at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|---                         |15.0

[Bug ada/115133] [15 regression] s-oslock__solaris.ads doesn't compile

[ro at CeBiTec dot Uni-Bielefeld.DE]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115133

--- Comment #1 from ro at CeBiTec dot Uni-Bielefeld.DE <ro at CeBiTec dot Uni-Bielefeld.DE> ---
> until one runs into
>
> s-oslock.ads:83:03: (style) bad indentation [-gnaty0]
> make[6]: *** [../gcc-interface/Makefile:306: a-undesu.o] Error 1
>
> No idea what's wrong here, though.

There's a 2-space indentation instead of the expected 3 spaces.  I had
to look several times to see it, though.  Maybe the error could be
clearer?

After that, I run into

s-taprop.adb:1402:20: error: expected type "System.Os_Locks.RTS_Lock_Ptr"
s-taprop.adb:1402:20: error: found type "System.Task_Primitives.Lock_Ptr"
s-taprop.adb:1443:57: error: expected type "System.Task_Primitives.Lock_Ptr"
s-taprop.adb:1443:57: error: found type "System.Os_Locks.RTS_Lock_Ptr"
s-taprop.adb:1471:20: error: expected type "System.Os_Locks.RTS_Lock_Ptr"
s-taprop.adb:1471:20: error: found type "System.Task_Primitives.Lock_Ptr"
s-taprop.adb:1552:57: error: expected type "System.Task_Primitives.Lock_Ptr"
s-taprop.adb:1552:57: error: found type "System.Os_Locks.RTS_Lock_Ptr"
make[6]: *** [../gcc-interface/Makefile:306: s-taprop.o] Error 1

but am stuck.

[Bug ada/115133] [15 regression] s-oslock__solaris.ads doesn't compile

[ebotcazou at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115133

Eric Botcazou <ebotcazou at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Last reconfirmed|                            |2024-05-17
     Ever confirmed|0                           |1
             Status|UNCONFIRMED                 |NEW

--- Comment #2 from Eric Botcazou <ebotcazou at gcc dot gnu.org> ---
> There's a 2-space indentation instead of the expected 3 spaces.  I had
> to look several times to see it, though.  Maybe the error could be
> clearer?

Style error messages are the hardest to get right, so I won't even try. ;-)

> After that, I run into
> 
> s-taprop.adb:1402:20: error: expected type "System.Os_Locks.RTS_Lock_Ptr"
> s-taprop.adb:1402:20: error: found type "System.Task_Primitives.Lock_Ptr"
> s-taprop.adb:1443:57: error: expected type "System.Task_Primitives.Lock_Ptr"
> s-taprop.adb:1443:57: error: found type "System.Os_Locks.RTS_Lock_Ptr"
> s-taprop.adb:1471:20: error: expected type "System.Os_Locks.RTS_Lock_Ptr"
> s-taprop.adb:1471:20: error: found type "System.Task_Primitives.Lock_Ptr"
> s-taprop.adb:1552:57: error: expected type "System.Task_Primitives.Lock_Ptr"
> s-taprop.adb:1552:57: error: found type "System.Os_Locks.RTS_Lock_Ptr"
> make[6]: *** [../gcc-interface/Makefile:306: s-taprop.o] Error 1

Sorry about the mess, tentative fix to be attached.

[Bug ada/115133] [15 regression] s-oslock__solaris.ads doesn't compile

[ebotcazou at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115133

--- Comment #3 from Eric Botcazou <ebotcazou at gcc dot gnu.org> ---
Created attachment 58228
  --> https://gcc.gnu.org/bugzilla/attachment.cgi?id=58228&action=edit
Tentative fix

[Bug ada/115133] [15 regression] s-oslock__solaris.ads doesn't compile

[ebotcazou at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115133

Eric Botcazou <ebotcazou at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #58228|0                           |1
        is obsolete|                            |

--- Comment #4 from Eric Botcazou <ebotcazou at gcc dot gnu.org> ---
Created attachment 58229
  --> https://gcc.gnu.org/bugzilla/attachment.cgi?id=58229&action=edit
Tentative fix

The complete version of it.

[Bug ada/115133] [15 regression] s-oslock__solaris.ads doesn't compile

[ro at CeBiTec dot Uni-Bielefeld.DE]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115133

--- Comment #5 from ro at CeBiTec dot Uni-Bielefeld.DE <ro at CeBiTec dot Uni-Bielefeld.DE> ---
> --- Comment #4 from Eric Botcazou <ebotcazou at gcc dot gnu.org> ---
> Created attachment 58229
>   --> https://gcc.gnu.org/bugzilla/attachment.cgi?id=58229&action=edit
> Tentative fix
>
> The complete version of it.

Thanks.  There's one issue left:

s-tasini.adb:248:11: warning: default initialization of "Lock" may modify
overlaid storage [-gnatwo]
s-tasini.adb:248:11: warning: use pragma Import for "Lock" to suppress
initialization (RM B.1(24)) [-gnatwo]
s-tasini.adb:260:11: warning: default initialization of "Lock" may modify
overlaid storage [-gnatwo]
s-tasini.adb:260:11: warning: use pragma Import for "Lock" to suppress
initialization (RM B.1(24)) [-gnatwo]
s-tasini.adb:272:11: warning: default initialization of "Lock" may modify
overlaid storage [-gnatwo]
s-tasini.adb:272:11: warning: use pragma Import for "Lock" to suppress
initialization (RM B.1(24)) [-gnatwo]
s-tasini.adb:284:11: warning: default initialization of "Lock" may modify
overlaid storage [-gnatwo]
s-tasini.adb:284:11: warning: use pragma Import for "Lock" to suppress
initialization (RM B.1(24)) [-gnatwo]

[Bug ada/115133] [15 regression] s-oslock__solaris.ads doesn't compile

[ebotcazou at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115133

Eric Botcazou <ebotcazou at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #58229|0                           |1
        is obsolete|                            |

--- Comment #6 from Eric Botcazou <ebotcazou at gcc dot gnu.org> ---
Created attachment 58230
  --> https://gcc.gnu.org/bugzilla/attachment.cgi?id=58230&action=edit
Tentative fix

Hopefully the final version of it.

[Bug ada/115133] [15 regression] s-oslock__solaris.ads doesn't compile

[ro at CeBiTec dot Uni-Bielefeld.DE]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115133

--- Comment #7 from ro at CeBiTec dot Uni-Bielefeld.DE <ro at CeBiTec dot Uni-Bielefeld.DE> ---
> --- Comment #6 from Eric Botcazou <ebotcazou at gcc dot gnu.org> ---
> Created attachment 58230
>   --> https://gcc.gnu.org/bugzilla/attachment.cgi?id=58230&action=edit
> Tentative fix
>
> Hopefully the final version of it.

Yes, make all-target-libada completed just fine with this.  Thanks!

[Bug ada/115133] [15 regression] s-oslock__solaris.ads doesn't compile

[cvs-commit at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115133

--- Comment #8 from GCC Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Eric Botcazou <ebotcazou@gcc.gnu.org>:

https://gcc.gnu.org/g:5812e1bbb1c8a7a90d995a0165cddae4d450d6cf

commit r15-641-g5812e1bbb1c8a7a90d995a0165cddae4d450d6cf
Author: Eric Botcazou <ebotcazou@adacore.com>
Date:   Sat May 18 00:21:56 2024 +0200

    Fix Ada runtime library breakage on Solaris

    The recent changes made to the runtime library broke its build on Solaris
    because it uses Solaris threads instead of POSIX threads on this platform.

    gcc/ada/
            PR ada/115133
            * libgnarl/s-osinte__solaris.ads (mutex_t): Fix typo.
            * libgnarl/s-taprop__solaris.adb (Record_Lock): Add conversion.
            (Check_Sleep): Likewise.
            (Record_Wakeup): Likewise.
            (Check_Unlock): Likewise.
            * libgnarl/s-tasini.adb (Initialize_RTS_Lock): Add pragma Import
            on the overlaid variable.
            (Finalize_RTS_Lock): Likewise.
            (Acquire_RTS_Lock): Likewise.
            (Release_RTS_Lock): Likewise.
            * libgnarl/s-taspri__solaris.ads (To_RTS_Lock_Ptr): New instance
            of Ada.Unchecked_Conversion.
            * libgnat/s-oslock__solaris.ads: Add with clause for
            Ada.Unchecked_Conversion.
            (array_type_9): Add missing name qualification.
            (record_type_3): Likewise.
            (mutex_t): Fix formatting.

[Bug ada/115133] [15 regression] s-oslock__solaris.ads doesn't compile

[ebotcazou at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115133

Eric Botcazou <ebotcazou at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED

--- Comment #9 from Eric Botcazou <ebotcazou at gcc dot gnu.org> ---
Thanks for reporting the problem.