Do not generate invokers for Ruby 1.8 mode anymore.

No released version of JRuby in the past two years supports 1.8. See rails/rails#32064.
jruby · Feb 20, 2018 · 065cf78 · 065cf78
1 parent d78ae0f
commit 065cf78
Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -976,13 +976,16 @@ public static final class MethodClumper {
         public Map<Set<FrameField>, List<String>> readGroups = Collections.EMPTY_MAP;
         public Map<Set<FrameField>, List<String>> writeGroups = Collections.EMPTY_MAP;
 
+        @SuppressWarnings("deprecation")
         public void clump(final Class cls) {
             Method[] declaredMethods = Initializer.DECLARED_METHODS.get(cls);
             for (Method method: declaredMethods) {
                 JRubyMethod anno = method.getAnnotation(JRubyMethod.class);
 
                 if (anno == null) continue;
 
+                if (anno.compat() == org.jruby.CompatVersion.RUBY1_8) continue;
+
                 // skip bridge methods, as generated by JDK8 javac for e.g. return-value overloaded methods
                 if (method.isBridge()) continue;
 

diff --git a/core/src/main/java/org/jruby/anno/AnnotationBinder.java b/core/src/main/java/org/jruby/anno/AnnotationBinder.java
@@ -94,6 +94,7 @@ public SourceVersion getSupportedSourceVersion() {
         return SourceVersion.latest();
     }
 
+    @SuppressWarnings("deprecation")
     public void processType(TypeElement cd) {
         // process inner classes
         for (TypeElement innerType : ElementFilter.typesIn(cd.getEnclosedElements())) {
@@ -164,8 +165,11 @@ public void processType(TypeElement cd) {
             int methodCount = 0;
             for (ExecutableElement method : ElementFilter.methodsIn(cd.getEnclosedElements())) {
                 JRubyMethod anno = method.getAnnotation(JRubyMethod.class);
+
                 if (anno == null) continue;
 
+                if (anno.compat() == org.jruby.CompatVersion.RUBY1_8) continue;
+
                 methodCount++;
 
                 checkForThrows(cd, method);

diff --git a/core/src/main/java/org/jruby/anno/IndyBinder.java b/core/src/main/java/org/jruby/anno/IndyBinder.java
@@ -110,6 +110,7 @@ public SourceVersion getSupportedSourceVersion() {
         return SourceVersion.latest();
     }
 
+    @SuppressWarnings("deprecation")
     public void processType(TypeElement cd) {
         // process inner classes
         for (TypeElement innerType : ElementFilter.typesIn(cd.getEnclosedElements())) {
@@ -188,6 +189,8 @@ public void processType(TypeElement cd) {
                 JRubyMethod anno = method.getAnnotation(JRubyMethod.class);
                 if (anno == null) continue;
 
+                if (anno.compat() == org.jruby.CompatVersion.RUBY1_8) continue;
+
                 methodCount++;
 
                 AnnotationBinder.checkForThrows(cd, method);