Commit Graph
998 Commits
Author SHA1 Message Date
LlamaLad7 adcd9526d2 Fix: Rewrite argMap allocation algorithm.
The old one did not properly account for discontinuities in the list, leading to double-width types clobbering meaningful locals and causing mysterious VerifyErrors.
2024-08-30 12:04:41 +01:00
LlamaLad7 023e393348 Build: Bump version. 2024-08-15 12:18:01 +01:00
LlamaLad7 4254da4433 Revert "Compat: Gate NEW descriptor filtering." 2024-08-15 11:55:59 +01:00
LlamaLad7 2307a333b0 Revert "Fix: Fix NEW descriptor gating."
This reverts commit 74a1696d99.
2024-08-15 11:51:36 +01:00
modmuss a4aaaa92c6 Bump version 2024-08-13 08:40:50 +01:00
LlamaLad7 81284c8401 Fix: Remove incorrect PUTFIELD owner check when inspecting initialisers.
These will never match because the LHS is the mixin name and the RHS is the target name.
This restores the 0.8.5 behaviour which does not check the owner at all.
We have never supported assignment expressions in initialisers until now anyway, and even if we check the owner we cannot determine whether the instruction is operating on the current *instance* without proper static analysis, so IMO there's not much point bothering.
2024-07-19 18:42:45 +01:00
LlamaLad7 74a1696d99 Fix: Fix NEW descriptor gating.
Bafflingly, Mixin fails to match a `NEW` instruction whose `<init>` call is outside the slice range, *iff the user specified a descriptor*.
I'm even more surprised that a mod relied on this.
Fixes #152.
2024-07-19 18:40:44 +01:00
modmuss 9aca17d500 Merge pull request #151 from FabricMC/merge/0.8.7
Merge/0.8.7
2024-07-09 18:08:47 +01:00
LlamaLad7 7f00ee3485 Build: Bump version. 2024-07-09 15:40:16 +01:00
LlamaLad7 55670f2779 Merge branch 'refs/heads/0.8.7' into merge/0.8.7
# Conflicts:
#	gradle.properties
#	src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java
2024-07-09 15:38:33 +01:00
LlamaLad7 96b758dedf Revert "Fix/modifyarg(s) after redirect (#128)"
This reverts commit 3eb5281d
2024-07-09 15:35:43 +01:00
LlamaLad7 b20b9b3465 Revert "Fix: Check the staticness of the original call not the current one. (#132)"
This reverts commit 8c8ece2737.
2024-07-09 15:35:16 +01:00
LlamaLad7 60aa12f26c Revert "Use 0 as class reader flags in Modlauncher bytecode provider (#137)"
This reverts commit e779303628.
2024-07-09 15:35:12 +01:00
Mumfrey 4053421aa1 Mixin 0.8.7 RELEASE 2024-07-06 22:41:39 +01:00
Mumfrey 7d7d4dc46c Properly handle empty args window and report name of the original method 2024-07-06 13:54:43 +01:00
Mumfrey c8be3caa40 Use InjectorOrder.DEFAULT for field, fixes third-party injector order 2024-07-06 12:43:28 +01:00
Mumfrey 0c79de4957 Handle offset arg window correctly for ModifyArgs injector, updates #544 2024-07-06 12:41:11 +01:00
Mumfrey 0239904a1b Handle offset arg window correctly for ModifyArg injector, updates #544 2024-07-05 21:46:09 +01:00
Mumfrey 96e81bb780 Use ClassReader flags tunable for metadata ClassNodes too, updates #671 2024-07-04 22:36:05 +01:00
modmuss 2cd49e6314 Enable checkstyle (#149) 2024-07-01 09:09:16 +01:00
LlamaLad7 2edfbc448e Fix: Do not re-parent calls to interface super methods. (#150)
The existing logic is wrong, and they will always be valid as-is because any superinterfaces will be merged onto the target class.
2024-07-01 08:58:23 +01:00
Mumfrey 017eecf17d Propagate local context through compounds via decoration, closes #532 2024-06-25 23:45:48 +01:00
Mumfrey d2105c6359 Display correct node type in printLocals 2024-06-21 00:01:58 +01:00
Mumfrey 8f0bb79ae5 Add fuzz and skip options to AfterInvoke, closes #653 2024-06-20 23:54:19 +01:00
modmuss d0a6ebdf9e Update Gradle (#148) 2024-06-19 23:18:56 +01:00
LlamaLad7 a8254c7483 Fix: Properly extend the stack in ModifyArgInjector. (#144)
The old logic doesn't really make any sense and the calculated extension usually ended up being negative.
Instead, we just make room for our possible receiver and all of our args.
2024-06-08 15:17:38 +01:00
Mumfrey a362aad99b Fix AP file writer issue with non-file outputs, fixed #622 2024-06-07 22:58:07 +01:00
Mumfrey 2d14c78a10 Fix bug with option flags from previous commit 2024-06-07 21:30:03 +01:00
LlamaLad7 c093311184 Fix: Overhaul MixinVerifier supertype logic.
It previously didn't handle array types correctly among some other issues.
2024-06-02 19:43:20 +01:00
LlamaLad7 35c079a988 Fix: Resolve occasional NPE in Locals calculations. 2024-06-02 19:43:20 +01:00
modmuss 02f8479411 Merge pull request #141 from LlamaLad7/merge/0.8.6
Merge/0.8.6
2024-06-02 19:38:09 +01:00
LlamaLad7 8d413b8e43 Compat: Gate NEW descriptor filtering. 2024-06-01 18:44:47 +01:00
LlamaLad7 18f632ca35 Build: Bump version. 2024-06-01 18:41:38 +01:00
LlamaLad7 ea733f9603 Change: Add stack checking to old Target#findInitNodeFor overload and un-deprecate it.
The only reason MixinExtras uses this method is to match Redirect's behaviour, so I would like it to be kept in line with that.
Additionally, there is nothing wrong with not checking the desc as long as you've definitely found the right `NEW` insn, which the injection point handles itself.
2024-06-01 18:23:58 +01:00
Mumfrey 1bae530fba Merge remote-tracking branch 'origin/pr/667' 2024-05-24 19:55:37 +01:00
Mumfrey 02d7470981 Allow authors to specify order on injector annotations 2024-05-24 19:03:04 +01:00
LlamaLad7 02bf3d2240 Change: Add stack checking to old Target#findInitNodeFor overload and un-deprecate it.
The only reason MixinExtras uses this method is to match Redirect's behaviour, so I would like it to be kept in line with that.
Additionally, there is nothing wrong with not checking the desc as long as you've definitely found the right `NEW` insn, which the injection point handles itself.
2024-05-22 17:37:29 +01:00
LlamaLad7 afb9f13921 Fix: Restore removed methods relating to configs. 2024-05-20 01:14:32 +01:00
LlamaLad7 ab4dab0d22 buildscript: Relevant changes from 0.8.6
Accidentally kept these locally.
2024-05-19 23:07:01 +01:00
Mumfrey 0165cf9fcd Restore old findInitNodeFor used by MixinExtras, mark as deprecated
(cherry picked from commit 902c3439e8)
2024-05-19 22:46:47 +01:00
LlamaLad7 92a64e3634 Fabric: Default At#unsafe to true. 2024-05-19 22:45:33 +01:00
LlamaLad7 fda52dce6b Fix: Resolve inappropriate null default in Mixins#addConfiguration. 2024-05-19 22:39:38 +01:00
LlamaLad7 8fda508119 Fabric: Re-allow jumps and array accesses inside initialisers. 2024-05-19 22:19:31 +01:00
LlamaLad7 a1d5becea7 Fabric: Fall back to modid in MethodMapper#getMixinSourceId. 2024-05-19 22:12:41 +01:00
LlamaLad7 998f057459 Initial merge for 0.8.6 2024-05-19 22:05:31 +01:00
LlamaLad7 9cf325d31c Revert "Allowing injecting in constructor's (#30 #40)"
This reverts commit 536170a946.
2024-05-19 19:10:19 +01:00
LlamaLad7 3a090bd0ca Revert "New: Allow injection point specifiers anywhere. (#129)"
This reverts commit e70693a79a.
2024-05-19 19:04:03 +01:00
Mumfrey 1f34ee908a Run all preinject operations before starting any actual injections 2024-05-18 15:46:06 +01:00
Mumfrey a2751aa134 Apply injectors in discrete phases, ensure Redirects always go last(ish) 2024-05-18 11:17:03 +01:00
Mumfrey 08168676c7 Really only linear offsets are supported with base assumption 2024-05-17 20:20:27 +01:00