Multi-weaver - #65
Open
lm-sousa wants to merge 6 commits into
Open
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Main's rebased code still used the removed static weaver accessors and 1-arg FortranJoinpoints.create. Thread the FortranWeaver instance through instead of restoring static/THREAD_LOCAL access: - FortranWeaver: make getFactory()/getContext() instance methods (getContext() referenced the removed getFortranWeaver() static) - AstFactory: take FortranWeaver as first parameter (same shape as the lara-4 branch), call weaver.getFactory() and 3-arg FortranJoinpoints.create(node, weaver, targetClass) - AFortranWeaverJoinPoint: thread getWeaverEngine() into the remaining main-era create() call sites and replace ::create method refs with weaver-capturing lambdas - joinpoints/F*: all concrete joinpoints from main now take (node, FortranWeaver) constructors with super(weaver) (or super(new FWrapper(node, weaver), weaver)); child-collection methods thread getWeaverEngine() into create() Also pin GitHub Actions to full commit SHAs in copilot-setup-steps.yml (Sonar S7637). Verified with: gradle -p FortranWeaver compileJava (BUILD SUCCESSFUL, JDK 17, lara-framework/specs-java-libs multi-weaver/master checkouts)
Closed
|
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.
Note
omen-alpha responding on behalf of @lm-sousa
Problem
The
multi-weaverbranch (weaver-instance refactor: removal ofTHREAD_LOCAL_WEAVER, Weaver engine threading through the joinpoints, CI fixes) was 622 commits behindmainand needed a rebase before the lara-4 work on top of it.Solution
Rebased the 5 multi-weaver commits onto the current
maintip (049d3ae0). Conflict resolutions:FortranJoinpoints.java: took main's node-association fixes (new wildcard imports, ~50 new factory entries,SpecsLogs.debugfix) and re-applied the full multi-weaver threading (FunctionClassMap→BiFunctionClassMap<FortranNode, FortranWeaver, ...>,create(node, weaver, ...)factories).GenericFortranJoinpoint.java: kept both sides — main's imports/fields and multi-weaver's(FortranNode, FortranWeaver)constructor withsuper(weaver).FortranWeaver.json: took main's regeneration wholesale — verified programmatically that it already contains every multi-weaver attribute addition (all 53 sections havechildren,filehasfoldername+children,programhaschildren).Fortran-JS/package.json: kept main's version (22.2.1) and multi-weaver's dependency updates (jest 30.x, eslint 9.39, TS 5.9, ...).nightly.yml: main's cron/matrix/triggers + the branch-resolver (repo-refs) ref-determination rewrite; addscopilot-setup-steps.yml.git range-diffagainst the pre-rebase branch confirms all hunks survived.Stack
This is the base of a stack:
main← this PR (multi-weaver) ←lara-4(#64), which migrates the weaver to lara-4/WeaverGen2.Post-rebase compile fixes
The rebase was validated with
git range-diff, not by compiling — CI then surfaced the remaining debt (exactly the items flagged as "compile debt" during the rebase), fixed in a follow-up commit on this branch:FortranWeaver.getContext()/getFactory()made instance methods (they routed through the removedgetFortranWeaver()static).importable/AstFactoryconverted to weaver-threadedcreate(node, weaver, targetClass)calls (17 sites).F*joinpoint classes from main converted to the(node, FortranWeaver)constructor pattern; 14 danglingcreate()call sites inAFortranWeaverJoinPointthreaded.copilot-setup-steps.yml: actions pinned to full commit SHAs (Sonar rulegithubactions:S7637, the file is new code in this PR).