Skip to content

Commit faa8319

Browse files
zapsterzapster
committed
Merge in master
2 parents 8295f0a + d6da064 commit faa8319

File tree

146 files changed

+6080
-1182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+6080
-1182
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -822,8 +822,8 @@ private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config
822822
}
823823

824824
// @formatter:off
825-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/79345bbbae2564f9f523859d1227a1784293b20f/src/hotspot/share/opto/library_call.cpp#L3737-L3820",
826-
sha1 = "d65356dbc0235df26aa56b233bcd100462a5dab4")
825+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/b80ca4902af71938b32634d3fd230f4d65cde454/src/hotspot/share/opto/library_call.cpp#L3734-L3817",
826+
sha1 = "f05a07a18ffae50e2a2b20586184a26e9cc8c5f2")
827827
// @formatter:on
828828
private static class ContinuationPinningPlugin extends InvocationPlugin {
829829

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotAllocationSnippets.java‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -670,12 +670,12 @@ public void lower(NewInstanceNode node, LoweringTool tool) {
670670
Arguments args = new Arguments(allocateInstance, graph.getGuardsStage(), tool.getLoweringStage());
671671
args.add("hub", hub);
672672
// instanceSize returns a negative number for types which should be slow path allocated
673-
args.addConst("size", NumUtil.safeAbs(size));
674-
args.addConst("forceSlowPath", size < 0);
675-
args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
676-
args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
677-
args.addConst("profilingData", getProfilingData(localOptions, "instance", type));
678-
args.addConst("withException", false);
673+
args.add("size", NumUtil.safeAbs(size));
674+
args.add("forceSlowPath", size < 0);
675+
args.add("fillContents", FillContent.fromBoolean(node.fillContents()));
676+
args.add("emitMemoryBarrier", node.emitMemoryBarrier());
677+
args.add("profilingData", getProfilingData(localOptions, "instance", type));
678+
args.add("withException", false);
679679

680680
SnippetTemplate template = template(tool, node, args);
681681
graph.getDebug().log("Lowering allocateInstance in %s: node=%s, template=%s, arguments=%s", graph, node, template, args);
@@ -693,12 +693,12 @@ public void lower(NewInstanceWithExceptionNode node, LoweringTool tool) {
693693
Arguments args = new Arguments(allocateInstance, graph.getGuardsStage(), tool.getLoweringStage());
694694
args.add("hub", hub);
695695
// instanceSize returns a negative number for types which should be slow path allocated
696-
args.addConst("size", NumUtil.safeAbs(size));
697-
args.addConst("forceSlowPath", size < 0);
698-
args.addConst("fillContents", FillContent.fromBoolean(true));
699-
args.addConst("emitMemoryBarrier", true /* barrier */);
700-
args.addConst("profilingData", getProfilingData(localOptions, "instance", type));
701-
args.addConst("withException", true);
696+
args.add("size", NumUtil.safeAbs(size));
697+
args.add("forceSlowPath", size < 0);
698+
args.add("fillContents", FillContent.fromBoolean(true));
699+
args.add("emitMemoryBarrier", true /* barrier */);
700+
args.add("profilingData", getProfilingData(localOptions, "instance", type));
701+
args.add("withException", true);
702702

703703
SnippetTemplate template = template(tool, node, args);
704704
graph.getDebug().log("Lowering allocateInstance in %s: node=%s, template=%s, arguments=%s", graph, node, template, args);
@@ -722,16 +722,16 @@ public void lower(NewArrayNode node, LoweringTool tool) {
722722
args.add("hub", hub);
723723
ValueNode length = node.length();
724724
args.add("length", length.isAlive() ? length : graph.addOrUniqueWithInputs(length));
725-
args.addConst("arrayBaseOffset", arrayBaseOffset);
726-
args.addConst("log2ElementSize", log2ElementSize);
727-
args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
728-
args.addConst("fillStartOffset", arrayBaseOffset);
729-
args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
730-
args.addConst("maybeUnroll", length.isConstant());
731-
args.addConst("supportsBulkZeroing", tool.getLowerer().supportsBulkZeroingOfEden());
732-
args.addConst("supportsOptimizedFilling", tool.getLowerer().supportsOptimizedFilling(localOptions));
733-
args.addConst("profilingData", getProfilingData(localOptions, "array", arrayType));
734-
args.addConst("withException", false);
725+
args.add("arrayBaseOffset", arrayBaseOffset);
726+
args.add("log2ElementSize", log2ElementSize);
727+
args.add("fillContents", FillContent.fromBoolean(node.fillContents()));
728+
args.add("fillStartOffset", arrayBaseOffset);
729+
args.add("emitMemoryBarrier", node.emitMemoryBarrier());
730+
args.add("maybeUnroll", length.isConstant());
731+
args.add("supportsBulkZeroing", tool.getLowerer().supportsBulkZeroingOfEden());
732+
args.add("supportsOptimizedFilling", tool.getLowerer().supportsOptimizedFilling(localOptions));
733+
args.add("profilingData", getProfilingData(localOptions, "array", arrayType));
734+
args.add("withException", false);
735735

736736
SnippetTemplate template = template(tool, node, args);
737737
graph.getDebug().log("Lowering allocateArray in %s: node=%s, template=%s, arguments=%s", graph, node, template, args);
@@ -752,16 +752,16 @@ public void lower(NewArrayWithExceptionNode node, LoweringTool tool) {
752752
args.add("hub", hub);
753753
ValueNode length = node.length();
754754
args.add("length", length.isAlive() ? length : graph.addOrUniqueWithInputs(length));
755-
args.addConst("arrayBaseOffset", arrayBaseOffset);
756-
args.addConst("log2ElementSize", log2ElementSize);
757-
args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
758-
args.addConst("fillStartOffset", arrayBaseOffset);
759-
args.addConst("emitMemoryBarrier", true); // node.emitMemoryBarrier());
760-
args.addConst("maybeUnroll", length.isConstant());
761-
args.addConst("supportsBulkZeroing", tool.getLowerer().supportsBulkZeroingOfEden());
762-
args.addConst("supportsOptimizedFilling", tool.getLowerer().supportsOptimizedFilling(localOptions));
763-
args.addConst("profilingData", getProfilingData(localOptions, "array", arrayType));
764-
args.addConst("withException", true);
755+
args.add("arrayBaseOffset", arrayBaseOffset);
756+
args.add("log2ElementSize", log2ElementSize);
757+
args.add("fillContents", FillContent.fromBoolean(node.fillContents()));
758+
args.add("fillStartOffset", arrayBaseOffset);
759+
args.add("emitMemoryBarrier", true); // node.emitMemoryBarrier());
760+
args.add("maybeUnroll", length.isConstant());
761+
args.add("supportsBulkZeroing", tool.getLowerer().supportsBulkZeroingOfEden());
762+
args.add("supportsOptimizedFilling", tool.getLowerer().supportsOptimizedFilling(localOptions));
763+
args.add("profilingData", getProfilingData(localOptions, "array", arrayType));
764+
args.add("withException", true);
765765

766766
SnippetTemplate template = template(tool, node, args);
767767
graph.getDebug().log("Lowering allocateArray in %s: node=%s, template=%s, arguments=%s", graph, node, template, args);
@@ -780,8 +780,8 @@ public void lower(NewMultiArrayNode node, LoweringTool tool) {
780780

781781
Arguments args = new Arguments(newmultiarray, graph.getGuardsStage(), tool.getLoweringStage());
782782
args.add("hub", hub);
783-
args.addConst("rank", rank);
784-
args.addConst("withException", false);
783+
args.add("rank", rank);
784+
args.add("withException", false);
785785
args.addVarargs("dimensions", int.class, StampFactory.forKind(JavaKind.Int), dims);
786786

787787
template(tool, node, args).instantiate(tool.getMetaAccess(), node, DEFAULT_REPLACER, args);
@@ -799,8 +799,8 @@ public void lower(NewMultiArrayWithExceptionNode node, LoweringTool tool) {
799799

800800
Arguments args = new Arguments(newmultiarray, graph.getGuardsStage(), tool.getLoweringStage());
801801
args.add("hub", hub);
802-
args.addConst("rank", rank);
803-
args.addConst("withException", true);
802+
args.add("rank", rank);
803+
args.add("withException", true);
804804
args.addVarargs("dimensions", int.class, StampFactory.forKind(JavaKind.Int), dims);
805805

806806
template(tool, node, args).instantiate(tool.getMetaAccess(), node, DEFAULT_REPLACER, args);
@@ -811,10 +811,10 @@ public void lower(DynamicNewInstanceNode node, LoweringTool tool) {
811811

812812
Arguments args = new Arguments(allocateInstanceDynamic, node.graph().getGuardsStage(), tool.getLoweringStage());
813813
args.add("type", node.getInstanceType());
814-
args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
815-
args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
816-
args.addConst("profilingData", getProfilingData(localOptions, "", null));
817-
args.addConst("withException", false);
814+
args.add("fillContents", FillContent.fromBoolean(node.fillContents()));
815+
args.add("emitMemoryBarrier", node.emitMemoryBarrier());
816+
args.add("profilingData", getProfilingData(localOptions, "", null));
817+
args.add("withException", false);
818818

819819
template(tool, node, args).instantiate(tool.getMetaAccess(), node, DEFAULT_REPLACER, args);
820820
}
@@ -824,10 +824,10 @@ public void lower(DynamicNewInstanceWithExceptionNode node, LoweringTool tool) {
824824

825825
Arguments args = new Arguments(allocateInstanceDynamic, node.graph().getGuardsStage(), tool.getLoweringStage());
826826
args.add("type", node.getInstanceType());
827-
args.addConst("fillContents", FillContent.fromBoolean(true));
828-
args.addConst("emitMemoryBarrier", true/* barriers */);
829-
args.addConst("profilingData", getProfilingData(localOptions, "", null));
830-
args.addConst("withException", true);
827+
args.add("fillContents", FillContent.fromBoolean(true));
828+
args.add("emitMemoryBarrier", true/* barriers */);
829+
args.add("profilingData", getProfilingData(localOptions, "", null));
830+
args.add("withException", true);
831831

832832
template(tool, node, args).instantiate(tool.getMetaAccess(), node, DEFAULT_REPLACER, args);
833833
}
@@ -852,22 +852,22 @@ public void lower(DynamicNewArrayNode node, LoweringTool tool) {
852852
args.add("elementType", node.getElementType());
853853
args.add("voidClass", voidClass);
854854
args.add("length", length.isAlive() ? length : graph.addOrUniqueWithInputs(length));
855-
args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
856-
args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
855+
args.add("fillContents", FillContent.fromBoolean(node.fillContents()));
856+
args.add("emitMemoryBarrier", node.emitMemoryBarrier());
857857
/*
858858
* We use Kind.Illegal as a marker value instead of null because constant snippet
859859
* parameters cannot be null.
860860
*/
861-
args.addConst("knownElementKind", node.getKnownElementKind() == null ? JavaKind.Illegal : node.getKnownElementKind());
861+
args.add("knownElementKind", node.getKnownElementKind() == null ? JavaKind.Illegal : node.getKnownElementKind());
862862
if (node.getKnownElementKind() != null) {
863-
args.addConst("knownLayoutHelper", lookupArrayClass(tool, node.getKnownElementKind()).layoutHelper());
863+
args.add("knownLayoutHelper", lookupArrayClass(tool, node.getKnownElementKind()).layoutHelper());
864864
} else {
865-
args.addConst("knownLayoutHelper", 0);
865+
args.add("knownLayoutHelper", 0);
866866
}
867-
args.addConst("supportsBulkZeroing", tool.getLowerer().supportsBulkZeroingOfEden());
868-
args.addConst("supportsOptimizedFilling", tool.getLowerer().supportsOptimizedFilling(localOptions));
869-
args.addConst("withException", false);
870-
args.addConst("profilingData", getProfilingData(localOptions, "dynamic type", null));
867+
args.add("supportsBulkZeroing", tool.getLowerer().supportsBulkZeroingOfEden());
868+
args.add("supportsOptimizedFilling", tool.getLowerer().supportsOptimizedFilling(localOptions));
869+
args.add("withException", false);
870+
args.add("profilingData", getProfilingData(localOptions, "dynamic type", null));
871871

872872
template(tool, node, args).instantiate(tool.getMetaAccess(), node, DEFAULT_REPLACER, args);
873873
}
@@ -883,19 +883,19 @@ public void lower(DynamicNewArrayWithExceptionNode node, LoweringTool tool) {
883883
args.add("elementType", node.getElementType());
884884
args.add("voidClass", voidClass);
885885
args.add("length", length.isAlive() ? length : graph.addOrUniqueWithInputs(length));
886-
args.addConst("fillContents", FillContent.fromBoolean(true));
887-
args.addConst("emitMemoryBarrier", true/* barriers */);
886+
args.add("fillContents", FillContent.fromBoolean(true));
887+
args.add("emitMemoryBarrier", true/* barriers */);
888888
/*
889889
* We use Kind.Illegal as a marker value instead of null because constant snippet
890890
* parameters cannot be null.
891891
*/
892-
args.addConst("knownElementKind", JavaKind.Illegal);
893-
args.addConst("knownLayoutHelper", 0);
892+
args.add("knownElementKind", JavaKind.Illegal);
893+
args.add("knownLayoutHelper", 0);
894894

895-
args.addConst("supportsBulkZeroing", tool.getLowerer().supportsBulkZeroingOfEden());
896-
args.addConst("supportsOptimizedFilling", tool.getLowerer().supportsOptimizedFilling(localOptions));
897-
args.addConst("withException", true);
898-
args.addConst("profilingData", getProfilingData(localOptions, "dynamic type", null));
895+
args.add("supportsBulkZeroing", tool.getLowerer().supportsBulkZeroingOfEden());
896+
args.add("supportsOptimizedFilling", tool.getLowerer().supportsOptimizedFilling(localOptions));
897+
args.add("withException", true);
898+
args.add("profilingData", getProfilingData(localOptions, "dynamic type", null));
899899

900900
template(tool, node, args).instantiate(tool.getMetaAccess(), node, DEFAULT_REPLACER, args);
901901
}

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import jdk.graal.compiler.word.Word;
4848

4949
// @formatter:off
50-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/79345bbbae2564f9f523859d1227a1784293b20f/src/hotspot/share/opto/library_call.cpp#L4656-L4790",
50+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/d52d13648612546ef4458579aff6daf965586a03/src/hotspot/share/opto/library_call.cpp#L4653-L4787",
5151
sha1 = "c212d1dbff26d02d4d749e085263d4104895f1ba")
5252
// @formatter:on
5353
public class HotSpotHashCodeSnippets extends IdentityHashCodeSnippets {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/InstanceOfSnippets.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -305,22 +305,22 @@ protected Arguments makeArguments(InstanceOfUsageReplacer replacer, LoweringTool
305305
args = new Arguments(instanceofPrimary, graph.getGuardsStage(), tool.getLoweringStage());
306306
args.add("hub", hub);
307307
args.add("object", object);
308-
args.addConst("superCheckOffset", type.superCheckOffset());
308+
args.add("superCheckOffset", type.superCheckOffset());
309309
} else {
310310
Hints hints = createHints(hintInfo, tool.getMetaAccess(), false, graph);
311311
args = new Arguments(instanceofSecondary, graph.getGuardsStage(), tool.getLoweringStage());
312312
args.add("hub", hub);
313313
args.add("object", object);
314314
args.addVarargs("hints", KlassPointer.class, KlassPointerStamp.klassNonNull(), hints.hubs);
315315
args.addVarargs("hintIsPositive", boolean.class, StampFactory.forKind(JavaKind.Boolean), hints.isPositive);
316-
args.addConst("isHubAbstract", !type.isArray() && (type.isAbstract() || type.isInterface()));
316+
args.add("isHubAbstract", !type.isArray() && (type.isAbstract() || type.isInterface()));
317317
}
318318
args.add("trueValue", replacer.trueValue);
319319
args.add("falseValue", replacer.falseValue);
320320
if (hintInfo.hintHitProbability >= 1.0 && hintInfo.exact == null) {
321-
args.addConst("nullSeen", hintInfo.profile.getNullSeen() != TriState.FALSE);
321+
args.add("nullSeen", hintInfo.profile.getNullSeen() != TriState.FALSE);
322322
}
323-
args.addConst("counters", counters);
323+
args.add("counters", counters);
324324
return args;
325325
} else if (replacer.instanceOf instanceof InstanceOfDynamicNode) {
326326
InstanceOfDynamicNode instanceOf = (InstanceOfDynamicNode) replacer.instanceOf;
@@ -331,9 +331,9 @@ protected Arguments makeArguments(InstanceOfUsageReplacer replacer, LoweringTool
331331
args.add("object", object);
332332
args.add("trueValue", replacer.trueValue);
333333
args.add("falseValue", replacer.falseValue);
334-
args.addConst("allowNull", instanceOf.allowsNull());
335-
args.addConst("exact", instanceOf.isExact());
336-
args.addConst("counters", counters);
334+
args.add("allowNull", instanceOf.allowsNull());
335+
args.add("exact", instanceOf.isExact());
336+
args.add("counters", counters);
337337
return args;
338338
} else if (replacer.instanceOf instanceof ClassIsAssignableFromNode) {
339339
ClassIsAssignableFromNode isAssignable = (ClassIsAssignableFromNode) replacer.instanceOf;
@@ -344,7 +344,7 @@ protected Arguments makeArguments(InstanceOfUsageReplacer replacer, LoweringTool
344344
args.add("otherClassNonNull", isAssignable.getOtherClass());
345345
args.add("trueValue", replacer.trueValue);
346346
args.add("falseValue", replacer.falseValue);
347-
args.addConst("counters", counters);
347+
args.add("counters", counters);
348348
return args;
349349
} else {
350350
throw GraalError.shouldNotReachHereUnexpectedValue(replacer); // ExcludeFromJacocoGeneratedReport

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import static jdk.graal.compiler.nodes.PiNode.piCastToSnippetReplaceeStamp;
3636
import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
3737

38+
import org.graalvm.word.WordFactory;
39+
3840
import jdk.graal.compiler.api.replacements.Snippet;
3941
import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
4042
import jdk.graal.compiler.core.common.type.Stamp;
@@ -52,8 +54,6 @@
5254
import jdk.graal.compiler.replacements.Snippets;
5355
import jdk.graal.compiler.replacements.nodes.ReadRegisterNode;
5456
import jdk.graal.compiler.word.Word;
55-
import org.graalvm.word.WordFactory;
56-
5757
import jdk.vm.ci.code.BytecodeFrame;
5858
import jdk.vm.ci.code.Register;
5959
import jdk.vm.ci.meta.ResolvedJavaType;
@@ -108,7 +108,7 @@ public void lower(LoadExceptionObjectNode loadExceptionObject, HotSpotRegistersP
108108
graph.replaceFixedWithFixed(loadExceptionObject, loadExceptionC);
109109
} else {
110110
Arguments args = new Arguments(loadException, loadExceptionObject.graph().getGuardsStage(), tool.getLoweringStage());
111-
args.addConst("threadRegister", registers.getThreadRegister());
111+
args.add("threadRegister", registers.getThreadRegister());
112112
template(tool, loadExceptionObject, args).instantiate(tool.getMetaAccess(), loadExceptionObject, DEFAULT_REPLACER, args);
113113
}
114114
}

0 commit comments

Comments
 (0)