Skip to content

i#2560,#2548: Update to ubuntu22 and vs2022 GA platforms #2561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
derekbruening merged 4 commits into from
Jul 13, 2025
Merged

i#2560,#2548: Update to ubuntu22 and vs2022 GA platforms #2561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6080622
i#2560,#2548: Update to ubuntu22 and vs2022 GA platforms
derekbruening Jul 12, 2025
e0fd344
Fix Windows build warning and try to fix AMD gateway assert
derekbruening Jul 12, 2025
17a283f
Give up on satisfying compiler: just disable anon enum type warning; …
derekbruening Jul 12, 2025
0a3f5ad
Silence another enum type warning difficult to avoid
derekbruening Jul 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-aarchxx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ defaults:
jobs:
# AArchXX cross-compile with gcc, no tests:
aarchxx-cross-compile:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:

# Android ARM cross-compile with gcc, no tests:
android-arm-cross-compile:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-clang.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ defaults:
jobs:
# 32-bit and 64-bit Linux build with clang, no tests.
clang:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# Docs deployment, building on Linux.
docs:
# We use a more recent Ubuntu for better markdown support.
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2020-2024 Google, Inc. All rights reserved.
# Copyright (c) 2020-2025 Google, Inc. All rights reserved.
# **********************************************************

# Dr. Memory: the memory debugger
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
###########################################################################
# Linux tarball with 64-bit and 32-bit builds:
x86:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
###########################################################################
# Windows .zip and .msi with 32-bit and 64-bit x86 builds:
windows:
runs-on: windows-2019
runs-on: windows-2022

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
set PATH=c:\projects\install\ninja;%PATH%
dir "c:\Program Files (x86)\WiX Toolset"*
set PATH=C:\Program Files (x86)\WiX Toolset v3.14\bin;%PATH%
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
call "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
echo ------ Running suite ------
echo PATH is "%PATH%"
echo Running in directory "%CD%"
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:

create_release:
needs: [x86, windows]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
# We need a checkout to run git log for the version.
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ci-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2020-2024 Google, Inc. All rights reserved.
# Copyright (c) 2020-2025 Google, Inc. All rights reserved.
# **********************************************************

# Dr. Memory: the memory debugger
Expand Down Expand Up @@ -38,9 +38,9 @@ defaults:
shell: cmd

jobs:
# 32-bit VS2019 and tests:
# 32-bit VS2022 and tests:
vs2019-32:
runs-on: windows-2019
runs-on: windows-2022

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -73,15 +73,15 @@ jobs:
set PATH=c:\projects\install\ninja;%PATH%
dir "c:\Program Files (x86)\WiX Toolset"*
set PATH=C:\Program Files (x86)\WiX Toolset v3.14\bin;%PATH%
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
call "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
echo ------ Running suite ------
echo PATH is "%PATH%"
echo Running in directory "%CD%"
perl tests/runsuite_wrapper.pl travis use_ninja 32_only drmemory_only debug_only

# 64-bit VS2019 and tests:
# 64-bit VS2022 and tests:
vs2019-64:
runs-on: windows-2019
runs-on: windows-2022

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -114,15 +114,15 @@ jobs:
set PATH=c:\projects\install\ninja;%PATH%
dir "c:\Program Files (x86)\WiX Toolset"*
set PATH=C:\Program Files (x86)\WiX Toolset v3.14\bin;%PATH%
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
call "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
echo ------ Running suite ------
echo PATH is "%PATH%"
echo Running in directory "%CD%"
perl tests/runsuite_wrapper.pl travis use_ninja 64_only debug_only

# drheapstat and release builds:
vs2019-builds:
runs-on: windows-2019
runs-on: windows-2022

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
set PATH=c:\projects\install\ninja;%PATH%
dir "c:\Program Files (x86)\WiX Toolset"*
set PATH=C:\Program Files (x86)\WiX Toolset v3.14\bin;%PATH%
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
call "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
echo ------ Running suite ------
echo PATH is "%PATH%"
echo Running in directory "%CD%"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-x86.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ defaults:
jobs:
# 64-bit and 32-bit Linux build with gcc and tests:
x86:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 3 additions & 1 deletion common/alloc_replace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2012-2024 Google, Inc. All rights reserved.
* Copyright (c) 2012-2025 Google, Inc. All rights reserved.
* **********************************************************/

/* Dr. Memory: the memory debugger
Expand Down Expand Up @@ -98,6 +98,8 @@
# include <sys/mman.h>
#else
# include "../wininc/crtdbg.h"
# pragma warning(disable : 5286) /* "implicit conversion from enum type" */
# pragma warning(disable : 5287) /* "operands are different enum types" */
#endif

#ifdef UNIX
Expand Down
5 changes: 3 additions & 2 deletions drsyscall/drsyscall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2010-2024 Google, Inc. All rights reserved.
* Copyright (c) 2010-2025 Google, Inc. All rights reserved.
* Copyright (c) 2007-2010 VMware, Inc. All rights reserved.
* **********************************************************/

Expand Down Expand Up @@ -175,7 +175,8 @@ check_syscall_gateway(instr_t *inst)
"multiple system call gateways not supported");
}
} else if (instr_get_opcode(inst) == OP_syscall) {
if (syscall_gateway == DRSYS_GATEWAY_UNKNOWN)
if (syscall_gateway == DRSYS_GATEWAY_UNKNOWN ||
syscall_gateway == DRSYS_GATEWAY_INT)
syscall_gateway = DRSYS_GATEWAY_SYSCALL;
else {
ASSERT(syscall_gateway == DRSYS_GATEWAY_SYSCALL
Expand Down
2 changes: 1 addition & 1 deletion dynamorio
Open in desktop
Submodule dynamorio updated 174 files
2 changes: 2 additions & 0 deletions tests/runsuite_wrapper.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,8 @@
'syscalls_unix' => 1,
'pthread_test' => 1,
'realloc' => 1,
'drmf_drsyscall_test' => 1,
'drmf_strace_test' => 1,
# XXX: We should probably drop wrap_ support as we
# do not have the resources to maintain it.
'wrap_cs2bug' => 1,
Expand Down