avm2: Support reading metadata through flash.utils.describeType #11275
Conversation
This file contains 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
Lord-McSweeney
force-pushed
the
avm2-describeType-improved
branch
from
b4f1a77 to
de6925d
Compare
Aaron1011
approved these changes
May 31, 2023
Lord-McSweeney
force-pushed
the
avm2-describeType-improved
branch
from
de6925d to
ef43e3a
Compare
Dinnerbone
approved these changes
Jun 2, 2023
Lord-McSweeney
force-pushed
the
avm2-describeType-improved
branch
from
ef43e3a to
9fc1a29
Compare
adrian17
reviewed
Jun 2, 2023
core/src/avm2/traits.rs
Outdated
| @@ -222,6 +335,7 @@ impl<'gc> Trait<'gc> { | |||
| disp_id: *disp_id, | |||
| method: unit.load_method(*method, false, activation)?, | |||
| }, | |||
| metadata: metadata_from_abc_trait(activation, unit, abc_trait.metadata.clone())?, | |||
There was a problem hiding this comment.
I thought we wanted these to be loaded lazily (at describeType() time) from the TU, rather than eagerly? Most metadata is not used so we'd prefer to just store the index and forget about it.
There was a problem hiding this comment.
This will be resolved to None very quickly if there's no metadata
Lord-McSweeney
force-pushed
the
avm2-describeType-improved
branch
4 times, most recently
from
c7f1500 to
b71f3c5
Compare
Lord-McSweeney
added
the
waiting-on-review
adrian17
approved these changes
Jun 9, 2023
Dinnerbone
added
waiting-on-author
Lord-McSweeney
force-pushed
the
avm2-describeType-improved
branch
2 times, most recently
from
d846f47 to
187e3d0
Compare
Lord-McSweeney
added
waiting-on-review
Lord-McSweeney
force-pushed
the
avm2-describeType-improved
branch
from
187e3d0 to
693a433
Compare
adrian17
approved these changes
Jul 18, 2023
| @@ -287,6 +305,10 @@ impl<'gc> Trait<'gc> { | |||
| &self.kind | |||
| } | |||
|
|
|||
| pub fn metadata(&self) -> Option<Box<[Metadata<'gc>]>> { | |||
| self.metadata.clone() | |||
There was a problem hiding this comment.
(still wish we didn't do copying here, but I guess it's not that big of a deal...
Hopefully maybe some future class refactor might allow us to squash the duplication.)
Lord-McSweeney
force-pushed
the
avm2-describeType-improved
branch
from
693a433 to
66b41f7
Compare
Lord-McSweeney
force-pushed
the
avm2-describeType-improved
branch
from
8a5ee98 to
dcfecc1
Compare
…in describeType; parse ABC metadata key-value pairs correctly; add test
Lord-McSweeney
force-pushed
the
avm2-describeType-improved
branch
from
dcfecc1 to
f8b3309
Compare
Lord-McSweeney
removed
the
waiting-on-review
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.
This caught a bug in
swf:swfwould parse key-value pairs for metadata incorrectly.Progresses New Club Penguin (#8330), and also anything else that uses the Robotlegs or SwiftSuspenders frameworks.
Unfortunately this doesn't progress #10403, even though I've confirmed that the class that was being checked has the same
describeTypeoutput in FP and in Ruffle (so I would assume something's breaking with Robotlegs).