jruby
diff --git a/‎core/src/main/java/org/jruby/runtime/opto/FailoverSwitchPointInvalidator.java
Copy file name to clipboardExpand all lines: core/src/main/java/org/jruby/runtime/opto/FailoverSwitchPointInvalidator.java
+2Lines changed: 2 additions & 0 deletions b/‎core/src/main/java/org/jruby/runtime/opto/FailoverSwitchPointInvalidator.java
Copy file name to clipboardExpand all lines: core/src/main/java/org/jruby/runtime/opto/FailoverSwitchPointInvalidator.java
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎core/src/main/java/org/jruby/runtime/opto/GenerationAndSwitchPointInvalidator.java
Copy file name to clipboardExpand all lines: core/src/main/java/org/jruby/runtime/opto/GenerationAndSwitchPointInvalidator.java
+3Lines changed: 3 additions & 0 deletions b/‎core/src/main/java/org/jruby/runtime/opto/GenerationAndSwitchPointInvalidator.java
Copy file name to clipboardExpand all lines: core/src/main/java/org/jruby/runtime/opto/GenerationAndSwitchPointInvalidator.java
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎core/src/main/java/org/jruby/runtime/opto/GenerationInvalidator.java
Copy file name to clipboardExpand all lines: core/src/main/java/org/jruby/runtime/opto/GenerationInvalidator.java
+1-3Lines changed: 1 addition & 3 deletions b/‎core/src/main/java/org/jruby/runtime/opto/GenerationInvalidator.java
Copy file name to clipboardExpand all lines: core/src/main/java/org/jruby/runtime/opto/GenerationInvalidator.java
+1-3Lines changed: 1 addition & 3 deletions
diff --git a/‎core/src/main/java/org/jruby/runtime/opto/ObjectIdentityInvalidator.java
Copy file name to clipboardExpand all lines: core/src/main/java/org/jruby/runtime/opto/ObjectIdentityInvalidator.java
+2-3Lines changed: 2 additions & 3 deletions b/‎core/src/main/java/org/jruby/runtime/opto/ObjectIdentityInvalidator.java
Copy file name to clipboardExpand all lines: core/src/main/java/org/jruby/runtime/opto/ObjectIdentityInvalidator.java
+2-3Lines changed: 2 additions & 3 deletions
diff --git a/‎core/src/main/java/org/jruby/runtime/opto/SwitchPointInvalidator.java
Copy file name to clipboardExpand all lines: core/src/main/java/org/jruby/runtime/opto/SwitchPointInvalidator.java
+2Lines changed: 2 additions & 0 deletions b/‎core/src/main/java/org/jruby/runtime/opto/SwitchPointInvalidator.java
Copy file name to clipboardExpand all lines: core/src/main/java/org/jruby/runtime/opto/SwitchPointInvalidator.java
+2Lines changed: 2 additions & 0 deletions
@@ -65,6 +65,8 @@ public void invalidate() {
     }
 
     public void invalidateAll(List<Invalidator> invalidators) {
+        if (invalidators.isEmpty()) return;
+
         SwitchPoint[] switchPoints = new SwitchPoint[invalidators.size()];
 
         for (int i = 0; i < invalidators.size(); i++) {
 
@@ -20,6 +20,8 @@ public void invalidate() {
     }
 
     public void invalidateAll(List<Invalidator> invalidators) {
+        if (invalidators.isEmpty()) return;
+
         SwitchPoint[] switchPoints = new SwitchPoint[invalidators.size()];
 
         for (int i = 0; i < invalidators.size(); i++) {
@@ -36,6 +38,7 @@ public Object getData() {
     }
 
     public void addIfUsed(RubyModule.InvalidatorList invalidators) {
+        // invalidate generation immediately and only add SP invalidator
         generationInvalidator.invalidate();
         switchPointInvalidator.addIfUsed(invalidators);
     }
 
@@ -14,9 +14,7 @@ public void invalidate() {
     }
 
     public void invalidateAll(List<Invalidator> invalidators) {
-        for (Invalidator invalidator : invalidators) {
-            invalidator.invalidate();
-        }
+        invalidators.forEach(Invalidator::invalidate);
     }
 
     public Object getData() {
 
@@ -29,6 +29,7 @@
 
 import java.util.List;
 
+@Deprecated(since = "10.0", forRemoval = true)
 public class ObjectIdentityInvalidator implements Invalidator {
     private volatile Object generation;
 
@@ -41,9 +42,7 @@ public synchronized void invalidate() {
     }
 
     public void invalidateAll(List<Invalidator> invalidators) {
-        for (Invalidator invalidator : invalidators) {
-            invalidator.invalidate();
-        }
+        invalidators.forEach(Invalidator::invalidate);
     }
 
     public Object getData() {
 
@@ -47,6 +47,8 @@ public synchronized void invalidate() {
     }
 
     public void invalidateAll(List<Invalidator> invalidators) {
+        if (invalidators.isEmpty()) return;
+
         SwitchPoint[] switchPoints = new SwitchPoint[invalidators.size()];
 
         for (int i = 0; i < invalidators.size(); i++) {
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ public void invalidate() {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public void invalidateAll(List<Invalidator> invalidators) {`
	`68`	`+ if (invalidators.isEmpty()) return;`
	`69`	`+`
`68`	`70`	`SwitchPoint[] switchPoints = new SwitchPoint[invalidators.size()];`
`69`	`71`
`70`	`72`	`for (int i = 0; i < invalidators.size(); i++) {`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ public void invalidate() {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public void invalidateAll(List<Invalidator> invalidators) {`
	`23`	`+ if (invalidators.isEmpty()) return;`
	`24`	`+`
`23`	`25`	`SwitchPoint[] switchPoints = new SwitchPoint[invalidators.size()];`
`24`	`26`
`25`	`27`	`for (int i = 0; i < invalidators.size(); i++) {`
`@@ -36,6 +38,7 @@ public Object getData() {`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`public void addIfUsed(RubyModule.InvalidatorList invalidators) {`
	`41`	`+ // invalidate generation immediately and only add SP invalidator`
`39`	`42`	`generationInvalidator.invalidate();`
`40`	`43`	`switchPointInvalidator.addIfUsed(invalidators);`
`41`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,7 @@ public void invalidate() {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public void invalidateAll(List<Invalidator> invalidators) {`
`17`		`- for (Invalidator invalidator : invalidators) {`
`18`		`- invalidator.invalidate();`
`19`		`- }`
	`17`	`+ invalidators.forEach(Invalidator::invalidate);`
`20`	`18`	`}`
`21`	`19`
`22`	`20`	`public Object getData() {`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ public synchronized void invalidate() {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public void invalidateAll(List<Invalidator> invalidators) {`
	`50`	`+ if (invalidators.isEmpty()) return;`
	`51`	`+`
`50`	`52`	`SwitchPoint[] switchPoints = new SwitchPoint[invalidators.size()];`
`51`	`53`
`52`	`54`	`for (int i = 0; i < invalidators.size(); i++) {`