Fix quickening generation for boxing overloads.

Author: chumer

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/generator/BytecodeDSLNodeGeneratorPlugs.java

@@ -232,7 +232,7 @@ public void notifySpecialize(FlatNodeGenFactory nodeFactory, CodeTreeBuilder bui
             rootNode.emitOnSpecialize(builder, "$bytecode", "$bci", BytecodeRootNodeElement.readInstruction("$bc", "$bci"), specialization.getNode().getNodeId() + "$" + specialization.getId());
         }
 
-        if (instruction.getQuickeningRoot().hasQuickenings()) {
+        if (instruction.getQuickeningRoot().hasSpecializedQuickenings()) {
             if (quickenMethod == null) {
                 quickenMethod = createQuickenMethod(nodeFactory, frameState);
             }

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/model/InstructionModel.java

@@ -264,6 +264,8 @@ public int compareTo(InstructionEncoding other) {
      */
     public boolean returnTypeQuickening;
 
+    public boolean generic;
+
     /*
      * Alternative argument specialization type for builtin quickenings. E.g. for loadLocal
      * parameter types.
@@ -370,6 +372,19 @@ public boolean hasQuickenings() {
         return !quickenedInstructions.isEmpty();
     }
 
+    public boolean isSpecializedQuickening() {
+        return quickeningBase != null && !returnTypeQuickening && !generic;
+    }
+
+    public boolean hasSpecializedQuickenings() {
+        for (InstructionModel instr : quickenedInstructions) {
+            if (instr.isSpecializedQuickening()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public boolean isQuickening() {
         return quickeningBase != null;
     }
@@ -389,6 +404,25 @@ public void pp(PrettyPrinter printer) {
         if (signature != null) {
             printer.field("signature", signature);
         }
+
+        if (getQuickeningRoot().hasQuickenings()) {
+            String quickenKind;
+            if (quickeningBase == null) {
+                quickenKind = "base";
+            } else {
+                if (isReturnTypeQuickening()) {
+                    quickenKind = "return-type";
+                } else {
+                    if (generic) {
+                        quickenKind = "generic";
+                    } else {
+                        quickenKind = "specialized";
+                    }
+                }
+            }
+            printer.field("quicken-kind", quickenKind);
+        }
+
     }
 
     public boolean isTagInstrumentation() {
@@ -598,15 +632,20 @@ public boolean needsBoxingElimination(BytecodeDSLModel model, int valueIndex) {
 
     public InstructionModel findSpecializedInstruction(TypeMirror type) {
         for (InstructionModel specialization : quickenedInstructions) {
-            if (ElementUtils.typeEquals(type, specialization.specializedType)) {
+            if (!specialization.generic && ElementUtils.typeEquals(type, specialization.specializedType)) {
                 return specialization;
             }
         }
         return null;
     }
 
     public InstructionModel findGenericInstruction() {
-        return findSpecializedInstruction(null);
+        for (InstructionModel specialization : quickenedInstructions) {
+            if (specialization.generic) {
+                return specialization;
+            }
+        }
+        return null;
     }
 
     public void validateAlignment() {

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/parser/BytecodeDSLParser.java

@@ -655,7 +655,7 @@ private void parseBytecodeDSLModel(TypeElement typeElement, BytecodeDSLModel mod
                                 break;
                             }
                         }
-                        if (isBoxingEliminatedOverload && operation.instruction.nodeData.needsRewrites(context)) {
+                        if (isBoxingEliminatedOverload && operation.instruction.nodeData.getReachableSpecializations().size() > 1) {
                             for (List<TypeMirror> signature : expandedSignatures) {
                                 List<TypeMirror> parameterTypes = signature.subList(1, signature.size());
                                 boxingEliminationQuickenings.add(new ResolvedQuickenDecision(operation, List.of(specialization), parameterTypes));
@@ -775,6 +775,7 @@ private void parseBytecodeDSLModel(TypeElement typeElement, BytecodeDSLModel mod
                             if (!overloadedTypes.isEmpty()) {
                                 InstructionModel specialization = model.quickenInstruction(instruction, instruction.signature, "Generic");
                                 specialization.returnTypeQuickening = false;
+                                specialization.generic = true;
                             }
 
                         }
@@ -809,6 +810,7 @@ private void parseBytecodeDSLModel(TypeElement typeElement, BytecodeDSLModel mod
                             InstructionModel specialization = model.quickenInstruction(instruction,
                                             new Signature(context.getType(void.class), List.of(context.getType(Object.class))),
                                             "Generic");
+                            specialization.generic = true;
                             specialization.returnTypeQuickening = false;
 
                             InstructionModel returnTypeQuickening = model.quickenInstruction(instruction,
@@ -837,6 +839,7 @@ private void parseBytecodeDSLModel(TypeElement typeElement, BytecodeDSLModel mod
                         InstructionModel genericQuickening = model.quickenInstruction(instruction,
                                         instruction.signature,
                                         "generic");
+                        genericQuickening.generic = true;
                         genericQuickening.returnTypeQuickening = false;
                         genericQuickening.specializedType = null;
                         break;
@@ -854,6 +857,7 @@ private void parseBytecodeDSLModel(TypeElement typeElement, BytecodeDSLModel mod
 
                         genericQuickening = model.quickenInstruction(instruction,
                                         instruction.signature, "generic");
+                        genericQuickening.generic = true;
                         genericQuickening.returnTypeQuickening = false;
                         genericQuickening.specializedType = null;
                         break;
@@ -882,6 +886,7 @@ private void parseBytecodeDSLModel(TypeElement typeElement, BytecodeDSLModel mod
 
                         genericQuickening = model.quickenInstruction(instruction,
                                         instruction.signature, "generic");
+                        genericQuickening.generic = true;
                         genericQuickening.returnTypeQuickening = false;
                         genericQuickening.specializedType = null;
                         break;
@@ -909,6 +914,7 @@ private void parseBytecodeDSLModel(TypeElement typeElement, BytecodeDSLModel mod
                         genericQuickening = model.quickenInstruction(instruction,
                                         instruction.signature,
                                         "generic");
+                        genericQuickening.generic = true;
                         genericQuickening.returnTypeQuickening = false;
                         genericQuickening.specializedType = null;
 
@@ -936,9 +942,9 @@ private void parseBytecodeDSLModel(TypeElement typeElement, BytecodeDSLModel mod
                         genericQuickening = model.quickenInstruction(instruction,
                                         instruction.signature,
                                         "generic");
+                        genericQuickening.generic = true;
                         genericQuickening.returnTypeQuickening = false;
                         genericQuickening.specializedType = null;
-
                         break;
                 }