Skip to content

Commit 1d44260

Browse files
committed
Remove withfield/aconst_init uses from ValueTypeTests
- Remove ACONST_INIT and WITHFIELD bytecode uses from tests - Consolidate value and reference class generator creation methods now that both use <init> and putfield - Remove wither tests. There is no equivalent behavior in the new spec. - Remove testWithFieldOnNonValueType, testWithFieldOnNull, testWithFieldOnNonExistentClass, testUnresolvedWithFieldUse Signed-off-by: Theresa Mammarella <[email protected]>
1 parent a8db7bb commit 1d44260

File tree

4 files changed

+230
-629
lines changed

4 files changed

+230
-629
lines changed

test/functional/Valhalla/src/org/openj9/test/lworld/ValhallaUtils.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ public class ValhallaUtils {
3535
/* workaround till the new ASM is released */
3636
static final int ACC_IDENTITY = 0x20;
3737

38-
/* these can be removed with qtypes tests */
39-
static final int ACONST_INIT = 203;
40-
static final int WITHFIELD = 204;
41-
4238
/* ImplicitCreation flags */
4339
static final int ACC_DEFAULT = 0x1;
4440
static final int ACC_NON_ATOMIC = 0x2;

test/functional/Valhalla/src_qtypes/org/openj9/test/lworld/DDRValueTypeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private static void createAndCheckValueType() throws Throwable {
4747
Class assortedValueWithSingleAlignmentClass = ValueTypeGenerator.generateValueClass("AssortedValueWithSingleAlignment", ValueTypeTests.typeWithSingleAlignmentFields);
4848

4949
MethodHandle makeAssortedValueWithSingleAlignment = MethodHandles.lookup().findStatic(assortedValueWithSingleAlignmentClass,
50-
"makeValueGeneric", MethodType.methodType(Object.class, Object.class,
50+
"makeObjectGeneric", MethodType.methodType(Object.class, Object.class,
5151
Object.class, Object.class, Object.class, Object.class, Object.class));
5252

5353
Object[] altFields = {

0 commit comments

Comments
 (0)