jruby · May 11, 2015 · May 11, 2015 · May 11, 2015 · May 11, 2015
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -1548,7 +1548,7 @@ public RubyArray singletonMethods(VirtualFrame frame, Object self, boolean inclu
 
             CompilerDirectives.transferToInterpreter();
             return RubyArray.fromObjects(getContext().getCoreLibrary().getArrayClass(),
-                    metaClass.filterMethods(includeAncestors, MethodFilter.PUBLIC_PROTECTED).toArray());
+                    metaClass.filterSingletonMethods(includeAncestors, MethodFilter.PUBLIC_PROTECTED).toArray());
         }
 
         @Specialization

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ThreadBacktraceLocationNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ThreadBacktraceLocationNodes.java
@@ -33,7 +33,7 @@ public class ThreadBacktraceLocationNodes {
 
     static {
         Shape.Allocator allocator = RubyBasicObject.LAYOUT.createAllocator();
-        ACTIVATION_PROPERTY = Property.create(ACTIVATION_IDENTIFIER, allocator.locationForType(ReentrantLock.class, EnumSet.of(LocationModifier.NonNull)), 0);
+        ACTIVATION_PROPERTY = Property.create(ACTIVATION_IDENTIFIER, allocator.locationForType(Activation.class, EnumSet.of(LocationModifier.NonNull)), 0);
     }
 
     public static Allocator createThreadBacktraceLocationAllocator(Shape emptyShape) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
@@ -210,7 +210,8 @@ public int write(VirtualFrame frame, RubyBasicObject file, RubyString string) {
 
             final ByteList byteList = string.getByteList();
 
-            final ByteBuffer buffer = ByteBuffer.wrap(byteList.bytes(), byteList.begin(), byteList.length());
+            // TODO (eregon, 11 May 2015): review consistency under concurrent modification
+            final ByteBuffer buffer = ByteBuffer.wrap(byteList.unsafeBytes(), byteList.begin(), byteList.length());
 
             int total = 0;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/ModuleOperations.java b/truffle/src/main/java/org/jruby/truffle/runtime/ModuleOperations.java
@@ -192,6 +192,26 @@ public static Map<String, InternalMethod> getAllMethods(RubyModule module) {
         return methods;
     }
 
+    @TruffleBoundary
+    public static Map<String, InternalMethod> getMethodsBeforeLogicalClass(RubyModule module) {
+        final Map<String, InternalMethod> methods = new HashMap<>();
+
+        for (RubyModule ancestor : module.ancestors()) {
+            // When we find a class which is not a singleton class, we are done
+            if (ancestor instanceof RubyClass && !((RubyClass) ancestor).isSingleton()) {
+                break;
+            }
+
+            for (InternalMethod method : ancestor.getMethods().values()) {
+                if (!methods.containsKey(method.getName())) {
+                    methods.put(method.getName(), method);
+                }
+            }
+        }
+
+        return methods;
+    }
+
     @TruffleBoundary
     public static Map<String, InternalMethod> getMethodsUntilLogicalClass(RubyModule module) {
         final Map<String, InternalMethod> methods = new HashMap<>();

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
@@ -557,23 +557,36 @@ public boolean filter(InternalMethod method) {
     }
 
     public Collection<RubySymbol> filterMethods(boolean includeAncestors, MethodFilter filter) {
-        return filterMethods(includeAncestors, false, filter);
+        final Map<String, InternalMethod> allMethods;
+        if (includeAncestors) {
+            allMethods = ModuleOperations.getAllMethods(this);
+        } else {
+            allMethods = getMethods();
+        }
+        return filterMethods(allMethods, filter);
     }
 
     public Collection<RubySymbol> filterMethodsOnObject(boolean includeAncestors, MethodFilter filter) {
-        return filterMethods(includeAncestors, true, filter);
-    }
-
-    private Collection<RubySymbol> filterMethods(boolean includeAncestors, boolean untilLogicalClass, MethodFilter filter) {
         final Map<String, InternalMethod> allMethods;
         if (includeAncestors) {
             allMethods = ModuleOperations.getAllMethods(this);
-        } else if (untilLogicalClass) {
+        } else {
             allMethods = ModuleOperations.getMethodsUntilLogicalClass(this);
+        }
+        return filterMethods(allMethods, filter);
+    }
+
+    public Collection<RubySymbol> filterSingletonMethods(boolean includeAncestors, MethodFilter filter) {
+        final Map<String, InternalMethod> allMethods;
+        if (includeAncestors) {
+            allMethods = ModuleOperations.getMethodsBeforeLogicalClass(this);
         } else {
             allMethods = getMethods();
         }
+        return filterMethods(allMethods, filter);
+    }
 
+    private Collection<RubySymbol> filterMethods(Map<String, InternalMethod> allMethods, MethodFilter filter) {
         final Map<String, InternalMethod> methods = ModuleOperations.withoutUndefinedMethods(allMethods);
 
         final Set<RubySymbol> filtered = new HashSet<>();

diff --git a/truffle/src/main/ruby/core/config.rb b/truffle/src/main/ruby/core/config.rb
@@ -7,13 +7,13 @@
 # GNU Lesser General Public License version 2.1
 
 module RbConfig
-CONFIG = {
-  'ruby_install_name' => 'rubytruffle',
-  'RUBY_INSTALL_NAME' => 'rubytruffle',
-  'exeext' => '',
-  'EXEEXT' => 'rubytruffle',
-  'ruby_version' => '2.2.0',
-  'libdir' => "#{Truffle::Primitive.home_directory}/lib/ruby/truffle",
-  'host_os' => Truffle::Primitive.host_os
-}
+  CONFIG = {
+    'exeext' => '',
+    'EXEEXT' => 'rubytruffle',
+    'host_os' => Truffle::Primitive.host_os,
+    'libdir' => "#{Truffle::Primitive.home_directory}/lib/ruby/truffle",
+    'ruby_install_name' => 'rubytruffle',
+    'RUBY_INSTALL_NAME' => 'rubytruffle',
+    'ruby_version' => '2.2.0',
+  }
 end