Skip to content

Commit e87d94c

Browse files
mur47x111mur47x111
committed
style fix
1 parent e018ff9 commit e87d94c

20 files changed

+49
-3
lines changed

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ExceptionHandlerReachabilityTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public byte[] generateClass(String className) {
100100
ClassDesc classSharedExceptionHandlerClass = cd(SharedExceptionHandlerClass.class);
101101
MethodTypeDesc mtdII = MethodTypeDesc.of(CD_int, CD_int);
102102

103+
// @formatter:off
103104
return ClassFile.of().build(ClassDesc.of(className), classBuilder -> classBuilder
104105
.withMethodBody("sharedExceptionHandlerMethod", mtdII, ACC_PUBLIC_STATIC, b -> {
105106
Label handlerEx1 = b.newLabel();
@@ -135,6 +136,7 @@ public byte[] generateClass(String className) {
135136
.iload(1)
136137
.ireturn();
137138
}));
139+
// @formatter:on
138140
}
139141

140142
public class SharedExceptionHandlerClass {

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphUtilOriginalValueTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ public byte[] generateClass(String className) {
129129
* }
130130
* }
131131
*/
132-
// @formatter:on
133132
return ClassFile.of().build(ClassDesc.of(className), classBuilder -> classBuilder
134133
.withMethodBody("unbalancedMonitors", MethodTypeDesc.of(CD_void, CD_Object), ACC_PUBLIC_STATIC, b -> {
135134
Label loopHead = b.newLabel();
@@ -151,6 +150,7 @@ public byte[] generateClass(String className) {
151150
.labelBinding(end)
152151
.return_();
153152
}));
153+
// @formatter:on
154154
}
155155

156156
/**

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InterfaceMethodHandleTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ public void testInvokeInterface03() throws Throwable {
146146

147147
@Override
148148
public byte[] generateClass(String className) {
149+
// @formatter:off
149150
return ClassFile.of().build(ClassDesc.of(className), classBuilder -> classBuilder
150151
.withInterfaceSymbols(cd(I.class))
151152
.withMethodBody(INIT_NAME, MTD_void, ACC_PUBLIC, b -> b
@@ -158,5 +159,6 @@ public byte[] generateClass(String className) {
158159
.withMethodBody("m2", MethodTypeDesc.of(CD_int, CD_int, CD_int, CD_int, CD_int, CD_int, CD_int, CD_int, CD_int, CD_int, CD_int), ACC_PRIVATE, b -> b
159160
.iconst_0()
160161
.ireturn()));
162+
// @formatter:on
161163
}
162164
}

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ResolveDynamicConstantTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public byte[] generateClass(String className) {
8080
ClassDesc thisClass = ClassDesc.of(className);
8181
FieldRefEntry field = ConstantPoolBuilder.of().fieldRefEntry(thisClass, "bsmInvocationCount", CD_int);
8282

83+
// @formatter:off
8384
return ClassFile.of().build(thisClass, classBuilder -> classBuilder
8485
.withField("bsmInvocationCount", CD_int, ACC_PUBLIC_STATIC)
8586
.withMethodBody("run", MethodTypeDesc.of(CD_boolean), ACC_PUBLIC_STATIC, b -> {
@@ -112,6 +113,7 @@ public byte[] generateClass(String className) {
112113
.invokestatic(thisClass, "run", MethodTypeDesc.of(CD_boolean))
113114
.invokevirtual(cd(PrintStream.class), "println", MethodTypeDesc.of(CD_void, CD_boolean))
114115
.return_()));
116+
// @formatter:on
115117
}
116118
}
117119

@@ -121,6 +123,7 @@ public byte[] generateClass(String className) {
121123
ClassDesc thisClass = ClassDesc.of(className);
122124
FieldRefEntry field = ConstantPoolBuilder.of().fieldRefEntry(thisClass, "staticBSMInvocationCount", CD_int);
123125

126+
// @formatter:off
124127
return ClassFile.of().build(thisClass, classBuilder -> classBuilder
125128
.withField("staticBSMInvocationCount", CD_int, ACC_PUBLIC_STATIC)
126129
.withMethodBody("run", MethodTypeDesc.of(CD_boolean), ACC_PUBLIC_STATIC, b -> {
@@ -159,6 +162,7 @@ public byte[] generateClass(String className) {
159162
.invokestatic(thisClass, "run", MethodTypeDesc.of(CD_boolean))
160163
.invokevirtual(cd(PrintStream.class), "println", MethodTypeDesc.of(CD_void, CD_boolean))
161164
.return_()));
165+
// @formatter:on
162166
}
163167
}
164168

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordArrayStoreTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public byte[] generateClass(String className) {
9696
ClassDesc thisClass = ClassDesc.of(className);
9797
ClassDesc targetType = kind.upperBound();
9898

99+
// @formatter:off
99100
return ClassFile.of().build(thisClass, classBuilder -> classBuilder
100101
.withField(FIELD, targetType.arrayType(), ACC_PUBLIC_STATIC)
101102
.withMethodBody("<clinit>", MTD_void, ACC_STATIC, b -> b
@@ -104,6 +105,7 @@ public byte[] generateClass(String className) {
104105
.putstatic(thisClass, FIELD, targetType.arrayType())
105106
.return_())
106107
.withMethodBody(SNIPPET, MethodTypeDesc.of(CD_boolean), ACC_PUBLIC_STATIC, b -> generateSnippet(b, thisClass)));
108+
// @formatter:on
107109
}
108110

109111
private static long arrayBaseOffset(TypeKind kind) {

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordFieldStoreTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,13 @@ public byte[] generateClass(String className) {
9797
ClassDesc thisClass = ClassDesc.of(className);
9898
ClassDesc targetType = kind.upperBound();
9999

100+
// @formatter:off
100101
return ClassFile.of().build(thisClass, classBuilder -> classBuilder
101102
.withField(FIELD, targetType, ACC_PUBLIC_STATIC)
102103
.withMethod(SNIPPET, MethodTypeDesc.of(CD_boolean), ACC_PUBLIC_STATIC, methodBuilder -> methodBuilder
103104
.with(ExceptionsAttribute.ofSymbols(CD_Exception))
104105
.withCode(b -> generateSnippet(b, thisClass))));
106+
// @formatter:on
105107
}
106108

107109
static String getUnsafePutMethodName(TypeKind kind) {

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordInputTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public byte[] generateClass(String className) {
8787
ClassDesc targetType = kind.upperBound();
8888
MethodTypeDesc getMethodTypeDesc = MethodTypeDesc.of(targetType, targetType);
8989

90+
// @formatter:off
9091
return ClassFile.of().build(thisClass, classBuilder -> classBuilder
9192
.withMethodBody(GET, getMethodTypeDesc, ACC_PUBLIC_STATIC, b -> b
9293
.iload(0)
@@ -99,5 +100,6 @@ public byte[] generateClass(String className) {
99100
.ifThenElse(Opcode.IF_ICMPEQ,
100101
thenBlock -> thenBlock.iconst_1().ireturn(),
101102
elseBlock -> elseBlock.iconst_0().ireturn())));
103+
// @formatter:on
102104
}
103105
}

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordInputTest2.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public byte[] generateClass(String className) {
8484
ClassDesc thisClass = ClassDesc.of(className);
8585
ClassDesc targetType = kind.upperBound();
8686
MethodTypeDesc getMethodTypeDesc = MethodTypeDesc.of(CD_boolean, targetType);
87-
87+
// @formatter:off
8888
return ClassFile.of().build(thisClass, classBuilder -> classBuilder
8989
.withMethodBody(GET, getMethodTypeDesc, ACC_PUBLIC_STATIC, b -> b
9090
.iload(0)
@@ -95,5 +95,6 @@ public byte[] generateClass(String className) {
9595
.iload(0)
9696
.invokestatic(thisClass, GET, getMethodTypeDesc)
9797
.ireturn()));
98+
// @formatter:on
9899
}
99100
}

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordReturnTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ public byte[] generateClass(String className) {
9999
ClassDesc targetType = kind.upperBound();
100100
MethodTypeDesc getMethodTypeDesc = MethodTypeDesc.of(targetType);
101101

102+
// @formatter:off
102103
return ClassFile.of().build(thisClass, classBuilder -> classBuilder
103104
.withField(FIELD, CD_int, ACC_PUBLIC_STATIC)
104105
.withMethodBody(GET, getMethodTypeDesc, ACC_PUBLIC_STATIC, b -> b
@@ -107,5 +108,6 @@ public byte[] generateClass(String className) {
107108
.withMethodBody(WRAPPER, MethodTypeDesc.of(CD_int), ACC_PUBLIC_STATIC, b -> b
108109
.invokestatic(thisClass, GET, getMethodTypeDesc)
109110
.ireturn()));
111+
// @formatter:on
110112
}
111113
}

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchFoldingTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,7 @@ public byte[] generateClass(String className) {
580580
*
581581
* Optimization should coalesce branches [5, 7] and [3, 6, 9]
582582
*/
583+
// @formatter:off
583584
return ClassFile.of().build(ClassDesc.of(className), classBuilder -> classBuilder
584585
.withMethodBody("m", MethodTypeDesc.of(CD_int, CD_boolean, CD_int), ACC_STATIC | ACC_PUBLIC, b -> {
585586
Label outMerge = b.newLabel();
@@ -647,6 +648,7 @@ public byte[] generateClass(String className) {
647648
.iconst_m1()
648649
.ireturn();
649650
}));
651+
// @formatter:on
650652
}
651653

652654
/**

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TwoSlotMarkerClearingTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public void testTwoSlotMarkerClearing() throws ClassNotFoundException {
5050

5151
@Override
5252
public byte[] generateClass(String className) {
53+
// @formatter:off
5354
return ClassFile.of().build(ClassDesc.of(className), classBuilder -> classBuilder
5455
.withMethodBody("t1", MethodTypeDesc.of(CD_int, CD_long, CD_int, CD_int), ACC_PUBLIC_STATIC, b -> b
5556
.iload(2)
@@ -65,5 +66,6 @@ public byte[] generateClass(String className) {
6566
.ifThenElse(Opcode.IFLT,
6667
thenBlock -> thenBlock.lload(0).lreturn(),
6768
elseBlock -> elseBlock.lload(4).lreturn())));
69+
// @formatter:on
6870
}
6971
}

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnbalancedLockingTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,12 @@ public void testIrreducibleLoop() throws ClassNotFoundException {
8888
public byte[] generateClass(String internalClassName) {
8989
ClassDesc thisClass = ClassDesc.of(internalClassName);
9090

91+
// @formatter:off
9192
return ClassFile.of().build(thisClass, classBuilder -> classBuilder
9293
.withMethodBody("test", MTD_void, ACC_PUBLIC_STATIC, UnbalancedLockingTest::createTestMethod)
9394
.withMethodBody("snippet", MethodTypeDesc.of(CD_void, CD_int, CD_Object, CD_Object), ACC_PUBLIC_STATIC, UnbalancedLockingTest::createIllegalLockingMethod)
9495
.withMethodBody("bar", MethodTypeDesc.of(CD_void, CD_int, CD_int, CD_Object, CD_Object), ACC_PUBLIC_STATIC, b -> createIrreducibleMethod(thisClass, b)));
96+
// @formatter:on
9597
}
9698

9799
/**
@@ -133,6 +135,7 @@ private static void createIrreducibleMethod(ClassDesc thisClass, CodeBuilder b)
133135
Label loopHeader1 = b.newLabel();
134136
Label loopHeader2 = b.newLabel();
135137

138+
// @formatter:off
136139
b
137140
.iload(0)
138141
.bipush(12)
@@ -175,6 +178,7 @@ private static void createIrreducibleMethod(ClassDesc thisClass, CodeBuilder b)
175178
.aload(2)
176179
.ifnonnull(irreducible))
177180
.return_();
181+
// @formatter:on
178182
}
179183

180184
/**
@@ -196,6 +200,7 @@ private static void createIrreducibleMethod(ClassDesc thisClass, CodeBuilder b)
196200
* </pre>
197201
*/
198202
private static void createIllegalLockingMethod(CodeBuilder b) {
203+
// @formatter:off
199204
b
200205
.iload(0)
201206
.ifThenElse(
@@ -213,6 +218,7 @@ private static void createIllegalLockingMethod(CodeBuilder b) {
213218
.aload(3)
214219
.monitorexit()
215220
.return_();
221+
// @formatter:on
216222
}
217223

218224
/**

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnbalancedMonitorsTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ private void checkForBailout(String name) throws ClassNotFoundException {
150150
// @formatter:on
151151
@Override
152152
public byte[] generateClass(String className) {
153+
// @formatter:off
153154
return ClassFile.of().build(ClassDesc.of(className), classBuilder -> classBuilder
154155
.withMethodBody(INIT_NAME, MTD_void, ACC_PUBLIC, b -> b
155156
.aload(0)
@@ -160,6 +161,7 @@ public byte[] generateClass(String className) {
160161
.withMethodBody("tooManyExits", MethodTypeDesc.of(CD_boolean, CD_Object, CD_Object), ACC_PUBLIC, b -> visitBlockStructured(b, true, true))
161162
.withMethodBody("tooFewExitsExceptional", MethodTypeDesc.of(CD_boolean, CD_Object, CD_Object), ACC_PUBLIC, b -> visitBlockStructured(b, false, false))
162163
.withMethodBody("tooManyExitsExceptional", MethodTypeDesc.of(CD_boolean, CD_Object, CD_Object), ACC_PUBLIC, b -> visitBlockStructured(b, false, true)));
164+
// @formatter:on
163165
}
164166

165167
private static void visitBlockStructured(CodeBuilder b, boolean normalReturnError, boolean tooMany) {
@@ -177,6 +179,7 @@ private static void visitBlockStructured(CodeBuilder b, boolean normalReturnErro
177179
Label l7 = b.newLabel();
178180
Label l8 = b.newLabel();
179181

182+
// @formatter:off
180183
b.labelBinding(l8)
181184
.aload(1)
182185
.dup()
@@ -217,6 +220,7 @@ private static void visitBlockStructured(CodeBuilder b, boolean normalReturnErro
217220
.exceptionCatchAll(l2, l3, l2)
218221
.exceptionCatchAll(l4, l5, l6)
219222
.exceptionCatchAll(l2, l7, l6);
223+
// @formatter:on
220224
}
221225

222226
private static void visitWrongOrder(CodeBuilder b) {
@@ -230,6 +234,7 @@ private static void visitWrongOrder(CodeBuilder b) {
230234
Label l7 = b.newLabel();
231235
Label l8 = b.newLabel();
232236

237+
// @formatter:off
233238
b.labelBinding(l8)
234239
.aload(1)
235240
.dup()
@@ -263,5 +268,6 @@ private static void visitWrongOrder(CodeBuilder b) {
263268
.exceptionCatchAll(l2, l3, l2)
264269
.exceptionCatchAll(l4, l5, l6)
265270
.exceptionCatchAll(l2, l7, l6);
271+
// @formatter:on
266272
}
267273
}

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/jfr/TestGetEventWriter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ public byte[] generateClass(String className) {
232232
ClassDesc thisClass = ClassDesc.of(className);
233233
ClassDesc superClass = ClassDesc.of(superClassName);
234234

235+
// @formatter:off
235236
return ClassFile.of().build(thisClass, classBuilder -> {
236237
if (isRegistered != null) {
237238
classBuilder.with(RuntimeVisibleAnnotationsAttribute.of(Annotation.of(ClassDesc.of("jdk.jfr.Registered"),
@@ -259,6 +260,7 @@ public byte[] generateClass(String className) {
259260
b.return_();
260261
});
261262
});
263+
// @formatter:on
262264
}
263265
}
264266
}

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/SafeConstructionTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ private void checkStableWriteConstructors() {
121121
@Override
122122
public byte[] generateClass(String className) {
123123
ClassDesc thisClass = ClassDesc.of(className);
124+
// @formatter:off
124125
return ClassFile.of().build(thisClass, classBuilder -> classBuilder
125126
.withField("a", CD_int, ACC_PRIVATE)
126127
.withField("b", CD_int, fieldBuilder -> fieldBuilder
@@ -144,5 +145,6 @@ public byte[] generateClass(String className) {
144145
.iload(1)
145146
.putfield(thisClass, "a", CD_int)
146147
.return_()));
148+
// @formatter:on
147149
}
148150
}

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/backend/LargeConstantSectionTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public static Collection<Object[]> data() {
8787

8888
@Override
8989
public byte[] generateClass(String className) {
90+
// @formatter:off
9091
return ClassFile.of().build(ClassDesc.of(className), classBuilder -> classBuilder
9192
.withMethodBody("run", MethodTypeDesc.of(CD_long, CD_int), ClassFile.ACC_PUBLIC | ClassFile.ACC_STATIC | ClassFile.ACC_FINAL, b -> {
9293
Label defaultLabel = b.newLabel();
@@ -108,6 +109,7 @@ public byte[] generateClass(String className) {
108109
.ldc(Long.valueOf(3L))
109110
.lreturn();
110111
}));
112+
// @formatter:on
111113
}
112114

113115
@Test

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/UntrustedInterfaces.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ private static final class PoisonLoader implements CustomizedBytecodePattern {
232232
public byte[] generateClass(String className) {
233233
ClassDesc classPill = cd(Pill.class);
234234
ClassDesc classTestInterface = cd(TestInterface.class);
235-
235+
// @formatter:off
236236
return ClassFile.of().build(ClassDesc.of(className), classBuilder -> classBuilder
237237
.withSuperclass(classPill)
238238
.withMethodBody(INIT_NAME, MTD_void, ACC_PUBLIC, b -> b
@@ -264,6 +264,7 @@ public byte[] generateClass(String className) {
264264
.dup()
265265
.invokespecial(CD_Object, INIT_NAME, MTD_void)
266266
.areturn()));
267+
// @formatter:on
267268
}
268269
}
269270
}

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DeoptimizeOnExceptionTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ public static Object getM() {
139139
public byte[] generateClass(String className) {
140140
ClassDesc outerClass = cd(DeoptimizeOnExceptionTest.class);
141141

142+
// @formatter:off
142143
return ClassFile.of().build(ClassDesc.of(className), classBuilder -> classBuilder
143144
.withVersion(JAVA_5_VERSION, 0)
144145
.withInterfaceSymbols(cd(Runnable.class))
@@ -163,6 +164,7 @@ public byte[] generateClass(String className) {
163164
elseBlock -> elseBlock.invokestatic(outerClass, "methodB", MTD_void))
164165
.with(RetInstruction.of(1));
165166
}));
167+
// @formatter:on
166168
}
167169

168170
@Test

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InvokerSignatureMismatchTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ public byte[] generateClass(String className) {
106106
ClassDesc thisClass = ClassDesc.of(className);
107107
ClassDesc methodHandleHelper = ClassDesc.of(helperClassName);
108108

109+
// @formatter:off
109110
return ClassFile.of().build(thisClass, classBuilder -> classBuilder
110111
.withField("INT_MH", CD_MethodHandle, fieldBuilder -> fieldBuilder
111112
.withFlags(ACC_FINAL | ACC_STATIC)
@@ -157,6 +158,7 @@ public byte[] generateClass(String className) {
157158
.invokestatic(thisClass, "mainInvoke", MethodTypeDesc.of(CD_int, CD_int))
158159
.pop()
159160
.return_())));
161+
// @formatter:on
160162
}
161163
}
162164
}

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeObjectReplacementsTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ private static boolean unsafeHasReferenceMethods() {
145145

146146
@Override
147147
public byte[] generateClass(String className) {
148+
// @formatter:off
148149
CodeTransform codeTransform = (codeBuilder, e) -> {
149150
switch (e) {
150151
case InvokeInstruction i when i.owner().asSymbol().equals(cd(Unsafe.class)) && i.method().name().stringValue().contains("Object") ->
@@ -160,5 +161,6 @@ public byte[] generateClass(String className) {
160161
} catch (IOException e) {
161162
return new byte[0];
162163
}
164+
// @formatter:on
163165
}
164166
}

0 commit comments

Comments
 (0)