Skip to content

Commit 73c300b

Browse files
dougxcdougxc
committed
adopt addition of ConstantReflectionProvider.identityHashCode (GR-52365)
1 parent bbca722 commit 73c300b

File tree

35 files changed

+110
-285
lines changed

35 files changed

+110
-285
lines changed

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBackendFactory.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import jdk.graal.compiler.debug.Assertions;
3535
import jdk.graal.compiler.hotspot.meta.HotSpotGraalConstantFieldProvider;
3636
import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider;
37-
import jdk.graal.compiler.hotspot.meta.HotSpotIdentityHashCodeProvider;
3837
import jdk.graal.compiler.hotspot.meta.HotSpotLoweringProvider;
3938
import jdk.graal.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider;
4039
import jdk.graal.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider;
@@ -55,7 +54,6 @@
5554
import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
5655
import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
5756
import jdk.graal.compiler.nodes.loop.LoopsDataProviderImpl;
58-
import jdk.graal.compiler.nodes.spi.IdentityHashCodeProvider;
5957
import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
6058
import jdk.graal.compiler.nodes.spi.Replacements;
6159
import jdk.graal.compiler.nodes.type.NarrowOopStamp;
@@ -221,12 +219,8 @@ public final HotSpotBackend createBackend(HotSpotGraalRuntimeProvider graalRunti
221219
try (InitTimer rt = timer("create Bytecode provider")) {
222220
bytecodeProvider = createBytecodeProvider(metaAccess, snippetReflection);
223221
}
224-
IdentityHashCodeProvider identityHashCodeProvider;
225-
try (InitTimer rt = timer("create IdentityHashCode provider")) {
226-
identityHashCodeProvider = createIdentityHashCodeProvider();
227-
}
228222
providers = new HotSpotProviders(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, null, null, registers,
229-
snippetReflection, wordTypes, stampProvider, platformConfigurationProvider, metaAccessExtensionProvider, loopsDataProvider, config, identityHashCodeProvider,
223+
snippetReflection, wordTypes, stampProvider, platformConfigurationProvider, metaAccessExtensionProvider, loopsDataProvider, config,
230224
graalRuntime.getReplayCompilationSupport());
231225

232226
try (InitTimer rt = timer("create Replacements provider")) {
@@ -256,10 +250,6 @@ public final HotSpotBackend createBackend(HotSpotGraalRuntimeProvider graalRunti
256250
}
257251
}
258252

259-
protected IdentityHashCodeProvider createIdentityHashCodeProvider() {
260-
return new HotSpotIdentityHashCodeProvider();
261-
}
262-
263253
protected abstract HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider graalRuntime, HotSpotProviders providers);
264254

265255
protected abstract Value[] createNativeABICallerSaveRegisters(GraalHotSpotVMConfig config, RegisterConfig registerConfig);

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotDecoratedBackendFactory.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import jdk.graal.compiler.hotspot.word.HotSpotWordTypes;
3939
import jdk.graal.compiler.nodes.gc.BarrierSet;
4040
import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
41-
import jdk.graal.compiler.nodes.spi.IdentityHashCodeProvider;
4241
import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
4342
import jdk.graal.compiler.options.OptionValues;
4443
import jdk.graal.compiler.phases.tiers.CompilerConfiguration;
@@ -118,11 +117,6 @@ protected HotSpotSnippetReflectionProvider createSnippetReflection(HotSpotGraalR
118117
return delegate.createSnippetReflection(runtime, constantReflection, wordTypes);
119118
}
120119

121-
@Override
122-
protected IdentityHashCodeProvider createIdentityHashCodeProvider() {
123-
return delegate.createIdentityHashCodeProvider();
124-
}
125-
126120
@Override
127121
protected LoopsDataProvider createLoopsDataProvider() {
128122
return delegate.createLoopsDataProvider();

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SymbolicSnippetEncoder.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ private boolean verifySnippetEncodeDecode(DebugContext debug, ResolvedJavaMethod
362362
originalProvider.getConstantFieldProvider(), originalProvider.getForeignCalls(), originalProvider.getLowerer(), null, originalProvider.getSuites(),
363363
originalProvider.getRegisters(), originalProvider.getSnippetReflection(), originalProvider.getWordTypes(), originalProvider.getStampProvider(),
364364
originalProvider.getPlatformConfigurationProvider(), originalProvider.getMetaAccessExtensionProvider(), originalProvider.getLoopsDataProvider(), originalProvider.getConfig(),
365-
originalProvider.getIdentityHashCodeProvider(), originalProvider.getReplayCompilationSupport());
365+
originalProvider.getReplayCompilationSupport());
366366
HotSpotSnippetReplacementsImpl filteringReplacements = new HotSpotSnippetReplacementsImpl(newProviders,
367367
originalProvider.getReplacements().getDefaultReplacementBytecodeProvider(), originalProvider.getCodeCache().getTarget());
368368
filteringReplacements.setGraphBuilderPlugins(originalProvider.getReplacements().getGraphBuilderPlugins());
@@ -647,6 +647,11 @@ public JavaConstant asJavaClass(ResolvedJavaType type) {
647647
public Constant asObjectHub(ResolvedJavaType type) {
648648
return constantReflection.asObjectHub(type);
649649
}
650+
651+
@Override
652+
public Integer identityHashCode(JavaConstant constant) {
653+
return constantReflection.identityHashCode(constant);
654+
}
650655
}
651656

652657
class SnippetObjectFilter {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotIdentityHashCodeProvider.java‎

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

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotProviders.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import jdk.graal.compiler.hotspot.replaycomp.ReplayCompilationSupport;
3232
import jdk.graal.compiler.hotspot.word.HotSpotWordTypes;
3333
import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
34-
import jdk.graal.compiler.nodes.spi.IdentityHashCodeProvider;
3534
import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
3635
import jdk.graal.compiler.nodes.spi.LoweringProvider;
3736
import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
@@ -74,10 +73,9 @@ public HotSpotProviders(MetaAccessProvider metaAccess,
7473
MetaAccessExtensionProvider metaAccessExtensionProvider,
7574
LoopsDataProvider loopsDataProvider,
7675
GraalHotSpotVMConfig config,
77-
IdentityHashCodeProvider identityHashCodeProvider,
7876
ReplayCompilationSupport replayCompilationSupport) {
7977
super(metaAccess, codeCache, constantReflection, constantField, foreignCalls, lowerer, replacements, stampProvider, platformConfigurationProvider, metaAccessExtensionProvider,
80-
snippetReflection, wordTypes, loopsDataProvider, identityHashCodeProvider);
78+
snippetReflection, wordTypes, loopsDataProvider);
8179
this.suites = suites;
8280
this.registers = registers;
8381
this.config = config;
@@ -125,7 +123,7 @@ public HotSpotProviders copyWith(ConstantReflectionProvider substitution) {
125123
return new HotSpotProviders(getMetaAccess(), getCodeCache(), substitution, getConstantFieldProvider(), getForeignCalls(), getLowerer(), getReplacements(), getSuites(),
126124
getRegisters(), getSnippetReflection(), getWordTypes(), getStampProvider(), getPlatformConfigurationProvider(), getMetaAccessExtensionProvider(),
127125
getLoopsDataProvider(),
128-
config, getIdentityHashCodeProvider(), getReplayCompilationSupport());
126+
config, getReplayCompilationSupport());
129127
}
130128

131129
@Override
@@ -134,22 +132,22 @@ public HotSpotProviders copyWith(ConstantFieldProvider substitution) {
134132
getSuites(),
135133
getRegisters(), getSnippetReflection(), getWordTypes(), getStampProvider(), getPlatformConfigurationProvider(), getMetaAccessExtensionProvider(),
136134
getLoopsDataProvider(),
137-
config, getIdentityHashCodeProvider(), getReplayCompilationSupport());
135+
config, getReplayCompilationSupport());
138136
}
139137

140138
@Override
141139
public HotSpotProviders copyWith(Replacements substitution) {
142140
return new HotSpotProviders(getMetaAccess(), getCodeCache(), getConstantReflection(), getConstantFieldProvider(), getForeignCalls(), getLowerer(), substitution,
143141
getSuites(), getRegisters(), getSnippetReflection(), getWordTypes(), getStampProvider(), getPlatformConfigurationProvider(),
144142
getMetaAccessExtensionProvider(),
145-
getLoopsDataProvider(), config, getIdentityHashCodeProvider(), getReplayCompilationSupport());
143+
getLoopsDataProvider(), config, getReplayCompilationSupport());
146144
}
147145

148146
public HotSpotProviders copyWith() {
149147
return new HotSpotProviders(getMetaAccess(), getCodeCache(), getConstantReflection(), getConstantFieldProvider(), getForeignCalls(), getLowerer(), getReplacements(),
150148
getSuites(), getRegisters(), getSnippetReflection(), getWordTypes(), getStampProvider(), getPlatformConfigurationProvider(), getMetaAccessExtensionProvider(),
151149
getLoopsDataProvider(),
152-
config, getIdentityHashCodeProvider(), getReplayCompilationSupport());
150+
config, getReplayCompilationSupport());
153151
}
154152

155153
public void setSuites(HotSpotSuitesProvider suites) {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/CoreProviders.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,4 @@ public interface CoreProviders {
6060
CodeCacheProvider getCodeCache();
6161

6262
SnippetReflectionProvider getSnippetReflection();
63-
64-
IdentityHashCodeProvider getIdentityHashCodeProvider();
6563
}

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/CoreProvidersDelegate.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,4 @@ public WordTypes getWordTypes() {
109109
public SnippetReflectionProvider getSnippetReflection() {
110110
return providers.getSnippetReflection();
111111
}
112-
113-
@Override
114-
public IdentityHashCodeProvider getIdentityHashCodeProvider() {
115-
return providers.getIdentityHashCodeProvider();
116-
}
117112
}

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/IdentityHashCodeProvider.java‎

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

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FixReadsPhase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public RawConditionalEliminationVisitor(StructuredGraph graph, ScheduleResult sc
245245
this.debug = graph.getDebug();
246246
this.schedule = schedule;
247247
this.metaAccess = metaAccess;
248-
this.rawCanonicalizerTool = new RawCanonicalizerTool(new Providers(metaAccess, null, null, null, null, null, null, null, null, null, null, null, null, null));
248+
this.rawCanonicalizerTool = new RawCanonicalizerTool(new Providers(metaAccess, null, null, null, null, null, null, null, null, null, null, null, null));
249249
blockActionStart = new BlockMap<>(schedule.getCFG());
250250
endMaps = EconomicMap.create(Equivalence.IDENTITY);
251251
stampMap = graph.createNodeMap();

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/util/Providers.java‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
3030
import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
3131
import jdk.graal.compiler.nodes.spi.CoreProviders;
32-
import jdk.graal.compiler.nodes.spi.IdentityHashCodeProvider;
3332
import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
3433
import jdk.graal.compiler.nodes.spi.LoweringProvider;
3534
import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
@@ -58,12 +57,10 @@ public class Providers implements CoreProviders {
5857
protected final CodeCacheProvider codeCache;
5958
protected final SnippetReflectionProvider snippetReflection;
6059
protected final WordTypes wordTypes;
61-
protected final IdentityHashCodeProvider identityHashCodeProvider;
6260

6361
public Providers(MetaAccessProvider metaAccess, CodeCacheProvider codeCache, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
6462
ForeignCallsProvider foreignCalls, LoweringProvider lowerer, Replacements replacements, StampProvider stampProvider, PlatformConfigurationProvider platformConfigurationProvider,
65-
MetaAccessExtensionProvider metaAccessExtensionProvider, SnippetReflectionProvider snippetReflection, WordTypes wordTypes, LoopsDataProvider loopsDataProvider,
66-
IdentityHashCodeProvider identityHashCodeProvider) {
63+
MetaAccessExtensionProvider metaAccessExtensionProvider, SnippetReflectionProvider snippetReflection, WordTypes wordTypes, LoopsDataProvider loopsDataProvider) {
6764
this.metaAccess = metaAccess;
6865
this.constantReflection = constantReflection;
6966
this.constantFieldProvider = constantFieldProvider;
@@ -77,13 +74,12 @@ public Providers(MetaAccessProvider metaAccess, CodeCacheProvider codeCache, Con
7774
this.codeCache = codeCache;
7875
this.snippetReflection = snippetReflection;
7976
this.wordTypes = wordTypes;
80-
this.identityHashCodeProvider = identityHashCodeProvider;
8177
}
8278

8379
public Providers(Providers copyFrom) {
8480
this(copyFrom.getMetaAccess(), copyFrom.getCodeCache(), copyFrom.getConstantReflection(), copyFrom.getConstantFieldProvider(), copyFrom.getForeignCalls(), copyFrom.getLowerer(),
8581
copyFrom.getReplacements(), copyFrom.getStampProvider(), copyFrom.getPlatformConfigurationProvider(), copyFrom.getMetaAccessExtensionProvider(),
86-
copyFrom.getSnippetReflection(), copyFrom.getWordTypes(), copyFrom.getLoopsDataProvider(), copyFrom.getIdentityHashCodeProvider());
82+
copyFrom.getSnippetReflection(), copyFrom.getWordTypes(), copyFrom.getLoopsDataProvider());
8783
}
8884

8985
@Override
@@ -146,11 +142,6 @@ public SnippetReflectionProvider getSnippetReflection() {
146142
return snippetReflection;
147143
}
148144

149-
@Override
150-
public IdentityHashCodeProvider getIdentityHashCodeProvider() {
151-
return identityHashCodeProvider;
152-
}
153-
154145
@Override
155146
public WordTypes getWordTypes() {
156147
return wordTypes;
@@ -159,24 +150,24 @@ public WordTypes getWordTypes() {
159150
public Providers copyWith(ConstantReflectionProvider substitution) {
160151
assert this.getClass() == Providers.class : "must override";
161152
return new Providers(metaAccess, codeCache, substitution, constantFieldProvider, foreignCalls, lowerer, replacements, stampProvider, platformConfigurationProvider, metaAccessExtensionProvider,
162-
snippetReflection, wordTypes, loopsDataProvider, identityHashCodeProvider);
153+
snippetReflection, wordTypes, loopsDataProvider);
163154
}
164155

165156
public Providers copyWith(ConstantFieldProvider substitution) {
166157
assert this.getClass() == Providers.class : "must override";
167158
return new Providers(metaAccess, codeCache, constantReflection, substitution, foreignCalls, lowerer, replacements, stampProvider, platformConfigurationProvider, metaAccessExtensionProvider,
168-
snippetReflection, wordTypes, loopsDataProvider, identityHashCodeProvider);
159+
snippetReflection, wordTypes, loopsDataProvider);
169160
}
170161

171162
public Providers copyWith(Replacements substitution) {
172163
assert this.getClass() == Providers.class : "must override in " + getClass();
173164
return new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, substitution, stampProvider, platformConfigurationProvider,
174-
metaAccessExtensionProvider, snippetReflection, wordTypes, loopsDataProvider, identityHashCodeProvider);
165+
metaAccessExtensionProvider, snippetReflection, wordTypes, loopsDataProvider);
175166
}
176167

177168
public Providers copyWith(MetaAccessExtensionProvider substitution) {
178169
assert this.getClass() == Providers.class : getClass() + " must override";
179170
return new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, stampProvider, platformConfigurationProvider, substitution,
180-
snippetReflection, wordTypes, loopsDataProvider, identityHashCodeProvider);
171+
snippetReflection, wordTypes, loopsDataProvider);
181172
}
182173
}

0 commit comments

Comments
 (0)