Skip to content

Commit d0690d6

Browse files
author
automatic-merge
committed
Merge remote branch 'origin/master' into edge
2 parents 95a585a + 3cf0804 commit d0690d6

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/pack-binaries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function make_change_log()
1919

2020
chmod -R -v +x als-*-$DEBUG
2121
for X in Linux macOS Windows ; do mv -v -f als-$X-$DEBUG/* integration/vscode/ada/; done
22-
rm -f -v integration/vscode/ada/{linux,darwin,win32}/*.{debug,dSYM}
22+
rm -rf -v integration/vscode/ada/{linux,darwin,win32}/*.{debug,dSYM}
2323
pushd integration/vscode/ada
2424
sed -i -e "/version/s/[0-9][0-9.]*/$TAG/" package.json
2525
[ -z "$DEBUG" ] || sed -i -e '/^ "name"/s/ada/ada-debug/' \

source/memory/lsp-memory_statistics.adb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,11 @@ package body LSP.Memory_Statistics is
6666
declare
6767
Traceback_Str : constant String :=
6868
S (Matched (1).First .. Matched (1).Last);
69-
Traceback_Long : constant Long_Integer :=
70-
Long_Integer'Value
69+
Traceback_Long : constant Integer_Address :=
70+
Integer_Address'Value
7171
("16#" & Traceback_Str & "#");
7272
Traceback_Addr : constant System.Address :=
73-
To_Address
74-
(Integer_Address (Traceback_Long));
73+
To_Address (Traceback_Long);
7574
New_S : constant String :=
7675
Symbolic_Traceback_No_Hex
7776
((1 => Traceback_Addr));

0 commit comments

Comments
 (0)