Skip to content

Commit e852b81

Browse files
committed
Formatting
1 parent 6d5adbf commit e852b81

File tree

6 files changed

+36
-23
lines changed

6 files changed

+36
-23
lines changed

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/GraalOptions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ public final class GraalOptions {
193193
// Register allocator debugging
194194
@Option(help = "Comma separated list of registers that register allocation is limited to.", type = OptionType.Debug)
195195
public static final OptionKey<String> RegisterPressure = new OptionKey<>(null);
196+
196197
@Option(help = "Permit RegisterPressure setting to cause compilation to fail.", type = OptionType.Debug)
197198
public static final OptionKey<Boolean> BailoutOnRegisterPressureFailure = new OptionKey<>(false);
198199

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/shenandoah/AArch64HotSpotShenandoahBarrierSetLIRGenerator.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,19 @@ public void emitCompareAndSwapOp(LIRGeneratorTool tool, boolean isLogic, Value a
117117

118118
@Override
119119
public Value emitAtomicReadAndWrite(LIRGeneratorTool tool, LIRKind readKind, Value address, Value newValue, BarrierType barrierType) {
120-
// We insert the necessary barriers in the node graph, at that level it
121-
// is easier to handle compressed object references. No need to do anything
122-
// special here.
120+
/*
121+
* We insert the necessary barriers in the node graph, at that level it is easier to handle
122+
* compressed object references. No need to do anything special here.
123+
*/
123124
return tool.emitAtomicReadAndWrite(readKind, address, newValue, BarrierType.NONE);
124125
}
125126

126127
@Override
127128
public Variable emitBarrieredLoad(LIRGeneratorTool tool, LIRKind kind, Value address, LIRFrameState state, MemoryOrderMode memoryOrder, BarrierType barrierType) {
128-
// We insert the necessary barriers in the node graph, at that level it
129-
// is easier to handle compressed object references. No need to do anything
130-
// special here.
129+
/*
130+
* We insert the necessary barriers in the node graph, at that level it is easier to handle
131+
* compressed object references. No need to do anything special here.
132+
*/
131133
return tool.getArithmetic().emitLoad(kind, address, state, memoryOrder, MemoryExtendKind.DEFAULT);
132134
}
133135
}

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/shenandoah/AMD64HotSpotShenandoahBarrierSetLIRGenerator.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
import jdk.graal.compiler.lir.gen.ShenandoahBarrierSetLIRGeneratorTool;
4343
import jdk.graal.compiler.nodes.gc.shenandoah.ShenandoahLoadRefBarrierNode;
4444
import jdk.vm.ci.amd64.AMD64Kind;
45+
import jdk.vm.ci.code.RegisterValue;
4546
import jdk.vm.ci.meta.AllocatableValue;
4647
import jdk.vm.ci.meta.PlatformKind;
47-
import jdk.vm.ci.code.RegisterValue;
4848
import jdk.vm.ci.meta.Value;
4949

5050
public class AMD64HotSpotShenandoahBarrierSetLIRGenerator implements ShenandoahBarrierSetLIRGeneratorTool, AMD64ReadBarrierSetLIRGenerator {
@@ -117,17 +117,19 @@ public void emitCompareAndSwapOp(LIRGeneratorTool tool, boolean isLogic, LIRKind
117117

118118
@Override
119119
public Value emitAtomicReadAndWrite(LIRGeneratorTool tool, LIRKind readKind, Value address, Value newValue, BarrierType barrierType) {
120-
// We insert the necessary barriers in the node graph, at that level it
121-
// is easier to handle compressed object references. No need to do anything
122-
// special here.
120+
/*
121+
* We insert the necessary barriers in the node graph, at that level it is easier to handle
122+
* compressed object references. No need to do anything special here.
123+
*/
123124
return tool.emitAtomicReadAndWrite(readKind, address, newValue, BarrierType.NONE);
124125
}
125126

126127
@Override
127128
public Variable emitBarrieredLoad(LIRGeneratorTool tool, LIRKind kind, Value address, LIRFrameState state, MemoryOrderMode memoryOrder, BarrierType barrierType) {
128-
// We insert the necessary barriers in the node graph, at that level it
129-
// is easier to handle compressed object references. No need to do anything
130-
// special here.
129+
/*
130+
* We insert the necessary barriers in the node graph, at that level it is easier to handle
131+
* compressed object references. No need to do anything special here.
132+
*/
131133
return tool.getArithmetic().emitLoad(kind, address, state, memoryOrder, MemoryExtendKind.DEFAULT);
132134
}
133135

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/BarrierSet.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,10 @@ default void verifyBarriers(StructuredGraph graph) {
9191
}
9292

9393
default boolean shouldAddBarriersInStage(GraphState.StageFlag stage) {
94-
// Most barrier sets should be added in mid-tier, some might also
95-
// wish to add in low-tier (e.g. Shenandoah GC).
94+
/*
95+
* Most barrier sets should be added in mid-tier, some might also wish to add in low-tier
96+
* (e.g. Shenandoah GC).
97+
*/
9698
return stage == GraphState.StageFlag.MID_TIER_BARRIER_ADDITION;
9799
}
98100
}

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1BarrierSet.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,18 @@ private void addWriteBarriers(FixedAccessNode node, ValueNode writtenValue, Valu
174174
StructuredGraph graph = node.graph();
175175
boolean init = node.getLocationIdentity().isInit();
176176
if (!init && barrierType != BarrierType.AS_NO_KEEPALIVE_WRITE) {
177-
// The pre barrier does nothing if the value being read is null, so it can
178-
// be explicitly skipped when this is an initializing store.
179-
// No keep-alive means no need for the pre-barrier.
177+
/*
178+
* The pre barrier does nothing if the value being read is null, so it can
179+
* be explicitly skipped when this is an initializing store. No keep-alive
180+
* means no need for the pre-barrier.
181+
*/
180182
addG1PreWriteBarrier(node, node.getAddress(), expectedValue, doLoad, graph);
181183
}
182184
if (writeRequiresPostBarrier(node, writtenValue)) {
183-
// Use a precise barrier for everything that might be an array write. Being
184-
// too precise with the barriers does not cause any correctness issues.
185+
/*
186+
* Use a precise barrier for everything that might be an array write. Being
187+
* too precise with the barriers does not cause any correctness issues.
188+
*/
185189
ValueNode object = null;
186190
if (barrierType == BarrierType.FIELD) {
187191
object = node.getAddress().getBase();

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/shenandoah/ShenandoahBarrierSet.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,11 @@ private void addWriteBarriers(FixedAccessNode node, ValueNode writtenValue, Valu
224224
StructuredGraph graph = node.graph();
225225
boolean init = node.getLocationIdentity().isInit();
226226
if (!init && barrierType != BarrierType.AS_NO_KEEPALIVE_WRITE && useSATBBarrier) {
227-
// The pre barrier does nothing if the value being read is null, so it can
228-
// be explicitly skipped when this is an initializing store.
229-
// No keep-alive means no need for the pre-barrier.
227+
/*
228+
* The pre barrier does nothing if the value being read is null, so it can
229+
* be explicitly skipped when this is an initializing store. No keep-alive
230+
* means no need for the pre-barrier.
231+
*/
230232
addShenandoahSATBBarrier(node, node.getAddress(), expectedValue, graph);
231233
}
232234
if (!init && useCardBarrier && !StampTool.isPointerAlwaysNull(writtenValue)) {

0 commit comments

Comments
 (0)