Use frame visibility for Module#define_method. Fixes #3507.

This also modifies main#define_method to always use public. I'm not sure this is the correct behavior, but it passes specs.
jruby · Feb 14, 2016 · 6ed2276 · 6ed2276
1 parent 2bfeb1f
commit 6ed2276
Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -1807,11 +1807,15 @@ public IRubyObject newMethod(IRubyObject receiver, final String methodName, bool
 
     @JRubyMethod(name = "define_method", visibility = PRIVATE, reads = VISIBILITY)
     public IRubyObject define_method(ThreadContext context, IRubyObject arg0, Block block) {
+        Visibility visibility = context.getCurrentVisibility();
+        return defineMethodFromBlock(context, arg0, block, visibility);
+    }
+
+    public IRubyObject defineMethodFromBlock(ThreadContext context, IRubyObject arg0, Block block, Visibility visibility) {
         final Ruby runtime = context.runtime;
         RubySymbol nameSym = TypeConverter.checkID(arg0);
         String name = nameSym.toString();
         DynamicMethod newMethod;
-        Visibility visibility = PUBLIC;
 
         if (!block.isGiven()) {
             throw runtime.newArgumentError("tried to create Proc object without a block");
@@ -1848,11 +1852,15 @@ public IRubyObject define_method(ThreadContext context, IRubyObject arg0, Block
 
     @JRubyMethod(name = "define_method", visibility = PRIVATE, reads = VISIBILITY)
     public IRubyObject define_method(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Block block) {
+        Visibility visibility = context.getCurrentVisibility();
+        return defineMethodFromCallable(context, arg0, arg1, visibility);
+    }
+
+    public IRubyObject defineMethodFromCallable(ThreadContext context, IRubyObject arg0, IRubyObject arg1, Visibility visibility) {
         final Ruby runtime = context.runtime;
         RubySymbol nameSym = TypeConverter.checkID(arg0);
         String name = nameSym.toString();
         DynamicMethod newMethod;
-        Visibility visibility = PUBLIC;
 
         if (runtime.getProc().isInstance(arg1)) {
             // double-testing args.length here, but it avoids duplicating the proc-setup code in two places
@@ -1873,6 +1881,7 @@ public IRubyObject define_method(ThreadContext context, IRubyObject arg0, IRubyO
 
         return nameSym;
     }
+
     @Deprecated
     public IRubyObject define_method(ThreadContext context, IRubyObject[] args, Block block) {
         switch (args.length) {

diff --git a/core/src/main/java/org/jruby/TopSelfFactory.java b/core/src/main/java/org/jruby/TopSelfFactory.java
@@ -95,13 +95,13 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
             @Override
             public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, Block block) {
                 if (klass == singletonClass) warnWrapper(context);
-                return klass.define_method(context, arg0, block);
+                return klass.defineMethodFromBlock(context, arg0, block, Visibility.PUBLIC);
             }
 
             @Override
             public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, Block block) {
                 if (klass == singletonClass) warnWrapper(context);
-                return klass.define_method(context, arg0, arg1, block);
+                return klass.defineMethodFromCallable(context, arg0, arg1, Visibility.PUBLIC);
             }
         });