jruby · Oct 13, 2015 · Oct 13, 2015 · Oct 13, 2015 · Oct 13, 2015
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/ProcMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/ProcMethod.java
@@ -96,4 +96,8 @@ public Signature getSignature() {
     public ArgumentDescriptor[] getArgumentDescriptors() {
         return proc.getBlock().getBody().getArgumentDescriptors();
     }
+
+    public RubyProc getProc() {
+        return proc;
+    }
 }
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -912,7 +912,7 @@ public static IRubyObject classSuperSplatArgs(ThreadContext context, IRubyObject
 
     @Interp
     public static IRubyObject classSuper(ThreadContext context, IRubyObject self, String methodName, RubyModule definingModule, IRubyObject[] args, Block block) {
-        RubyClass superClass = definingModule.getMetaClass().getSuperClass();
+        RubyClass superClass = definingModule.getMetaClass().getMethodLocation().getSuperClass();
         DynamicMethod method = superClass != null ? superClass.searchMethod(methodName) : UndefinedMethod.INSTANCE;
         IRubyObject rVal = method.isUndefined() ? Helpers.callMethodMissing(context, self, method.getVisibility(), methodName, CallType.SUPER, args, block)
                 : method.call(context, self, superClass, methodName, args, block);

diff --git a/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java b/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
@@ -45,6 +45,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.regex.Pattern;
 
 /**
  * Encapsulated logic for processing JRuby's command-line arguments.
@@ -78,6 +79,8 @@ public String toString() {
     private boolean endOfArguments = false;
     private int characterIndex = 0;
 
+    private static final Pattern VERSION_FLAG = Pattern.compile("^--[12]\\.[89012]$");
+
     public ArgumentProcessor(String[] arguments, RubyInstanceConfig config) {
         this(arguments, true, false, false, config);
     }
@@ -482,18 +485,9 @@ private void processArgument() {
                         }
 
                         break FOR;
-                    } else if (argument.equals("--1.8")) {
-                        config.getError().println("warning: " + argument + " ignored");
-                        break FOR;
-                    } else if (argument.equals("--1.9")) {
+                    } else if (VERSION_FLAG.matcher(argument).matches()) {
                         config.getError().println("warning: " + argument + " ignored");
                         break FOR;
-                    } else if (argument.equals("--2.0")) {
-                        config.getError().println("warning: " + argument + " ignored");
-                        break FOR;
-                    } else if (argument.equals("--2.1")) {
-                        // keep the switch for consistency 
-                        break FOR;
                     } else if (argument.equals("--disable-gems")) {
                         config.setDisableGems(true);
                         break FOR;

diff --git a/spec/ruby/core/module/fixtures/classes.rb b/spec/ruby/core/module/fixtures/classes.rb
@@ -504,6 +504,14 @@ def self.get_constant_from_scope_with_send(method)
       send(method, "Lookup")
     end
   end
+
+  class SuperInClassMethodWithPrepend
+    def self.inherited(base)
+      super
+    end
+  end
+
+  SuperInClassMethodWithPrepend.singleton_class.prepend(Module.new)
 end
 
 class Object

diff --git a/spec/ruby/core/module/prepend_spec.rb b/spec/ruby/core/module/prepend_spec.rb
@@ -287,4 +287,10 @@ class ModuleSpecs::PrependSuperInSingletonClass
       end
     end.should_not raise_error
   end
+
+  it "supports super when the module is prepended into a singleton class with a class super" do
+    lambda do
+      Class.new(ModuleSpecs::SuperInClassMethodWithPrepend)
+    end.should_not raise_error
+  end
 end