Fix some of the issues we have with setting the holder

This is only a partial solution, there are still cases where we do not have the correct holder.

Signed-off-by: Stefan Marr <[email protected]>

Author: smarr

src/trufflesom/compiler/MethodGenerationContext.java

@@ -90,7 +90,7 @@ public class MethodGenerationContext
   private Internal             frameOnStack;
   protected final LexicalScope currentScope;
 
-  private final List<SMethod> embeddedBlockMethods;
+  protected final List<SMethod> embeddedBlockMethods;
 
   public final StructuralProbe<SSymbol, SClass, SInvokable, Field, Variable> structuralProbe;
 

src/trufflesom/compiler/bc/BytecodeMethodGenContext.java

@@ -182,6 +182,12 @@ public void addBytecodeArgument(final byte code) {
     bytecode.add(code);
   }
 
+  public void replaceWith(final SMethod oldBlock, final SMethod newBlock) {
+    boolean wasInList = embeddedBlockMethods.remove(oldBlock);
+    assert wasInList : "The block to be removed is expected to be in the list of embedded methods";
+    embeddedBlockMethods.add(newBlock);
+  }
+
   public void patchJumpOffsetToPointToNextInstruction(final int idxOfOffset,
       final ParserBc parser) throws ParseError {
     int instructionStart = idxOfOffset - 1;

src/trufflesom/interpreter/Invokable.java

@@ -1,5 +1,6 @@
 package trufflesom.interpreter;
 
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -20,7 +21,7 @@ public abstract class Invokable extends RootNode {
 
   protected final ExpressionNode uninitializedBody;
 
-  protected SClass holder;
+  @CompilationFinal protected SClass holder;
 
   protected Invokable(final String name, final SourceSection sourceSection,
       final FrameDescriptor frameDescriptor,

src/trufflesom/interpreter/Method.java

@@ -99,6 +99,7 @@ public Method cloneAndAdaptAfterScopeChange(final BytecodeMethodGenContext mgenc
     Method clone = new Method(name, sourceSection, adaptedBody, adaptedScope, uninit,
         getLanguage(SomLanguage.class));
     adaptedScope.setMethod(clone);
+    clone.setHolder(holder);
     return clone;
   }
 

src/trufflesom/interpreter/Primitive.java

@@ -26,8 +26,10 @@ public Primitive(final String name, final SourceSection sourceSection,
   @Override
   public Node deepCopy() {
     assert getFrameDescriptor().getSize() == 0 : "Make sure there are no slots to be taken care off";
-    return new Primitive(name, sourceSection, NodeUtil.cloneNode(uninitializedBody),
+    Primitive p = new Primitive(name, sourceSection, NodeUtil.cloneNode(uninitializedBody),
         getFrameDescriptor(), uninitializedBody, getLanguage(SomLanguage.class));
+    p.setHolder(holder);
+    return p;
   }
 
   @Override

src/trufflesom/interpreter/nodes/bc/BytecodeLoopNode.java

@@ -1334,6 +1334,7 @@ private void inlineInto(final BytecodeMethodGenContext mgenc, final int targetCo
           SMethod newMethod = new SMethod(blockMethod.getSignature(), adapted,
               blockMethod.getEmbeddedBlocks(), blockIvk.getSourceSection());
           newMethod.setHolder(blockMethod.getHolder());
+          mgenc.replaceWith(blockMethod, newMethod);
           mgenc.addLiteralIfAbsent(newMethod, null);
           emitPUSHBLOCK(mgenc, newMethod, bytecodes[i] == PUSH_BLOCK);
           break;