-
Notifications
You must be signed in to change notification settings - Fork 577
[TrimmableTypeMap] Use trimmable Java proxy runtime sources #11271
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
882ce7c
Use trimmable Java proxy runtime sources
simonrozsival 0644b70
Address trimmable runtime review comments
simonrozsival b1d1947
Merge branch 'main' into trimmable-java-proxy-object
simonrozsival 80d4af4
Address Java proxy review comments
simonrozsival ac015d1
Merge remote-tracking branch 'origin/main' into trimmable-java-proxy-…
simonrozsival 43bc2ed
Simplify trimmable runtime artifacts
simonrozsival 92a4836
Merge main into trimmable-java-proxy-object to pick up CI fixes
simonrozsival ba9363f
Address runtime artifact cleanup feedback
simonrozsival File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
45 changes: 45 additions & 0 deletions
45
src/java-runtime/java-trimmable/net/dot/jni/internal/JavaProxyObject.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package net.dot.jni.internal; | ||
|
|
||
| import java.util.ArrayList; | ||
|
|
||
| import net.dot.jni.GCUserPeerable; | ||
|
|
||
| /* package */ final class JavaProxyObject | ||
| extends java.lang.Object | ||
| implements GCUserPeerable | ||
| { | ||
| ArrayList<Object> managedReferences = new ArrayList<Object>(); | ||
|
|
||
| // This trimmable runtime copy cannot use Java.Interop's native object methods: | ||
| // those are registered through ManagedPeer.registerNativeMembers, which is not | ||
| // supported in the trimmable typemap path. | ||
| // Trimmable proxies use Java identity semantics: equals/hashCode/toString | ||
| // do not delegate to the wrapped .NET object. | ||
| @Override | ||
| public boolean equals(Object obj) | ||
| { | ||
| return this == obj; | ||
| } | ||
|
simonrozsival marked this conversation as resolved.
|
||
|
|
||
| @Override | ||
| public int hashCode() | ||
| { | ||
| return System.identityHashCode (this); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() | ||
| { | ||
| return super.toString (); | ||
|
simonrozsival marked this conversation as resolved.
Outdated
|
||
| } | ||
|
|
||
| public void jiAddManagedReference (java.lang.Object obj) | ||
| { | ||
| managedReferences.add (obj); | ||
| } | ||
|
|
||
| public void jiClearManagedReferences () | ||
| { | ||
| managedReferences.clear (); | ||
| } | ||
| } | ||
29 changes: 29 additions & 0 deletions
29
src/java-runtime/java-trimmable/net/dot/jni/internal/JavaProxyThrowable.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package net.dot.jni.internal; | ||
|
|
||
| import java.util.ArrayList; | ||
|
|
||
| import net.dot.jni.GCUserPeerable; | ||
|
|
||
| /* package */ final class JavaProxyThrowable | ||
| extends java.lang.Error | ||
| implements GCUserPeerable | ||
| { | ||
| ArrayList<Object> managedReferences = new ArrayList<Object>(); | ||
|
|
||
| public JavaProxyThrowable () { | ||
| } | ||
|
|
||
| public JavaProxyThrowable (String message) { | ||
|
simonrozsival marked this conversation as resolved.
Outdated
|
||
| super (message); | ||
| } | ||
|
|
||
| public void jiAddManagedReference (java.lang.Object obj) | ||
| { | ||
| managedReferences.add (obj); | ||
| } | ||
|
|
||
| public void jiClearManagedReferences () | ||
| { | ||
| managedReferences.clear (); | ||
| } | ||
| } | ||
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.