summaryrefslogtreecommitdiff
path: root/insns.def
diff options
context:
space:
mode:
authorKevin Newton <kddnewton@gmail.com>2022-03-31 11:04:25 -0400
committerAlan Wu <XrXr@users.noreply.github.com>2022-04-01 14:48:22 -0400
commit6068da8937d7e4358943f95e7450dae7179a7763 (patch)
tree68ad7d95ec12f1dec4b1b745725c9579ab2f10ec /insns.def
parent20c190f95a28dd4e57cb96f939ff314dfb88b1f4 (diff)
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]
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/5716
Diffstat (limited to 'insns.def')
-rw-r--r--insns.def13
1 files changed, 12 insertions, 1 deletions
diff --git a/insns.def b/insns.def
index c3b2eb9a97..cdec216cfe 100644
--- a/insns.def
+++ b/insns.def
@@ -1028,12 +1028,23 @@ opt_getinlinecache
(VALUE val)
{
struct iseq_inline_constant_cache_entry *ice = ic->entry;
+
+ // If there isn't an entry, then we're going to walk through the ISEQ
+ // starting at this instruction until we get to the associated
+ // opt_setinlinecache and associate this inline cache with every getconstant
+ // listed in between. We're doing this here instead of when the instructions
+ // are first compiled because it's possible to turn off inline caches and we
+ // want this to work in either case.
+ if (!ice) {
+ vm_ic_compile(GET_CFP(), ic);
+ }
+
if (ice && vm_ic_hit_p(ice, GET_EP())) {
val = ice->value;
JUMP(dst);
}
else {
- val = Qnil;
+ val = Qnil;
}
}