Skip to content

Commit 677181c

Browse files
hangshao0hangshao0
authored
Merge pull request #19812 from theresa-m/fix_18316_2
Remove remaining aconst_init, withfield, vnew refs
2 parents 9f340d0 + c00260e commit 677181c

File tree

26 files changed

+58
-527
lines changed

26 files changed

+58
-527
lines changed

‎debugtools/DDR_VM/data/superset-constants.dat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,6 @@ C|CFR_BC_vload
13851385
C|CFR_BC_vreturn
13861386
C|CFR_BC_vstore
13871387
C|CFR_BC_vunbox
1388-
C|CFR_BC_vwithfield
13891388
C|CFR_BC_wide
13901389
S|J9ClassInitFlags|J9ClassInitFlagsPointer|
13911390
C|J9ClassInitFailed

‎debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BCNames.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,6 @@ public class BCNames {
230230
public static final int JBifnonnull = 199;
231231
public static final int JBgotow = 200;
232232
public static final int JBbreakpoint = 202;
233-
public static final int JBaconst_init;
234-
public static final int JBwithfield;
235233
public static final int JBiincw;
236234
public static final int JBaload0getfield;
237235
public static final int JBnewdup;
@@ -270,8 +268,6 @@ public class BCNames {
270268
static {
271269
switch (AlgorithmVersion.getVersionOf(AlgorithmVersion.BYTECODE_VERSION).getAlgorithmVersion()) {
272270
case 0:
273-
JBaconst_init = 224;
274-
JBwithfield = 226;
275271
JBiloadw = 203;
276272
JBlloadw = 204;
277273
JBfloadw = 205;
@@ -306,8 +302,6 @@ public class BCNames {
306302
JBreturnFromJ2I = 251;
307303
break;
308304
case 1:
309-
JBaconst_init = 203;
310-
JBwithfield = 204;
311305
JBiincw = 213;
312306
JBaload0getfield = 215;
313307
JBnewdup = 216;

‎debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/PCStack.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,8 @@ public class PCStack
497497
0x25 /* JBgotow = 200 */,
498498
0x00 /* JBunimplemented = 201 */,
499499
0x71 /* JBbreakpoint = 202 */,
500-
0x03 /* JBaconst_init = 203 */,
501-
0x03 /* JBwithfield = 204 */,
500+
0x00 /* JBunimplemented = 203 */,
501+
0x00 /* JBunimplemented = 204 */,
502502
0x00 /* JBunimplemented = 205 */,
503503
0x00 /* JBunimplemented = 206 */,
504504
0x00 /* JBunimplemented = 207 */,
@@ -1017,8 +1017,8 @@ public class PCStack
10171017
0x00 /* JBgotow = 200 -- pops: 0 pushes: 0*/ ,
10181018
0x00 /* JBunimplemented = 201 -- pops: 0 pushes: 0*/ ,
10191019
0x00 /* JBbreakpoint = 202 -- pops: 0 pushes: 0*/ ,
1020-
0x50 /* JBaconst_init = 203 -- pops: 0 pushes: 1*/ ,
1021-
0x80 /* JBwithfield = 204 -- pops: 2 pushes: 1*/ ,
1020+
0x00 /* JBunimplemented = 203 -- pops: 0 pushes: 0*/ ,
1021+
0x00 /* JBunimplemented = 204 -- pops: 0 pushes: 0*/ ,
10221022
0x00 /* JBunimplemented = 205 -- pops: 0 pushes: 0*/ ,
10231023
0x00 /* JBunimplemented = 206 -- pops: 0 pushes: 0*/ ,
10241024
0x00 /* JBunimplemented = 207 -- pops: 0 pushes: 0*/ ,
@@ -1537,8 +1537,8 @@ public class PCStack
15371537
0x0 /* JBgotow (16rC8) */,
15381538
0x0 /* JBunimplemented (16rC9) */,
15391539
0x0 /* JBbreakpoint (16rCA) */,
1540-
0x0 /* JBaconst_init (16rCB) */ ,
1541-
0x0 /* JBwithfield (16rCC) */ ,
1540+
0x0 /* JBunimplemented (16rCB) */ ,
1541+
0x0 /* JBunimplemented (16rCC) */ ,
15421542
0x0 /* JBunimplemented (16rCD) */,
15431543
0x0 /* JBunimplemented (16rCE) */,
15441544
0x0 /* JBunimplemented (16rCF) */,

‎debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VrfyTbl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,8 @@ public class VrfyTbl
495495
0x0E81 /* JBgotow - 200 */,
496496
0x1700 /* JBunimplemented - 201 */,
497497
0x1700 /* JBbreakpoint - 202 */,
498-
0x1200 /* JBaconst_init = 203 */,
499-
0x1000 /* JBwithfield = 204 */,
498+
0x1700 /* JBunimplemented = 203 */,
499+
0x1700 /* JBunimplemented = 204 */,
500500
0x1700 /* JBunimplemented - 205 */,
501501
0x1700 /* JBunimplemented - 206 */,
502502
0x1700 /* JBunimplemented - 207 */,

‎debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import static com.ibm.j9ddr.vm29.j9.BCNames.JBldcw;
4444
import static com.ibm.j9ddr.vm29.j9.BCNames.JBmultianewarray;
4545
import static com.ibm.j9ddr.vm29.j9.BCNames.JBputfield;
46-
import static com.ibm.j9ddr.vm29.j9.BCNames.JBwithfield;
4746
import static com.ibm.j9ddr.vm29.j9.BCNames.JBputstatic;
4847
import static com.ibm.j9ddr.vm29.j9.BCNames.JBswap;
4948
import static com.ibm.j9ddr.vm29.j9.BCNames.JBtableswitch;
@@ -524,7 +523,7 @@ private int mapStack(U16 totalStack, byte[] map,
524523
PUSH(INT);
525524
}
526525
}
527-
} else if ((bc == JBputfield) || (bc == JBwithfield)) {
526+
} else if (bc == JBputfield) {
528527
POP();
529528
index = PARAM_16(bcIndex, 1).intValue();
530529
utf8Signature = J9ROMFieldRefPointer.cast(pool.add(index)).nameAndSignature().signature();
@@ -533,9 +532,6 @@ private int mapStack(U16 totalStack, byte[] map,
533532
if ((signature == 'D') || (signature == 'J')) {
534533
POP();
535534
}
536-
if (bc == JBwithfield) {
537-
PUSH(OBJ);
538-
}
539535
} else if (bc == JBputstatic) {
540536
index = PARAM_16(bcIndex, 1).intValue();
541537
utf8Signature = J9ROMFieldRefPointer.cast(pool.add(index)).nameAndSignature().signature();

‎debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RomClassWalker.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,6 @@ private void allSlotsInBytecodesDo(J9ROMMethodPointer method) throws CorruptData
491491
|| (bc == JBputstatic)
492492
|| (bc == JBgetfield)
493493
|| (bc == JBputfield)
494-
|| (bc == JBwithfield)
495494
|| (bc == JBinvokevirtual)
496495
|| (bc == JBinvokespecial)
497496
|| (bc == JBinvokestatic)
@@ -500,7 +499,6 @@ private void allSlotsInBytecodesDo(J9ROMMethodPointer method) throws CorruptData
500499
|| (bc == JBinvokedynamic)
501500
|| (bc == JBinvokeinterface)
502501
|| (bc == JBnew)
503-
|| (bc == JBaconst_init)
504502
|| (bc == JBnewdup)
505503
|| (bc == JBanewarray)
506504
|| (bc == JBcheckcast)

‎debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ByteCodeDumper.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import static com.ibm.j9ddr.vm29.j9.BCNames.JBfloadw;
3838
import static com.ibm.j9ddr.vm29.j9.BCNames.JBfstore;
3939
import static com.ibm.j9ddr.vm29.j9.BCNames.JBfstorew;
40-
import static com.ibm.j9ddr.vm29.j9.BCNames.JBwithfield;
4140
import static com.ibm.j9ddr.vm29.j9.BCNames.JBgetfield;
4241
import static com.ibm.j9ddr.vm29.j9.BCNames.JBgetstatic;
4342
import static com.ibm.j9ddr.vm29.j9.BCNames.JBgoto;
@@ -84,7 +83,6 @@
8483
import static com.ibm.j9ddr.vm29.j9.BCNames.JBlstore;
8584
import static com.ibm.j9ddr.vm29.j9.BCNames.JBlstorew;
8685
import static com.ibm.j9ddr.vm29.j9.BCNames.JBmultianewarray;
87-
import static com.ibm.j9ddr.vm29.j9.BCNames.JBaconst_init;
8886
import static com.ibm.j9ddr.vm29.j9.BCNames.JBnew;
8987
import static com.ibm.j9ddr.vm29.j9.BCNames.JBnewdup;
9088
import static com.ibm.j9ddr.vm29.j9.BCNames.JBnewarray;
@@ -398,7 +396,6 @@ private static IDATA j9bcutil_dumpBytecodes(PrintStream out, J9ROMClassPointer r
398396
} else if ((bcIntVal == JBgetstatic)
399397
|| (bcIntVal == JBputstatic)
400398
|| (bcIntVal == JBgetfield)
401-
|| (bcIntVal == JBwithfield)
402399
|| (bcIntVal == JBputfield)
403400
) {
404401
index = new UDATA(_GETNEXT_U16());
@@ -481,7 +478,6 @@ private static IDATA j9bcutil_dumpBytecodes(PrintStream out, J9ROMClassPointer r
481478
pc = pc.add(2);
482479
} else if ((bcIntVal == JBnew)
483480
|| (bcIntVal == JBnewdup)
484-
|| (bcIntVal == JBaconst_init)
485481
|| (bcIntVal == JBanewarray)
486482
|| (bcIntVal == JBcheckcast)
487483
|| (bcIntVal == JBinstanceof)

‎runtime/codert_vm/decomp.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -620,14 +620,10 @@ getPendingStackHeight(J9VMThread *currentThread, U_8 *interpreterPC, J9Method *r
620620
case JBmultianewarray: /* Dimensions stacked (number of dimensions is 3 bytes from the multianewarray) */
621621
pendingStackHeight -= interpreterPC[3];
622622
break;
623-
case JBwithfield:
624-
/* it will always be two slots since we only ever need to allocate qtype */
625-
pendingStackHeight -= 2;
626-
break;
627623
case JBgetfield:
628624
pendingStackHeight -= 1;
629625
break;
630-
default: /* JBnew/JBaconst_init - no stacked parameters*/
626+
default: /* JBnew - no stacked parameters*/
631627
break;
632628
}
633629
}

‎runtime/compiler/compile/J9Compilation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -734,8 +734,8 @@ J9::Compilation::canAllocateInline(TR::Node* node, TR_OpaqueClassBlock* &classIn
734734
if (clazz == NULL)
735735
return -1;
736736

737-
// Arrays of primitive value type classes must have all their elements initialized with the
738-
// default value of the component type. For now, prevent inline allocation of them.
737+
// Arrays of null-restricted (a.k.a, primitive value type) classes must have all their elements initialized
738+
// with the default value of the component type. For now, prevent inline allocation of them.
739739
//
740740
if (areValueTypesEnabled && TR::Compiler->cls.isPrimitiveValueTypeClass(reinterpret_cast<TR_OpaqueClassBlock*>(clazz)))
741741
{

‎runtime/compiler/env/J9ObjectModel.hpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,23 @@ class ObjectModel : public OMR::ObjectModelConnector
6363
bool mayRequireSpineChecks();
6464

6565
/**
66-
* @brief Whether or not value object is enabled
67-
*/
66+
* @brief Whether or not value object is enabled
67+
*/
6868
bool areValueTypesEnabled();
69+
6970
/**
70-
* @brief Whether or not flattenable value object (aka null restricted) type is enabled
71-
*/
71+
* @brief Whether or not flattenable value object (aka null restricted) type is enabled
72+
*/
7273
bool areFlattenableValueTypesEnabled();
74+
7375
/**
7476
* @brief Whether the check is enabled on monitor object being value based class type
7577
*/
7678
bool areValueBasedMonitorChecksEnabled();
79+
7780
/**
78-
* @brief Whether the array flattening is enabled for value types
79-
*/
81+
* @brief Whether the array flattening is enabled for value types
82+
*/
8083
bool isValueTypeArrayFlatteningEnabled();
8184

8285
int32_t sizeofReferenceField();

0 commit comments

Comments
 (0)