Skip to content

[io] Add type mismatch check for TObject-derived cases#21864

Merged
vepadulano merged 1 commit intoroot-project:masterfrom
vepadulano:gh-21863
Apr 10, 2026
Merged

[io] Add type mismatch check for TObject-derived cases#21864
vepadulano merged 1 commit intoroot-project:masterfrom
vepadulano:gh-21863

Conversation

@vepadulano
Copy link
Copy Markdown
Member

Adds a check for type mismatch in TFileMerger for the particular case of having a TObject and trying to merge it against other objects of different types. Importantly, this includes also the check when the other object is of a non-TObject-derived type, which would previously lead to a segfault.

Fixes #21863

@vepadulano vepadulano self-assigned this Apr 9, 2026
@vepadulano vepadulano requested a review from pcanal as a code owner April 9, 2026 13:10
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 9, 2026

Test Results

    22 files      22 suites   3d 3h 21m 5s ⏱️
 3 830 tests  3 829 ✅  1 💤 0 ❌
75 611 runs  75 593 ✅ 18 💤 0 ❌

Results for commit 1f70bda.

♻️ This comment has been updated with latest results.

Copy link
Copy Markdown
Member

@pcanal pcanal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks.

Adds a check for type mismatch in TFileMerger for the particular case of having
a TObject and trying to merge it against other objects of different types.
Importantly, this includes also the check when the other object is of a
non-TObject-derived type, which would previously lead to a segfault.
@vepadulano vepadulano added the clean build Ask CI to do non-incremental build on PR label Apr 10, 2026
@vepadulano
Copy link
Copy Markdown
Member Author

Unrelated MacOS failure

2026-04-09T13:27:07.4979420Z 1555/3704 Test  #655: tutorial-analysis-dataframe-df027_SQliteDependencyOverVersion .....................................***Failed   10.02 sec
2026-04-09T13:27:07.4983300Z Processing /Users/sftnight/ROOT-CI/src/tutorials/analysis/dataframe/df027_SQliteDependencyOverVersion.C...
2026-04-09T13:27:07.5049100Z Minimum time is '2018-07-06 07:54:32'
2026-04-09T13:27:07.5075330Z libc++abi: terminating due to uncaught exception of type ROOT::RException: cannot read from http://root.cern/files/root_download_stats.sqlite: end of response with 85524 bytes missing [Transferred a partial file (18)] (OS errno: 0)
2026-04-09T13:27:07.5101820Z At:

Unrelated Windows failure

2026-04-09T13:17:05.4357117Z C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\Microsoft.CppCommon.targets(254,5): error MSB8066: Custom build for 'C:\ROOT-CI\build\CMakeFiles\11e3aa246d8d8a4f1578655b4fcb5e27\BUILTIN_LIBGIF-mkdir.rule;C:\ROOT-CI\build\CMakeFiles\11e3aa246d8d8a4f1578655b4fcb5e27\BUILTIN_LIBGIF-download.rule;C:\ROOT-CI\build\CMakeFiles\11e3aa246d8d8a4f1578655b4fcb5e27\BUILTIN_LIBGIF-update.rule;C:\ROOT-CI\build\CMakeFiles\11e3aa246d8d8a4f1578655b4fcb5e27\BUILTIN_LIBGIF-patch.rule;C:\ROOT-CI\build\CMakeFiles\11e3aa246d8d8a4f1578655b4fcb5e27\BUILTIN_LIBGIF-configure.rule;C:\ROOT-CI\build\CMakeFiles\11e3aa246d8d8a4f1578655b4fcb5e27\BUILTIN_LIBGIF-build.rule;C:\ROOT-CI\build\CMakeFiles\11e3aa246d8d8a4f1578655b4fcb5e27\BUILTIN_LIBGIF-install.rule;C:\ROOT-CI\build\CMakeFiles\f42ef161ab91f48d11962adbc1640078\BUILTIN_LIBGIF-complete.rule;C:\ROOT-CI\build\CMakeFiles\16a4160b083f08e7c502201d14c6a681\BUILTIN_LIBGIF.rule;C:\ROOT-CI\src\builtins\libgif\CMakeLists.txt' exited with code 1. [C:\ROOT-CI\build\builtins\libgif\BUILTIN_LIBGIF.vcxproj]

@vepadulano vepadulano merged commit e7d1511 into root-project:master Apr 10, 2026
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clean build Ask CI to do non-incremental build on PR in:I/O

Projects

None yet

Development

Successfully merging this pull request may close these issues.

hadd does not perform type checks of objects to be merged

2 participants