Pass TestObjSpace#test_trace_object_allocations

* Trace allocations from StringLiteralNode.
* Always use the top-most user SourceSection, which is correct and
  allows us to drop the boolean field of AllocateObjectNode.
* Always use the current frame to get self and the class path.

Author: eregon

lib/truffle/objspace.rb

@@ -229,7 +229,11 @@ def allocation_generation(object)
   def allocation_method_id(object)
     allocation = ALLOCATIONS[object]
     return nil if allocation.nil?
-    allocation.method_id
+
+    method_id = allocation.method_id
+    # The allocator function is hidden in MRI
+    method_id = :new if method_id == :__allocate__
+    method_id
   end
   module_function :allocation_method_id
 

src/main/java/org/truffleruby/core/array/ArrayLiteralNode.java

@@ -17,7 +17,6 @@
 import org.truffleruby.core.CoreLibrary;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.objects.AllocateObjectNode;
-import org.truffleruby.language.objects.AllocateObjectNodeGen;
 
 public abstract class ArrayLiteralNode extends RubyNode {
 
@@ -54,7 +53,7 @@ protected DynamicObject makeGeneric(VirtualFrame frame, Object[] alreadyExecuted
     protected DynamicObject createArray(Object store, int size) {
         if (allocateObjectNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            allocateObjectNode = insert(AllocateObjectNodeGen.create(false));
+            allocateObjectNode = insert(AllocateObjectNode.create());
         }
         return allocateObjectNode.allocate(coreLibrary().getArrayClass(), store, size);
     }

src/main/java/org/truffleruby/core/objectspace/ObjectSpaceManager.java

@@ -41,7 +41,6 @@
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.utilities.CyclicAssumption;
 
 import org.truffleruby.RubyContext;

src/main/java/org/truffleruby/language/literal/StringLiteralNode.java

@@ -20,12 +20,15 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import org.truffleruby.Layouts;
 import org.truffleruby.core.rope.Rope;
-import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.language.RubyNode;
+import org.truffleruby.language.objects.AllocateObjectNode;
 
 public class StringLiteralNode extends RubyNode {
 
+    @Child AllocateObjectNode allocateNode = AllocateObjectNode.create();
+
     private final Rope rope;
 
     public StringLiteralNode(Rope rope) {
@@ -35,7 +38,7 @@ public StringLiteralNode(Rope rope) {
 
     @Override
     public DynamicObject execute(VirtualFrame frame) {
-        return StringOperations.createString(getContext(), rope);
+        return allocateNode.allocate(coreLibrary().getStringClass(), Layouts.STRING.build(false, false, rope));
     }
 
 }

src/main/java/org/truffleruby/language/objects/AllocateObjectNode.java

@@ -24,7 +24,6 @@
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.Layouts;
 import org.truffleruby.core.objectspace.ObjectSpaceManager;
-import org.truffleruby.core.string.StringNodes;
 import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.arguments.RubyArguments;
@@ -34,13 +33,7 @@
 public abstract class AllocateObjectNode extends RubyBaseNode {
 
     public static AllocateObjectNode create() {
-        return AllocateObjectNodeGen.create(true);
-    }
-
-    private final boolean useCallerFrameForTracing;
-
-    public AllocateObjectNode(boolean useCallerFrameForTracing) {
-        this.useCallerFrameForTracing = useCallerFrameForTracing;
+        return AllocateObjectNodeGen.create();
     }
 
     public DynamicObject allocate(DynamicObject classToAllocate, Object... values) {
@@ -100,17 +93,9 @@ public DynamicObject allocateTracing(DynamicObject classToAllocate, Object[] val
 
     @CompilerDirectives.TruffleBoundary
     private void callTraceAllocation(DynamicObject object) {
-        final FrameInstance allocatingFrameInstance;
-        final SourceSection allocatingSourceSection;
-
-        if (useCallerFrameForTracing) {
-            allocatingFrameInstance = getContext().getCallStack().getCallerFrameIgnoringSend();
-            allocatingSourceSection = getContext().getCallStack().getTopMostUserSourceSection();
-        } else {
-            allocatingFrameInstance = Truffle.getRuntime().getCurrentFrame();
-            allocatingSourceSection = getEncapsulatingSourceSection();
-        }
+        final SourceSection allocatingSourceSection = getContext().getCallStack().getTopMostUserSourceSection(getEncapsulatingSourceSection());
 
+        final FrameInstance allocatingFrameInstance = Truffle.getRuntime().getCurrentFrame();
         final Frame allocatingFrame = allocatingFrameInstance.getFrame(FrameInstance.FrameAccess.READ_ONLY);
 
         final Object allocatingSelf = RubyArguments.getSelf(allocatingFrame);

test/mri/excludes/TestObjSpace.rb

@@ -18,7 +18,6 @@
 exclude :test_memsize_of_iseq, "needs investigation"
 exclude :test_memsize_of_root_shared_string, "needs investigation"
 exclude :test_reachable_objects_size, "needs investigation"
-exclude :test_trace_object_allocations, "needs investigation"
 exclude :test_count_objects_size_with_wrong_type, "needs investigation"
 exclude :test_dump_addresses_match_dump_all_addresses, "needs investigation"
 exclude :test_dump_all_full, "needs investigation"