diff options
| author | Kevin Newton <kddnewton@gmail.com> | 2022-03-31 11:04:25 -0400 |
|---|---|---|
| committer | Alan Wu <XrXr@users.noreply.github.com> | 2022-04-01 14:48:22 -0400 |
| commit | 6068da8937d7e4358943f95e7450dae7179a7763 (patch) | |
| tree | 68ad7d95ec12f1dec4b1b745725c9579ab2f10ec /vm_insnhelper.h | |
| parent | 20c190f95a28dd4e57cb96f939ff314dfb88b1f4 (diff) | |
| download | ruby-6068da8937d7e4358943f95e7450dae7179a7763.tar.gz | |
Finer-grained constant cache invalidation (take 2)
This commit reintroduces finer-grained constant cache invalidation.
After 8008fb7 got merged, it was causing issues on token-threaded
builds (such as on Windows).
The issue was that when you're iterating through instruction sequences
and using the translator functions to get back the instruction structs,
you're either using `rb_vm_insn_null_translator` or
`rb_vm_insn_addr2insn2` depending if it's a direct-threading build.
`rb_vm_insn_addr2insn2` does some normalization to always return to
you the non-trace version of whatever instruction you're looking at.
`rb_vm_insn_null_translator` does not do that normalization.
This means that when you're looping through the instructions if you're
trying to do an opcode comparison, it can change depending on the type
of threading that you're using. This can be very confusing. So, this
commit creates a new translator function
`rb_vm_insn_normalizing_translator` to always return the non-trace
version so that opcode comparisons don't have to worry about different
configurations.
[Feature #18589]
Diffstat (limited to 'vm_insnhelper.h')
| -rw-r--r-- | vm_insnhelper.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/vm_insnhelper.h b/vm_insnhelper.h index 459f567106..e26ecfa77c 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -14,7 +14,6 @@ MJIT_SYMBOL_EXPORT_BEGIN RUBY_EXTERN VALUE ruby_vm_const_missing_count; -RUBY_EXTERN rb_serial_t ruby_vm_global_constant_state; RUBY_EXTERN rb_serial_t ruby_vm_class_serial; RUBY_EXTERN rb_serial_t ruby_vm_global_cvar_state; @@ -183,8 +182,6 @@ CC_SET_FASTPATH(const struct rb_callcache *cc, vm_call_handler func, bool enable #define PREV_CLASS_SERIAL() (ruby_vm_class_serial) #define NEXT_CLASS_SERIAL() (++ruby_vm_class_serial) -#define GET_GLOBAL_CONSTANT_STATE() (ruby_vm_global_constant_state) -#define INC_GLOBAL_CONSTANT_STATE() (++ruby_vm_global_constant_state) #define GET_GLOBAL_CVAR_STATE() (ruby_vm_global_cvar_state) #define INC_GLOBAL_CVAR_STATE() (++ruby_vm_global_cvar_state) |