[GR-73396] Move @Uninterruptible and @AlwaysInline annotations to the shared module#13144
Open
graalvmbot wants to merge 6 commits intomasterfrom
Open
[GR-73396] Move @Uninterruptible and @AlwaysInline annotations to the shared module#13144graalvmbot wants to merge 6 commits intomasterfrom
graalvmbot wants to merge 6 commits intomasterfrom
Conversation
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
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
com.oracle.svm.guest.staging.Uninterruptibletocom.oracle.svm.shared.Uninterruptiblecom.oracle.svm.core.AlwaysInlinetocom.oracle.svm.shared.AlwaysInlinegraalandgraal-enterprise@Uninterruptibleand@AlwaysInlinewere not available incom.oracle.svm.sharedcom.oracle.svm.guest.stagingroot package non-empty with a small marker type soSVM_GUEST_STAGINGstill builds on currentupstream/masterWhy
The shared module now contains code that also needs to use
@Uninterruptibleand@AlwaysInline. Keeping these annotations outsidecom.oracle.svm.sharedwas already causing issues and forcing substitution-based workarounds instead of letting shared code annotate itself directly. See https://github.com/oracle/graal/blob/f2e0eb5e50dd46d4a72378562199aae6f057af16/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SharedModuleUninterruptibleSubstitutions.java for example. This also lets shared utility code such asSubstrateUtilcarry its runtime annotations directly instead of reintroducing them indirectly via@AnnotateOriginalsubstitutions. Since these annotations only matter for compiled code and are ignored in the builder as before, moving them tocom.oracle.svm.sharedkeeps the semantics unchanged while putting them in the module where they are now actually needed.