Skip to content

Conversation

@tautschnig
Copy link
Collaborator

For structs with struct-typed fields, merging now recursively descends to identify leaf-level modifications. Array handling uses a conservative approach (marking entire array as modified) since enumerating all indices is not practical.

Co-authored-by: Kiro autonomous agent

Fixes: #6272

  • Each commit message has a non-empty body, explaining why the change was made.
  • n/a Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • n/a The feature or user visible behaviour I have added or modified has been documented in the User Guide in doc/cprover-manual/
  • Regression or unit tests are included, or existing tests cover the modified code (in this case I have detailed which ones those are in the commit message).
  • n/a My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • n/a White-space or formatting changes outside the feature-related changed lines are in commits of their own.

@codecov
Copy link

codecov bot commented Dec 9, 2025

Codecov Report

❌ Patch coverage is 95.34884% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 80.01%. Comparing base (76dd20f) to head (a4f1655).

Files with missing lines Patch % Lines
...riable-sensitivity/variable_sensitivity_domain.cpp 95.34% 2 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #8805   +/-   ##
========================================
  Coverage    80.00%   80.01%           
========================================
  Files         1700     1700           
  Lines       188249   188285   +36     
  Branches        73       73           
========================================
+ Hits        150615   150649   +34     
- Misses       37634    37636    +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

For structs with struct-typed fields, merging now recursively descends
to identify leaf-level modifications.  Array handling uses a
conservative approach (marking entire array as modified) since
enumerating all indices is not practical.

Co-authored-by: Kiro autonomous agent

Fixes: diffblue#6272
@tautschnig tautschnig force-pushed the fix-6272-three-way-merge-field-sensitive branch from 459076c to a4f1655 Compare December 9, 2025 14:38
@tautschnig tautschnig marked this pull request as ready for review December 9, 2025 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

goto-analyzer --three-way-merge is not field sensitive

2 participants