[GR-43100] Increase coverage in org.graalvm.compiler.lir.

PullRequest: graal/13401

Author: wirthi

compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PrintableCFG.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/PrintableDominatorOptimizationProblem.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.EnumSet;
 
 import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;
 import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
@@ -66,32 +65,6 @@ public CompositeValue(ValueKind<?> kind) {
      */
     public abstract CompositeValue forEachComponent(LIRInstruction inst, OperandMode mode, InstructionValueProcedure proc);
 
-    /**
-     * A helper method to visit {@link Value}[] ensuring that a copy of the array is made if it's
-     * needed.
-     *
-     * @param inst
-     * @param values
-     * @param mode
-     * @param proc
-     * @param flags
-     * @return the original {@code values} array or a copy if values changed
-     */
-    protected Value[] visitValueArray(LIRInstruction inst, Value[] values, OperandMode mode, InstructionValueProcedure proc, EnumSet<OperandFlag> flags) {
-        Value[] newValues = null;
-        for (int i = 0; i < values.length; i++) {
-            Value value = values[i];
-            Value newValue = proc.doValue(inst, value, mode, flags);
-            if (!value.identityEquals(newValue)) {
-                if (newValues == null) {
-                    newValues = values.clone();
-                }
-                newValues[i] = value;
-            }
-        }
-        return newValues != null ? newValues : values;
-    }
-
     protected abstract void visitEachComponent(LIRInstruction inst, OperandMode mode, InstructionValueConsumer proc);
 
     @Override

compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotConstantRetrievalOp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -207,21 +207,6 @@ public String toString() {
         return str.toString();
     }
 
-    Values getValues(OperandMode mode) {
-        switch (mode) {
-            case USE:
-                return uses;
-            case ALIVE:
-                return alives;
-            case TEMP:
-                return temps;
-            case DEF:
-                return defs;
-            default:
-                throw GraalError.shouldNotReachHere("unknown OperandMode: " + mode);
-        }
-    }
-
     final String getOpcode(LIRInstruction obj) {
         if (opcodeConstant != null) {
             return opcodeConstant;

compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/BailoutAndRestartBackendException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -162,29 +162,4 @@ private static List<Register> collectRegisters(Object[] values, List<Register> r
         }
         return registers;
     }
-
-    /**
-     * Subtract sets of registers (x - y).
-     *
-     * @param x a set of register to subtract from.
-     * @param y a set of registers to subtract.
-     * @return resulting set of registers (x - y).
-     */
-    public static Value[] subtractRegisters(Value[] x, Value[] y) {
-        ArrayList<Value> result = new ArrayList<>(x.length);
-        for (Value i : x) {
-            boolean append = true;
-            for (Value j : y) {
-                if (sameRegister(i, j)) {
-                    append = false;
-                    break;
-                }
-            }
-            if (append) {
-                result.add(i);
-            }
-        }
-        Value[] resultArray = new Value[result.size()];
-        return result.toArray(resultArray);
-    }
 }

compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/CompositeValue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,8 +40,6 @@ public class Variable extends AllocatableValue {
      */
     public final int index;
 
-    private String name;
-
     /**
      * Creates a new variable.
      *
@@ -54,21 +52,9 @@ public Variable(ValueKind<?> kind, int index) {
         this.index = index;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
     @Override
     public String toString() {
-        if (name != null) {
-            return name;
-        } else {
-            return "v" + index + getKindSuffix();
-        }
+        return "v" + index + getKindSuffix();
     }
 
     @Override