Skip to content

Commit 76f4b69

Browse files
dougxcdougxc
committed
deleted CompositeValueClass
1 parent 235efc1 commit 76f4b69

File tree

10 files changed

+15
-189
lines changed

10 files changed

+15
-189
lines changed

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/test/CompositeValueReplacementTest1.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ public CompositeValue forEachComponent(LIRInstruction inst, OperandMode mode, In
7575
protected void visitEachComponent(LIRInstruction inst, OperandMode mode, InstructionValueConsumer proc) {
7676
proc.visitValue(inst, value, mode, flags);
7777
}
78+
79+
@Override
80+
public String toString() {
81+
return String.valueOf(value);
82+
}
7883
}
7984

8085
private static class DummyValue extends Value {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/CompositeValue.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public abstract class CompositeValue extends Value {
4848

4949
public CompositeValue(ValueKind<?> kind) {
5050
super(kind);
51-
assert CompositeValueClass.get(getClass()) != null;
5251
}
5352

5453
/**
@@ -64,10 +63,11 @@ public CompositeValue(ValueKind<?> kind) {
6463

6564
protected abstract void visitEachComponent(LIRInstruction inst, LIRInstruction.OperandMode mode, InstructionValueConsumer proc);
6665

66+
/**
67+
* Must be implemented by subclasses.
68+
*/
6769
@Override
68-
public String toString() {
69-
return CompositeValueClass.format(this);
70-
}
70+
public abstract String toString();
7171

7272
@Override
7373
public int hashCode() {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/CompositeValueClass.java‎

Lines changed: 0 additions & 125 deletions
This file was deleted.

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AddressValue.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,10 @@ protected void visitEachComponent(LIRInstruction inst, LIRInstruction.OperandMod
163163
proc.visitValue(inst, base, mode, flags);
164164
proc.visitValue(inst, offset, mode, flags);
165165
}
166+
167+
@Override
168+
public String toString() {
169+
return String.format("{base: %s, offset: %s} bitMemoryTransferSize: %s displacement: %s scaleFactor: %s addressingMode: %s",
170+
base, offset, bitMemoryTransferSize, displacement, scaleFactor, addressingMode);
171+
}
166172
}

‎substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalCompilerSupport.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public class LibGraalCompilerSupport {
3939

4040
public final EconomicMap<Class<?>, Object> nodeClasses = ImageHeapMap.create();
4141
public final EconomicMap<Class<?>, Object> instructionClasses = ImageHeapMap.create();
42-
public final EconomicMap<Class<?>, Object> compositeValueClasses = ImageHeapMap.create();
4342

4443
protected EconomicMap<Class<?>, Object> basePhaseStatistics = ImageHeapMap.create();
4544
protected EconomicMap<Class<?>, Object> lirPhaseStatistics = ImageHeapMap.create();

‎substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFieldsOffsetsFeature.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@ public final class LibGraalFieldsOffsetsFeature implements InternalFeature {
9292
private Class<?> lirInstructionClass;
9393
private Class<?> lirInstructionClassClass;
9494
private MethodHandle lirInstructionClassClassGetMethod;
95-
private Class<?> compositeValueClass;
96-
private Class<?> compositeValueClassClass;
97-
private MethodHandle compositeValueClassClassGetMethod;
9895

9996
private static class FieldsOffsetsReplacement {
10097
protected final Object fields;
@@ -128,8 +125,6 @@ public void duringSetup(DuringSetupAccess a) {
128125
nodeClassClass = libGraalFeature.loadClassOrFail("jdk.graal.compiler.graph.NodeClass");
129126
lirInstructionClass = libGraalFeature.loadClassOrFail("jdk.graal.compiler.lir.LIRInstruction");
130127
lirInstructionClassClass = libGraalFeature.loadClassOrFail("jdk.graal.compiler.lir.LIRInstructionClass");
131-
compositeValueClass = libGraalFeature.loadClassOrFail("jdk.graal.compiler.lir.CompositeValue");
132-
compositeValueClassClass = libGraalFeature.loadClassOrFail("jdk.graal.compiler.lir.CompositeValueClass");
133128
fieldIntrospectionClass = libGraalFeature.loadClassOrFail("jdk.graal.compiler.core.common.FieldIntrospection");
134129
inputEdgesClass = libGraalFeature.loadClassOrFail("jdk.graal.compiler.graph.InputEdges");
135130
successorEdgesClass = libGraalFeature.loadClassOrFail("jdk.graal.compiler.graph.SuccessorEdges");
@@ -151,7 +146,6 @@ public void duringSetup(DuringSetupAccess a) {
151146
nodeClassClassComputeIterationMaskMethod = mhl.findStatic(nodeClassClass, "computeIterationMask", MethodType.methodType(long.class, edgesTypeClass, int.class, long[].class));
152147

153148
lirInstructionClassClassGetMethod = mhl.findStatic(lirInstructionClassClass, "get", MethodType.methodType(lirInstructionClassClass, Class.class));
154-
compositeValueClassClassGetMethod = mhl.findStatic(compositeValueClassClass, "get", MethodType.methodType(compositeValueClassClass, Class.class));
155149

156150
fieldIntrospectionClassGetDataMethod = mhl.findVirtual(fieldIntrospectionClass, "getData", MethodType.methodType(fieldsClass));
157151
fieldIntrospectionClassGetAllFieldsMethod = mhl.findVirtual(fieldIntrospectionClass, "getAllFields", MethodType.methodType(fieldsClass.arrayType()));
@@ -251,8 +245,6 @@ private void classReachabilityListener(DuringAnalysisAccess a, Class<?> newlyRea
251245
registerClass(newlyReachableClass, LibGraalCompilerSupport.get().nodeClasses, this::getNodeClassFromNode, false, access);
252246
} else if (!newlyReachableClass.equals(lirInstructionClass) && lirInstructionClass.isAssignableFrom(newlyReachableClass)) {
253247
registerClass(newlyReachableClass, LibGraalCompilerSupport.get().instructionClasses, this::getLIRInstructionClassFromLIRInstruction, true, access);
254-
} else if (!newlyReachableClass.equals(compositeValueClass) && compositeValueClass.isAssignableFrom(newlyReachableClass)) {
255-
registerClass(newlyReachableClass, LibGraalCompilerSupport.get().compositeValueClasses, this::getCompositeValueClassFromCompositeValue, true, access);
256248
}
257249
}
258250

@@ -486,15 +478,4 @@ private Object getLIRInstructionClassFromLIRInstruction(Class<?> clazz) {
486478
throw VMError.shouldNotReachHere(e);
487479
}
488480
}
489-
490-
private Object getCompositeValueClassFromCompositeValue(Class<?> clazz) {
491-
try {
492-
assert compositeValueClass.isAssignableFrom(clazz);
493-
Object nodeClassInstance = compositeValueClassClassGetMethod.invoke(clazz);
494-
assert compositeValueClassClass.isInstance(nodeClassInstance);
495-
return nodeClassInstance;
496-
} catch (Throwable e) {
497-
throw VMError.shouldNotReachHere(e);
498-
}
499-
}
500481
}

‎substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalSubstitutions.java‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -404,23 +404,6 @@ public static Target_jdk_graal_compiler_lir_LIRInstructionClass get(Class<?> cla
404404
}
405405
}
406406

407-
@TargetClass(className = "jdk.graal.compiler.lir.CompositeValueClass", classLoader = LibGraalClassLoaderSupplier.class, onlyWith = LibGraalFeature.IsEnabled.class)
408-
static final class Target_jdk_graal_compiler_lir_CompositeValueClass {
409-
410-
/*
411-
* Redirect method to image build-time pre-computed compositeValueClasses map in
412-
* LibGraalCompilerSupport.
413-
*/
414-
@Substitute
415-
public static Target_jdk_graal_compiler_lir_CompositeValueClass get(Class<?> clazz) {
416-
Object compositeValueClass = LibGraalCompilerSupport.get().compositeValueClasses.get(clazz);
417-
if (compositeValueClass == null) {
418-
throw VMError.shouldNotReachHere(String.format("Unknown composite value class: %s%n", clazz.getName()));
419-
}
420-
return SubstrateUtil.cast(compositeValueClass, Target_jdk_graal_compiler_lir_CompositeValueClass.class);
421-
}
422-
}
423-
424407
@TargetClass(className = "jdk.graal.compiler.hotspot.HotSpotGraalOptionValues", classLoader = LibGraalClassLoaderSupplier.class, onlyWith = LibGraalFeature.IsEnabled.class)
425408
static final class Target_jdk_graal_compiler_hotspot_HotSpotGraalOptionValues {
426409

‎substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/GraalCompilerSupport.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import jdk.graal.compiler.debug.DebugHandlersFactory;
4444
import jdk.graal.compiler.graph.Node;
4545
import jdk.graal.compiler.graph.NodeClass;
46-
import jdk.graal.compiler.lir.CompositeValueClass;
4746
import jdk.graal.compiler.lir.LIRInstructionClass;
4847
import jdk.graal.compiler.lir.phases.LIRPhase;
4948
import jdk.graal.compiler.phases.BasePhase;
@@ -56,7 +55,6 @@ public class GraalCompilerSupport {
5655

5756
public final EconomicMap<Class<?>, NodeClass<?>> nodeClasses = ImageHeapMap.create();
5857
public final EconomicMap<Class<?>, LIRInstructionClass<?>> instructionClasses = ImageHeapMap.create();
59-
public final EconomicMap<Class<?>, CompositeValueClass<?>> compositeValueClasses = ImageHeapMap.create();
6058
public HashMap<Class<? extends NodeMatchRules>, EconomicMap<Class<? extends Node>, List<MatchStatement>>> matchRuleRegistry;
6159

6260
protected EconomicMap<Class<?>, BasePhase.BasePhaseStatistics> basePhaseStatistics;

‎substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/FieldsOffsetsFeature.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@
5151
import jdk.graal.compiler.graph.Edges;
5252
import jdk.graal.compiler.graph.Node;
5353
import jdk.graal.compiler.graph.NodeClass;
54-
import jdk.graal.compiler.lir.CompositeValue;
55-
import jdk.graal.compiler.lir.CompositeValueClass;
5654
import jdk.graal.compiler.lir.LIRInstruction;
5755
import jdk.graal.compiler.lir.LIRInstructionClass;
5856
import jdk.internal.misc.Unsafe;
@@ -167,8 +165,6 @@ private static void classReachabilityListener(DuringAnalysisAccess a, Class<?> n
167165
} else if (LIRInstruction.class.isAssignableFrom(newlyReachableClass) && newlyReachableClass != LIRInstruction.class) {
168166
FieldsOffsetsFeature.<LIRInstructionClass<?>> registerClass(newlyReachableClass, GraalCompilerSupport.get().instructionClasses, LIRInstructionClass::get, true, access);
169167

170-
} else if (CompositeValue.class.isAssignableFrom(newlyReachableClass) && newlyReachableClass != CompositeValue.class) {
171-
FieldsOffsetsFeature.<CompositeValueClass<?>> registerClass(newlyReachableClass, GraalCompilerSupport.get().compositeValueClasses, CompositeValueClass::get, true, access);
172168
}
173169
}
174170

‎substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/substitutions/GraalSubstitutions.java‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@
8181
import jdk.graal.compiler.debug.TimeSource;
8282
import jdk.graal.compiler.graph.Node;
8383
import jdk.graal.compiler.graph.NodeClass;
84-
import jdk.graal.compiler.lir.CompositeValue;
85-
import jdk.graal.compiler.lir.CompositeValueClass;
8684
import jdk.graal.compiler.lir.LIRInstruction;
8785
import jdk.graal.compiler.lir.LIRInstructionClass;
8886
import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
@@ -400,21 +398,6 @@ public static LIRInstructionClass<?> get(Class<? extends LIRInstruction> clazz)
400398
}
401399
}
402400

403-
@TargetClass(value = CompositeValueClass.class, onlyWith = GraalCompilerFeature.IsEnabled.class)
404-
final class Target_jdk_graal_compiler_lir_CompositeValueClass {
405-
406-
@Substitute
407-
@SuppressWarnings("unlikely-arg-type")
408-
@SuppressFBWarnings(value = {"GC_UNRELATED_TYPES"}, justification = "Class is DynamicHub")
409-
public static CompositeValueClass<?> get(Class<? extends CompositeValue> clazz) {
410-
CompositeValueClass<?> compositeValueClass = GraalCompilerSupport.get().compositeValueClasses.get(clazz);
411-
if (compositeValueClass == null) {
412-
throw VMError.shouldNotReachHere(String.format("Unknown composite value class: %s%n", clazz.getName()));
413-
}
414-
return compositeValueClass;
415-
}
416-
}
417-
418401
@TargetClass(value = NoDeadCodeVerifyHandler.class)
419402
final class Target_jdk_graal_compiler_printer_NoDeadCodeVerifyHandler {
420403
@Alias//

0 commit comments

Comments
 (0)