mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-16 23:09:16 +02:00
Designer/LCL: Correctly align TMethodNameTable/TMethodNameTableEntry on platforms that require it (e.g. AARCH64).
The change follows
170c05592b
Fixes crash on IDE start on AARCH64 platforms when FPC 3.3.1 is used.
Patch by Dean Mustakinov, issue #40737.
This commit is contained in:
parent
56887ae820
commit
8253bd9f8f
@ -267,12 +267,20 @@ begin
|
||||
end;
|
||||
|
||||
type
|
||||
tmethodnamerec = packed record
|
||||
tmethodnamerec =
|
||||
{$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
packed
|
||||
{$endif FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
record
|
||||
name : pshortstring;
|
||||
addr : codepointer;
|
||||
end;
|
||||
|
||||
tmethodnametable = packed record
|
||||
tmethodnametable =
|
||||
{$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
packed
|
||||
{$endif FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
record
|
||||
count : dword;
|
||||
entries : packed array[0..0] of tmethodnamerec;
|
||||
end;
|
||||
|
@ -382,12 +382,20 @@ const
|
||||
type
|
||||
// these definitions are copied from typinfo.pp
|
||||
|
||||
TMethodNameRec = packed record
|
||||
TMethodNameRec =
|
||||
{$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
packed
|
||||
{$endif FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
record
|
||||
Name : PShortString;
|
||||
Addr : Pointer;
|
||||
end;
|
||||
|
||||
TMethodNameTable = packed record
|
||||
TMethodNameTable =
|
||||
{$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
packed
|
||||
{$endif FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
record
|
||||
Count : DWord;
|
||||
// for runtime range checking it is important to give a range
|
||||
Entries : packed array[0..1000000] of TMethodNameRec;
|
||||
|
@ -204,12 +204,20 @@ begin
|
||||
end;
|
||||
|
||||
type
|
||||
TMethodNameTableEntry = packed record
|
||||
TMethodNameTableEntry =
|
||||
{$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
packed
|
||||
{$endif FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
record
|
||||
Name: PShortstring;
|
||||
Addr: Pointer;
|
||||
end;
|
||||
|
||||
TMethodNameTable = packed record
|
||||
TMethodNameTable =
|
||||
{$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
packed
|
||||
{$endif FPC_REQUIRES_PROPER_ALIGNMENT}
|
||||
record
|
||||
Count: DWord;
|
||||
Entries: packed array[0..9999999] of TMethodNameTableEntry;
|
||||
end;
|
||||
|
Loading…
Reference in New Issue
Block a user