Preserve frozen ports on Behavior Annex subprogram dispatch triggers 馃 - #3275
Merged
Merged
Conversation
Model subprogram-access and event-data dispatch triggers with the same frozen input port. Assert that both strict conditions preserve the ordered frozen list and its declarative source trace while validation remains clean.
Keep the direct subprogram-access trigger representation without returning before common dispatch-condition translation completes. This preserves the following frozen-port list and its trace while leaving event triggers in their logical wrapper.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #3264.
Behavior Annex strict-model translation now preserves the optional frozen-port list after a provided-subprogram-access dispatch trigger.
Cause and correction
DeclarativeToStrictTranslator.toDispatchConditionrepresents a single subprogram-access trigger directly asSubprogramAccessHolder, then returned before the shared frozen-port translation ran.The translator now keeps that direct trigger representation but continues through the common dispatch-condition path. Event and event-data triggers still receive their
DispatchTriggerLogicalExpressionwrapper, while both forms retain frozen-port ordering and source traces.Regression
Issue3264Testloads an external AADL model containingon dispatch rpc frozen (incoming)and an event-data-port control using the same frozen port. It asserts zero diagnostics, the expected direct and logical trigger representations, both frozen-port lists, their order, and their declarative trace mappings. Diagnostics, positions, resolved-model, and unparse corpus goldens cover the fixture.Validation
Issue3264Test: 1 test, 0 failures/errorsIssue3167Test: 5 tests, 0 failures/errorsorg.osate.ba.testssuite: 222 tests, 0 failures/errors-o -T5,-Dtycho.localArtifacts=ignore, andclean install: 143 projects succeeded; 1,758 tests, 0 failures/errors/skipsgit diff --check: passedDependencies and residual risk
There is no semantic dependency on PR #3274, but both PRs touch
toDispatchCondition; whichever merges second may need a small rebase.This change addresses strict-model preservation only. The broader D.4 direction, protocol, and effective-property compatibility matrix remains tracked by #3187.