diff mbox series

[committed] modula2: Fix lto profiledbootstrap on powerpc64le-linux and s390x-linux [PR108153]

Message ID Y6LB8TGAbA1fAFe4@tucnak
State Committed
Headers
Series [committed] modula2: Fix lto profiledbootstrap on powerpc64le-linux and s390x-linux [PR108153] |

Commit Message

Jakub Jelinek Dec. 21, 2022, 8:21 a.m. UTC 
  Hi!

Lto profiledbootstrap was failing for me on {powerpc64le,s390x}-linux with
modula 2 enabled, with:
cc1gm2: internal compiler error: the location value is corrupt
0x11a3d2d m2assert_AssertLocation(unsigned int)
        ../../gcc/m2/gm2-gcc/m2assert.cc:40
0x11a3d2d m2statement_BuildAssignmentTree
        ../../gcc/m2/gm2-gcc/m2statement.cc:177
ICE.  The problem was that caller (m2assert_AssertLocation used
location_t M2Options_OverrideLocation (location_t);
prototype with the libcpp/line-map.h
typedef unsigned int location_t;
typedef, but the callee defined in Modula 2 was using:
TYPE
   location_t = INTEGER ;
and
PROCEDURE OverrideLocation (location: location_t) : location_t ;
Now, on powerpc64le-linux unsigned int is returned and passed zero extended
into 64-bits, while signed int is returned and passed sign-extended into 64-bits
and Modula 2 INTEGER is signed 32-bit type, so when the caller then compared
M2Options_OverrideLocation (location) != location
and powerpc64le-linux performed the comparison as 64-bit compare, there
was a mismatch for location_t of 0x8000007 or others with the MSB set.

Fixed by making Modula 2 location_t a CARDINAL, which is 32-bit unsigned type.

Bootstrapped/regtested normally on x86_64-linux and i686-linux, with
bootstrap-lto profiledbootstrap on powerpc64le-linux and aarch64-linux so
far (and in regtesting on x86_64-linux, i686-linux and s390x-linux),
approved in the PR by Gaius, committed to trunk.

2022-12-21  Jakub Jelinek  <jakub@redhat.com>

	PR modula2/108153
	* gm2-gcc/m2linemap.def (location_t): Use CARDINAL instead of INTEGER.


	Jakub

Comments

Gaius Mulley Dec. 21, 2022, 12:41 p.m. UTC | #1 
Jakub Jelinek <jakub@redhat.com> writes:

> Hi!
>
> Lto profiledbootstrap was failing for me on {powerpc64le,s390x}-linux with
> modula 2 enabled, with:
> cc1gm2: internal compiler error: the location value is corrupt
> 0x11a3d2d m2assert_AssertLocation(unsigned int)
>         ../../gcc/m2/gm2-gcc/m2assert.cc:40
> 0x11a3d2d m2statement_BuildAssignmentTree
>         ../../gcc/m2/gm2-gcc/m2statement.cc:177
> ICE.  The problem was that caller (m2assert_AssertLocation used
> location_t M2Options_OverrideLocation (location_t);
> prototype with the libcpp/line-map.h
> typedef unsigned int location_t;
> typedef, but the callee defined in Modula 2 was using:
> TYPE
>    location_t = INTEGER ;
> and
> PROCEDURE OverrideLocation (location: location_t) : location_t ;
> Now, on powerpc64le-linux unsigned int is returned and passed zero extended
> into 64-bits, while signed int is returned and passed sign-extended into 64-bits
> and Modula 2 INTEGER is signed 32-bit type, so when the caller then compared
> M2Options_OverrideLocation (location) != location
> and powerpc64le-linux performed the comparison as 64-bit compare, there
> was a mismatch for location_t of 0x8000007 or others with the MSB set.
>
> Fixed by making Modula 2 location_t a CARDINAL, which is 32-bit unsigned type.
>
> Bootstrapped/regtested normally on x86_64-linux and i686-linux, with
> bootstrap-lto profiledbootstrap on powerpc64le-linux and aarch64-linux so
> far (and in regtesting on x86_64-linux, i686-linux and s390x-linux),
> approved in the PR by Gaius, committed to trunk.
>
> 2022-12-21  Jakub Jelinek  <jakub@redhat.com>
>
> 	PR modula2/108153
> 	* gm2-gcc/m2linemap.def (location_t): Use CARDINAL instead of INTEGER.
>
> --- gcc/m2/gm2-gcc/m2linemap.def.jj	2022-12-19 14:59:50.169762747 +0100
> +++ gcc/m2/gm2-gcc/m2linemap.def	2022-12-20 16:36:18.321555969 +0100
> @@ -30,7 +30,7 @@ EXPORT QUALIFIED StartFile, EndFile, Sta
>                   WarningAtf, NoteAtf, internal_error, location_t ;
>  
>  TYPE
> -   location_t = INTEGER ;
> +   location_t = CARDINAL ;
>  
>  
>  PROCEDURE StartFile (filename: ADDRESS; linebegin: CARDINAL) ;
>
> 	Jakub

Hi Jakub,

thanks for finding the bug and the fix!

regards,
Gaius
diff mbox series

Patch

--- gcc/m2/gm2-gcc/m2linemap.def.jj	2022-12-19 14:59:50.169762747 +0100
+++ gcc/m2/gm2-gcc/m2linemap.def	2022-12-20 16:36:18.321555969 +0100
@@ -30,7 +30,7 @@  EXPORT QUALIFIED StartFile, EndFile, Sta
                  WarningAtf, NoteAtf, internal_error, location_t ;
 
 TYPE
-   location_t = INTEGER ;
+   location_t = CARDINAL ;
 
 
 PROCEDURE StartFile (filename: ADDRESS; linebegin: CARDINAL) ;