* src/vm/jit/verify/icmds.c: Added comments.

* src/vm/jit/verify/typecheck-stackbased-gen.inc,
src/vm/jit/verify/typecheck-variablesbased-gen.inc: Regenerated.

diff --git a/src/vm/jit/verify/icmds.c b/src/vm/jit/verify/icmds.c
index 798f0cd86dabb38c03191019545c8a0c4e6d51e5..6a67a0a71683719a00e6673b1a18c50544b97e73 100644 (file)
--- a/src/vm/jit/verify/icmds.c
+++ b/src/vm/jit/verify/icmds.c
@@ -32,6 +32,44 @@
 
 */
 
+#if 0 /* (needed for code examples in the following comment) */
+/******************************************************************************/
+/* This file contains ICMD-specific code for type checking and type
+ * inference. It is an input file for the verifier generator
+ * (src/vm/jit/verify/generate.pl). The verifier generator creates
+ * code for two compiler passes:
+ *     - stack-based type-infering verification
+ *     - vasiables-based type-infering verification
+ *
+ * The rest of this file must consist of "case" clauses starting in
+ * the first column. Each clause can be marked with tags like this:
+ *
+ */          case ICMD_CONSTANT: /* {TAG, TAG, ...} */
+/*
+ * This must be on one line. The following tags are defined:
+ *     STACKBASED..........use this clause for the stack-based verifier
+ *     VARIABLESBASED......use this clause for the variables-based verifier
+ *
+ * If no tag is specified, {STACKBASED,VARIABLESBASED} is assumed.
+ *
+ * There are also tags that can be used inside a clause like this:
+ *
+ */          /* {TAG} */
+/*
+ * The following tags are defined within clauses:
+ *     RESULTNOW...........generate code for modelling the stack action
+ *                         _before_ the user-defined code in the clause
+ *                         (Default is to model the stack action afterwards.)
+ *
+ * The following macros are pre-defined:
+ *
+ *     TYPECHECK_STACKBASED.......iff compiling the stack-based verifier
+ *     TYPECHECK_VARIABLESBASED...iff compiling the variables-based verifier
+ *
+/******************************************************************************/
+#endif /* (end #if 0) */
+
+
 /* this marker is needed by generate.pl: */
 /* {START_OF_CODE} */
 
@@ -664,7 +702,7 @@ case ICMD_POP2: /* {STACKBASED} */
                CHECK_CAT1(stack[-1]);
        break;
 
-case ICMD_SWAP:
+case ICMD_SWAP: /* {STACKBASED} */
        CHECK_CAT1(stack[0]);
        CHECK_CAT1(stack[-1]);
 
@@ -673,14 +711,14 @@ case ICMD_SWAP:
        COPY_SLOT(temp     , stack[-1]);
        break;
 
-case ICMD_DUP:
+case ICMD_DUP: /* {STACKBASED} */
        /* we dup 1 */
        CHECK_CAT1(stack[0]);
 
        COPY_SLOT(stack[ 0], stack[ 1]);
        break;
 
-case ICMD_DUP_X1:
+case ICMD_DUP_X1: /* {STACKBASED} */
        /* we dup 1 */
        CHECK_CAT1(stack[0]);
        /* we skip 1 */
@@ -691,7 +729,7 @@ case ICMD_DUP_X1:
        COPY_SLOT(stack[ 1], stack[-1]);
        break;
 
-case ICMD_DUP_X2:
+case ICMD_DUP_X2: /* {STACKBASED} */
        /* we dup 1 */
        CHECK_CAT1(stack[0]);
        /* we skip either 11 or 2 */
@@ -704,7 +742,7 @@ case ICMD_DUP_X2:
        COPY_SLOT(stack[ 1], stack[-2]);
        break;
 
-case ICMD_DUP2:
+case ICMD_DUP2: /* {STACKBASED} */
        /* we dup either 11 or 2 */
        if (IS_CAT1(stack[0]))
                CHECK_CAT1(stack[-1]);
@@ -713,7 +751,7 @@ case ICMD_DUP2:
        COPY_SLOT(stack[-1], stack[ 1]);
        break;
 
-case ICMD_DUP2_X1:
+case ICMD_DUP2_X1: /* {STACKBASED} */
        /* we dup either 11 or 2 */
        if (IS_CAT1(stack[0]))
                CHECK_CAT1(stack[-1]);
@@ -727,7 +765,7 @@ case ICMD_DUP2_X1:
        COPY_SLOT(stack[ 1], stack[-2]);
        break;
 
-case ICMD_DUP2_X2:
+case ICMD_DUP2_X2: /* {STACKBASED} */
        /* we dup either 11 or 2 */
        if (IS_CAT1(stack[0]))
                CHECK_CAT1(stack[-1]);

diff --git a/src/vm/jit/verify/typecheck-stackbased-gen.inc b/src/vm/jit/verify/typecheck-stackbased-gen.inc
index c1ceb426645de943b40dd25cb624ba7aa56cd637..0ab00c413850e72f8ea21b4c723ba191b758d4e5 100644 (file)
--- a/src/vm/jit/verify/typecheck-stackbased-gen.inc
+++ b/src/vm/jit/verify/typecheck-stackbased-gen.inc
@@ -14,7 +14,7 @@
   GENERATED    /* may use stack[1] ... stack[1] */
   GENERATED  
   GENERATED  
-#              line 309 "src/vm/jit/verify/icmds.c"
+#              line 347 "src/vm/jit/verify/icmds.c"
   GENERATED    if (IPTR->flags.bits & INS_FLAG_CLASS) {
   GENERATED            /* a java.lang.Class reference */
   GENERATED            TYPEINFO_INIT_JAVA_LANG_CLASS(DST->typeinfo,IPTR->sx.val.c);
@@ -129,7 +129,7 @@
   GENERATED    /* may use stack[1] ... stack[1] */
   GENERATED  
   GENERATED  
-#              line 57 "src/vm/jit/verify/icmds.c"
+#              line 95 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_aload);
   GENERATED  
   GENERATED    /* loading a returnAddress is not allowed */
@@ -165,7 +165,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 220 "src/vm/jit/verify/icmds.c"
+#              line 258 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_INT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -198,7 +198,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 230 "src/vm/jit/verify/icmds.c"
+#              line 268 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_LONG))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -231,7 +231,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 215 "src/vm/jit/verify/icmds.c"
+#              line 253 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_FLOAT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -264,7 +264,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 210 "src/vm/jit/verify/icmds.c"
+#              line 248 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_DOUBLE))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -297,7 +297,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 77 "src/vm/jit/verify/icmds.c"
+#              line 115 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_ARRAY_OF_REFS(OP1->typeinfo))
   GENERATED            VERIFY_ERROR("illegal instruction: AALOAD on non-reference array");
   GENERATED  
@@ -332,7 +332,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 199 "src/vm/jit/verify/icmds.c"
+#              line 237 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_BOOLEAN)
   GENERATED                    && !TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_BYTE))
   GENERATED            VERIFY_ERROR("Array type mismatch");
@@ -366,7 +366,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 205 "src/vm/jit/verify/icmds.c"
+#              line 243 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_CHAR))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -399,7 +399,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 225 "src/vm/jit/verify/icmds.c"
+#              line 263 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_SHORT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -464,7 +464,7 @@
   GENERATED    /* may use stack[0] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 70 "src/vm/jit/verify/icmds.c"
+#              line 108 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPEINFO_COPY(OP1->typeinfo, DST->typeinfo);
   GENERATED  
 #              line 471 "src/vm/jit/verify/typecheck-stackbased-gen.inc"
@@ -494,7 +494,7 @@
   GENERATED    /* may use stack[-2] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 256 "src/vm/jit/verify/icmds.c"
+#              line 294 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_INT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -527,7 +527,7 @@
   GENERATED    /* may use stack[-3] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 266 "src/vm/jit/verify/icmds.c"
+#              line 304 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_LONG))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -560,7 +560,7 @@
   GENERATED    /* may use stack[-2] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 251 "src/vm/jit/verify/icmds.c"
+#              line 289 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_FLOAT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -593,7 +593,7 @@
   GENERATED    /* may use stack[-3] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 246 "src/vm/jit/verify/icmds.c"
+#              line 284 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_DOUBLE))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -626,7 +626,7 @@
   GENERATED    /* may use stack[-2] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 271 "src/vm/jit/verify/icmds.c"
+#              line 309 "src/vm/jit/verify/icmds.c"
   GENERATED    /* we just check the basic input types and that the           */
   GENERATED    /* destination is an array of references. Assignability to    */
   GENERATED    /* the actual array must be checked at runtime, each time the */
@@ -663,7 +663,7 @@
   GENERATED    /* may use stack[-2] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 235 "src/vm/jit/verify/icmds.c"
+#              line 273 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_BOOLEAN)
   GENERATED                    && !TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_BYTE))
   GENERATED            VERIFY_ERROR("Array type mismatch");
@@ -697,7 +697,7 @@
   GENERATED    /* may use stack[-2] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 241 "src/vm/jit/verify/icmds.c"
+#              line 279 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_CHAR))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -730,7 +730,7 @@
   GENERATED    /* may use stack[-2] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 261 "src/vm/jit/verify/icmds.c"
+#              line 299 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_SHORT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -753,7 +753,7 @@
   GENERATED    /* may use stack[0] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 657 "src/vm/jit/verify/icmds.c"
+#              line 695 "src/vm/jit/verify/icmds.c"
   GENERATED    /* we pop 1 */
   GENERATED    CHECK_CAT1(stack[0]);
   GENERATED  
@@ -769,7 +769,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 662 "src/vm/jit/verify/icmds.c"
+#              line 700 "src/vm/jit/verify/icmds.c"
   GENERATED    /* we pop either 11 or 2 */
   GENERATED    if (IS_CAT1(stack[0]))
   GENERATED            CHECK_CAT1(stack[-1]);
@@ -789,7 +789,7 @@
   GENERATED    /* may use stack[0] ... stack[1] */
   GENERATED  
   GENERATED  
-#              line 677 "src/vm/jit/verify/icmds.c"
+#              line 715 "src/vm/jit/verify/icmds.c"
   GENERATED    /* we dup 1 */
   GENERATED    CHECK_CAT1(stack[0]);
   GENERATED  
@@ -813,7 +813,7 @@
   GENERATED    /* may use stack[-1] ... stack[1] */
   GENERATED  
   GENERATED  
-#              line 684 "src/vm/jit/verify/icmds.c"
+#              line 722 "src/vm/jit/verify/icmds.c"
   GENERATED    /* we dup 1 */
   GENERATED    CHECK_CAT1(stack[0]);
   GENERATED    /* we skip 1 */
@@ -839,7 +839,7 @@
   GENERATED    /* may use stack[-2] ... stack[1] */
   GENERATED  
   GENERATED  
-#              line 695 "src/vm/jit/verify/icmds.c"
+#              line 733 "src/vm/jit/verify/icmds.c"
   GENERATED    /* we dup 1 */
   GENERATED    CHECK_CAT1(stack[0]);
   GENERATED    /* we skip either 11 or 2 */
@@ -864,7 +864,7 @@
   GENERATED    /* may use stack[-1] ... stack[2] */
   GENERATED  
   GENERATED  
-#              line 708 "src/vm/jit/verify/icmds.c"
+#              line 746 "src/vm/jit/verify/icmds.c"
   GENERATED    /* we dup either 11 or 2 */
   GENERATED    if (IS_CAT1(stack[0]))
   GENERATED            CHECK_CAT1(stack[-1]);
@@ -885,7 +885,7 @@
   GENERATED    /* may use stack[-2] ... stack[2] */
   GENERATED  
   GENERATED  
-#              line 717 "src/vm/jit/verify/icmds.c"
+#              line 755 "src/vm/jit/verify/icmds.c"
   GENERATED    /* we dup either 11 or 2 */
   GENERATED    if (IS_CAT1(stack[0]))
   GENERATED            CHECK_CAT1(stack[-1]);
@@ -911,7 +911,7 @@
   GENERATED    /* may use stack[-3] ... stack[2] */
   GENERATED  
   GENERATED  
-#              line 731 "src/vm/jit/verify/icmds.c"
+#              line 769 "src/vm/jit/verify/icmds.c"
   GENERATED    /* we dup either 11 or 2 */
   GENERATED    if (IS_CAT1(stack[0]))
   GENERATED            CHECK_CAT1(stack[-1]);
@@ -940,7 +940,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 668 "src/vm/jit/verify/icmds.c"
+#              line 706 "src/vm/jit/verify/icmds.c"
   GENERATED    CHECK_CAT1(stack[0]);
   GENERATED    CHECK_CAT1(stack[-1]);
   GENERATED  
@@ -1245,7 +1245,7 @@
   GENERATED    /* may use stack[1] ... stack[1] */
   GENERATED  
   GENERATED  
-#              line 348 "src/vm/jit/verify/icmds.c"
+#              line 386 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    TYPECHECK_COUNT(stat_ins_branch);
   GENERATED  
@@ -1279,7 +1279,7 @@
   GENERATED    /* may use stack[1] ... stack[2] */
   GENERATED  
   GENERATED  
-#              line 354 "src/vm/jit/verify/icmds.c"
+#              line 392 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    TYPECHECK_COUNT(stat_ins_branch);
   GENERATED  
@@ -1311,7 +1311,7 @@
   GENERATED    /* may use stack[1] ... stack[2] */
   GENERATED  
   GENERATED  
-#              line 360 "src/vm/jit/verify/icmds.c"
+#              line 398 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    TYPECHECK_COUNT(stat_ins_branch);
   GENERATED  
@@ -1333,7 +1333,7 @@
   GENERATED    superblockend = true;
   GENERATED  
   GENERATED  
-#              line 345 "src/vm/jit/verify/icmds.c"
+#              line 383 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    TYPECHECK_COUNT(stat_ins_branch);
   GENERATED  
@@ -1358,7 +1358,7 @@
   GENERATED    /* may use stack[0] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 541 "src/vm/jit/verify/icmds.c"
+#              line 579 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    tbptr = BLOCK_OF(IPTR->sx.s23.s3.jsrtarget.insindex);
   GENERATED  
@@ -1382,7 +1382,7 @@
   GENERATED    superblockend = true;
   GENERATED  
   GENERATED  
-#              line 560 "src/vm/jit/verify/icmds.c"
+#              line 598 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    CHECK_LOCAL_TYPE(IPTR->s1.varindex, TYPE_RET);
   GENERATED    if (!TYPEINFO_IS_PRIMITIVE(STATE->locals[IPTR->s1.varindex].typeinfo))
@@ -1408,7 +1408,7 @@
   GENERATED    /* may use stack[1] ... stack[1] */
   GENERATED  
   GENERATED  
-#              line 412 "src/vm/jit/verify/icmds.c"
+#              line 450 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    TYPECHECK_COUNT(stat_ins_switch);
   GENERATED  
@@ -1443,7 +1443,7 @@
   GENERATED    /* may use stack[1] ... stack[1] */
   GENERATED  
   GENERATED  
-#              line 428 "src/vm/jit/verify/icmds.c"
+#              line 466 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    TYPECHECK_COUNT(stat_ins_switch);
   GENERATED  
@@ -1476,7 +1476,7 @@
   GENERATED    /* may use stack[0] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 494 "src/vm/jit/verify/icmds.c"
+#              line 532 "src/vm/jit/verify/icmds.c"
   GENERATED    if (STATE->returntype.type != TYPE_INT)
   GENERATED            VERIFY_ERROR("Return type mismatch");
   GENERATED  
@@ -1498,7 +1498,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 499 "src/vm/jit/verify/icmds.c"
+#              line 537 "src/vm/jit/verify/icmds.c"
   GENERATED    if (STATE->returntype.type != TYPE_LNG)
   GENERATED            VERIFY_ERROR("Return type mismatch");
   GENERATED  
@@ -1520,7 +1520,7 @@
   GENERATED    /* may use stack[0] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 504 "src/vm/jit/verify/icmds.c"
+#              line 542 "src/vm/jit/verify/icmds.c"
   GENERATED    if (STATE->returntype.type != TYPE_FLT)
   GENERATED            VERIFY_ERROR("Return type mismatch");
   GENERATED  
@@ -1542,7 +1542,7 @@
   GENERATED    /* may use stack[-1] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 509 "src/vm/jit/verify/icmds.c"
+#              line 547 "src/vm/jit/verify/icmds.c"
   GENERATED    if (STATE->returntype.type != TYPE_DBL)
   GENERATED            VERIFY_ERROR("Return type mismatch");
   GENERATED  
@@ -1565,7 +1565,7 @@
   GENERATED    /* may use stack[0] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 469 "src/vm/jit/verify/icmds.c"
+#              line 507 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_areturn);
   GENERATED    if (!TYPEINFO_IS_REFERENCE(OP1->typeinfo))
   GENERATED            VERIFY_ERROR("illegal instruction: ARETURN on non-reference");
@@ -1599,7 +1599,7 @@
   GENERATED    superblockend = true;
   GENERATED  
   GENERATED  
-#              line 514 "src/vm/jit/verify/icmds.c"
+#              line 552 "src/vm/jit/verify/icmds.c"
   GENERATED    if (STATE->returntype.type != TYPE_VOID)
   GENERATED            VERIFY_ERROR("Return type mismatch");
   GENERATED  
@@ -1631,7 +1631,7 @@
   GENERATED    /* variable number of outslots! */
   GENERATED  
   GENERATED  
-#              line 118 "src/vm/jit/verify/icmds.c"
+#              line 156 "src/vm/jit/verify/icmds.c"
   GENERATED    stack = typecheck_stackbased_verify_fieldaccess(STATE, NULL, NULL, stack);
   GENERATED    if (stack == NULL)
   GENERATED            EXCEPTION;
@@ -1647,7 +1647,7 @@
   GENERATED    /* variable number of inslots! */
   GENERATED  
   GENERATED  
-#              line 100 "src/vm/jit/verify/icmds.c"
+#              line 138 "src/vm/jit/verify/icmds.c"
   GENERATED    CHECK_STACK_DEPTH(1);
   GENERATED    if (!IS_CAT1(stack[0])) {
   GENERATED            /* (stack depth >= 2 is guaranteed) */
@@ -1669,7 +1669,7 @@
   GENERATED    /* variable number of outslots! */
   GENERATED  
   GENERATED  
-#              line 111 "src/vm/jit/verify/icmds.c"
+#              line 149 "src/vm/jit/verify/icmds.c"
   GENERATED    CHECK_STACK_TYPE(stack[0], TYPE_ADR);
   GENERATED    stack = typecheck_stackbased_verify_fieldaccess(STATE, stack, NULL, stack-1);
   GENERATED    if (stack == NULL)
@@ -1686,7 +1686,7 @@
   GENERATED    /* variable number of inslots! */
   GENERATED  
   GENERATED  
-#              line 88 "src/vm/jit/verify/icmds.c"
+#              line 126 "src/vm/jit/verify/icmds.c"
   GENERATED    CHECK_STACK_DEPTH(2);
   GENERATED    if (!IS_CAT1(stack[0])) {
   GENERATED            CHECK_STACK_DEPTH(3);
@@ -1712,7 +1712,7 @@
   GENERATED    /* variable number of outslots! */
   GENERATED  
   GENERATED  
-#              line 583 "src/vm/jit/verify/icmds.c"
+#              line 621 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_invoke);
   GENERATED  
   GENERATED    INSTRUCTION_GET_METHODDESC(IPTR, md);
@@ -1755,7 +1755,7 @@
   GENERATED    /* may use stack[0] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 193 "src/vm/jit/verify/icmds.c"
+#              line 231 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_ARRAY(OP1->typeinfo)
   GENERATED                    && OP1->typeinfo.typeclass.cls != pseudo_class_Arraystub)
   GENERATED            VERIFY_ERROR("illegal instruction: ARRAYLENGTH on non-array");
@@ -1782,7 +1782,7 @@
   GENERATED    /* may use stack[0] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 448 "src/vm/jit/verify/icmds.c"
+#              line 486 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_athrow);
   GENERATED    r = typeinfo_is_assignable_to_class(&OP1->typeinfo,
   GENERATED                    CLASSREF_OR_CLASSINFO(class_java_lang_Throwable));
@@ -1823,7 +1823,7 @@
   GENERATED    /* may use stack[0] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 327 "src/vm/jit/verify/icmds.c"
+#              line 365 "src/vm/jit/verify/icmds.c"
   GENERATED    /* returnAddress is not allowed */
   GENERATED    if (!TYPEINFO_IS_REFERENCE(OP1->typeinfo))
   GENERATED            VERIFY_ERROR("Illegal instruction: CHECKCAST on non-reference");
@@ -1853,7 +1853,7 @@
   GENERATED    /* may use stack[0] ... stack[0] */
   GENERATED  
   GENERATED  
-#              line 336 "src/vm/jit/verify/icmds.c"
+#              line 374 "src/vm/jit/verify/icmds.c"
   GENERATED    /* returnAddress is not allowed */
   GENERATED    if (!TYPEINFO_IS_REFERENCE(OP1->typeinfo))
   GENERATED            VERIFY_ERROR("Illegal instruction: INSTANCEOF on non-reference");
@@ -1875,7 +1875,7 @@
   GENERATED    /* variable number of inslots! */
   GENERATED  
   GENERATED  
-#              line 621 "src/vm/jit/verify/icmds.c"
+#              line 659 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!typecheck_stackbased_multianewarray(STATE, stack, stackfloor))
   GENERATED            EXCEPTION;
   GENERATED    stack -= (IPTR->s1.argcount - 1);
@@ -1898,7 +1898,7 @@
   GENERATED    /* may use stack[1] ... stack[1] */
   GENERATED  
   GENERATED  
-#              line 346 "src/vm/jit/verify/icmds.c"
+#              line 384 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    TYPECHECK_COUNT(stat_ins_branch);
   GENERATED  
@@ -1920,7 +1920,7 @@
   GENERATED    /* variable number of outslots! */
   GENERATED  
   GENERATED  
-#              line 637 "src/vm/jit/verify/icmds.c"
+#              line 675 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_builtin);
   GENERATED    if (!typecheck_stackbased_verify_builtin(STATE, stack, stackfloor))
   GENERATED            EXCEPTION;

diff --git a/src/vm/jit/verify/typecheck-variablesbased-gen.inc b/src/vm/jit/verify/typecheck-variablesbased-gen.inc
index c6145c7200a35069a15fa3756544876ab1a84437..ff069ba9078eb35defb1a4ce37dad11442df8308 100644 (file)
--- a/src/vm/jit/verify/typecheck-variablesbased-gen.inc
+++ b/src/vm/jit/verify/typecheck-variablesbased-gen.inc
@@ -15,7 +15,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 309 "src/vm/jit/verify/icmds.c"
+#              line 347 "src/vm/jit/verify/icmds.c"
   GENERATED    if (IPTR->flags.bits & INS_FLAG_CLASS) {
   GENERATED            /* a java.lang.Class reference */
   GENERATED            TYPEINFO_INIT_JAVA_LANG_CLASS(DST->typeinfo,IPTR->sx.val.c);
@@ -154,7 +154,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 48 "src/vm/jit/verify/icmds.c"
+#              line 86 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_stack);
   GENERATED    COPYTYPE(IPTR->s1, IPTR->dst);
   GENERATED    DST->type = OP1->type;
@@ -177,7 +177,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 47 "src/vm/jit/verify/icmds.c"
+#              line 85 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_stack);
   GENERATED    COPYTYPE(IPTR->s1, IPTR->dst);
   GENERATED    DST->type = OP1->type;
@@ -229,7 +229,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 57 "src/vm/jit/verify/icmds.c"
+#              line 95 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_aload);
   GENERATED  
   GENERATED    /* loading a returnAddress is not allowed */
@@ -258,7 +258,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 220 "src/vm/jit/verify/icmds.c"
+#              line 258 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_INT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -282,7 +282,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 230 "src/vm/jit/verify/icmds.c"
+#              line 268 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_LONG))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -306,7 +306,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 215 "src/vm/jit/verify/icmds.c"
+#              line 253 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_FLOAT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -330,7 +330,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 210 "src/vm/jit/verify/icmds.c"
+#              line 248 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_DOUBLE))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -354,7 +354,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 77 "src/vm/jit/verify/icmds.c"
+#              line 115 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_ARRAY_OF_REFS(OP1->typeinfo))
   GENERATED            VERIFY_ERROR("illegal instruction: AALOAD on non-reference array");
   GENERATED  
@@ -381,7 +381,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 199 "src/vm/jit/verify/icmds.c"
+#              line 237 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_BOOLEAN)
   GENERATED                    && !TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_BYTE))
   GENERATED            VERIFY_ERROR("Array type mismatch");
@@ -406,7 +406,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 205 "src/vm/jit/verify/icmds.c"
+#              line 243 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_CHAR))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -430,7 +430,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 225 "src/vm/jit/verify/icmds.c"
+#              line 263 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_SHORT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -478,7 +478,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 70 "src/vm/jit/verify/icmds.c"
+#              line 108 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPEINFO_COPY(OP1->typeinfo, DST->typeinfo);
   GENERATED  
 #              line 485 "src/vm/jit/verify/typecheck-variablesbased-gen.inc"
@@ -524,7 +524,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 363 "src/vm/jit/verify/icmds.c"
+#              line 401 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    TYPECHECK_COUNT(stat_ins_branch);
   GENERATED  
@@ -546,7 +546,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 256 "src/vm/jit/verify/icmds.c"
+#              line 294 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_INT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -565,7 +565,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 266 "src/vm/jit/verify/icmds.c"
+#              line 304 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_LONG))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -584,7 +584,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 251 "src/vm/jit/verify/icmds.c"
+#              line 289 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_FLOAT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -603,7 +603,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 246 "src/vm/jit/verify/icmds.c"
+#              line 284 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_DOUBLE))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -622,7 +622,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 271 "src/vm/jit/verify/icmds.c"
+#              line 309 "src/vm/jit/verify/icmds.c"
   GENERATED    /* we just check the basic input types and that the           */
   GENERATED    /* destination is an array of references. Assignability to    */
   GENERATED    /* the actual array must be checked at runtime, each time the */
@@ -645,7 +645,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 235 "src/vm/jit/verify/icmds.c"
+#              line 273 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_BOOLEAN)
   GENERATED                    && !TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_BYTE))
   GENERATED            VERIFY_ERROR("Array type mismatch");
@@ -665,7 +665,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 241 "src/vm/jit/verify/icmds.c"
+#              line 279 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_CHAR))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -684,7 +684,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 261 "src/vm/jit/verify/icmds.c"
+#              line 299 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo,ARRAYTYPE_SHORT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -733,7 +733,7 @@
   GENERATED    superblockend = true;
   GENERATED  
   GENERATED  
-#              line 345 "src/vm/jit/verify/icmds.c"
+#              line 383 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    TYPECHECK_COUNT(stat_ins_branch);
   GENERATED  
@@ -752,7 +752,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 536 "src/vm/jit/verify/icmds.c"
+#              line 574 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPEINFO_INIT_RETURNADDRESS(DST->typeinfo, BPTR->next);
   GENERATED    REACH(IPTR->sx.s23.s3.jsrtarget);
   GENERATED  
@@ -770,7 +770,7 @@
   GENERATED    superblockend = true;
   GENERATED  
   GENERATED  
-#              line 553 "src/vm/jit/verify/icmds.c"
+#              line 591 "src/vm/jit/verify/icmds.c"
   GENERATED    /* check returnAddress variable */
   GENERATED    if (!typevector_checkretaddr(jd->var,IPTR->s1.varindex))
   GENERATED            VERIFY_ERROR("illegal instruction: RET using non-returnAddress variable");
@@ -788,7 +788,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 412 "src/vm/jit/verify/icmds.c"
+#              line 450 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    TYPECHECK_COUNT(stat_ins_switch);
   GENERATED  
@@ -818,7 +818,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 428 "src/vm/jit/verify/icmds.c"
+#              line 466 "src/vm/jit/verify/icmds.c"
   GENERATED    /* {RESULTNOW} */
   GENERATED    TYPECHECK_COUNT(stat_ins_switch);
   GENERATED  
@@ -848,7 +848,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 494 "src/vm/jit/verify/icmds.c"
+#              line 532 "src/vm/jit/verify/icmds.c"
   GENERATED    if (STATE->returntype.type != TYPE_INT)
   GENERATED            VERIFY_ERROR("Return type mismatch");
   GENERATED  
@@ -867,7 +867,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 499 "src/vm/jit/verify/icmds.c"
+#              line 537 "src/vm/jit/verify/icmds.c"
   GENERATED    if (STATE->returntype.type != TYPE_LNG)
   GENERATED            VERIFY_ERROR("Return type mismatch");
   GENERATED  
@@ -886,7 +886,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 504 "src/vm/jit/verify/icmds.c"
+#              line 542 "src/vm/jit/verify/icmds.c"
   GENERATED    if (STATE->returntype.type != TYPE_FLT)
   GENERATED            VERIFY_ERROR("Return type mismatch");
   GENERATED  
@@ -905,7 +905,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 509 "src/vm/jit/verify/icmds.c"
+#              line 547 "src/vm/jit/verify/icmds.c"
   GENERATED    if (STATE->returntype.type != TYPE_DBL)
   GENERATED            VERIFY_ERROR("Return type mismatch");
   GENERATED  
@@ -925,7 +925,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 469 "src/vm/jit/verify/icmds.c"
+#              line 507 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_areturn);
   GENERATED    if (!TYPEINFO_IS_REFERENCE(OP1->typeinfo))
   GENERATED            VERIFY_ERROR("illegal instruction: ARETURN on non-reference");
@@ -959,7 +959,7 @@
   GENERATED    superblockend = true;
   GENERATED  
   GENERATED  
-#              line 514 "src/vm/jit/verify/icmds.c"
+#              line 552 "src/vm/jit/verify/icmds.c"
   GENERATED    if (STATE->returntype.type != TYPE_VOID)
   GENERATED            VERIFY_ERROR("Return type mismatch");
   GENERATED  
@@ -992,7 +992,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 184 "src/vm/jit/verify/icmds.c"
+#              line 222 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!verify_fieldaccess(state, NULL, NULL))
   GENERATED            return false;
   GENERATED    maythrow = true;
@@ -1012,7 +1012,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 130 "src/vm/jit/verify/icmds.c"
+#              line 168 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!verify_fieldaccess(state, NULL, VAROP(iptr->s1)))
   GENERATED            return false;
   GENERATED    maythrow = true;
@@ -1034,7 +1034,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 178 "src/vm/jit/verify/icmds.c"
+#              line 216 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!verify_fieldaccess(state, VAROP(iptr->s1), NULL))
   GENERATED            return false;
   GENERATED    maythrow = true;
@@ -1056,7 +1056,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 124 "src/vm/jit/verify/icmds.c"
+#              line 162 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!verify_fieldaccess(state, VAROP(iptr->s1), VAROP(iptr->sx.s23.s2)))
   GENERATED            return false;
   GENERATED    maythrow = true;
@@ -1079,7 +1079,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 573 "src/vm/jit/verify/icmds.c"
+#              line 611 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_invoke);
   GENERATED    if (!verify_invocation(state))
   GENERATED            EXCEPTION;
@@ -1102,7 +1102,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 193 "src/vm/jit/verify/icmds.c"
+#              line 231 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_ARRAY(OP1->typeinfo)
   GENERATED                    && OP1->typeinfo.typeclass.cls != pseudo_class_Arraystub)
   GENERATED            VERIFY_ERROR("illegal instruction: ARRAYLENGTH on non-array");
@@ -1126,7 +1126,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 448 "src/vm/jit/verify/icmds.c"
+#              line 486 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_athrow);
   GENERATED    r = typeinfo_is_assignable_to_class(&OP1->typeinfo,
   GENERATED                    CLASSREF_OR_CLASSINFO(class_java_lang_Throwable));
@@ -1163,7 +1163,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 327 "src/vm/jit/verify/icmds.c"
+#              line 365 "src/vm/jit/verify/icmds.c"
   GENERATED    /* returnAddress is not allowed */
   GENERATED    if (!TYPEINFO_IS_REFERENCE(OP1->typeinfo))
   GENERATED            VERIFY_ERROR("Illegal instruction: CHECKCAST on non-reference");
@@ -1191,7 +1191,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 336 "src/vm/jit/verify/icmds.c"
+#              line 374 "src/vm/jit/verify/icmds.c"
   GENERATED    /* returnAddress is not allowed */
   GENERATED    if (!TYPEINFO_IS_REFERENCE(OP1->typeinfo))
   GENERATED            VERIFY_ERROR("Illegal instruction: INSTANCEOF on non-reference");
@@ -1216,7 +1216,7 @@
 #              define DST  VAROP(iptr->dst)
   GENERATED  
   GENERATED  
-#              line 616 "src/vm/jit/verify/icmds.c"
+#              line 654 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!verify_multianewarray(STATE))
   GENERATED            EXCEPTION;
   GENERATED  
@@ -1238,7 +1238,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 280 "src/vm/jit/verify/icmds.c"
+#              line 318 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo, ARRAYTYPE_INT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -1257,7 +1257,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 285 "src/vm/jit/verify/icmds.c"
+#              line 323 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo, ARRAYTYPE_LONG))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -1284,7 +1284,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 290 "src/vm/jit/verify/icmds.c"
+#              line 328 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo, ARRAYTYPE_BOOLEAN)
   GENERATED                    && !TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo, ARRAYTYPE_BYTE))
   GENERATED            VERIFY_ERROR("Array type mismatch");
@@ -1304,7 +1304,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 296 "src/vm/jit/verify/icmds.c"
+#              line 334 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo, ARRAYTYPE_CHAR))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -1323,7 +1323,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 301 "src/vm/jit/verify/icmds.c"
+#              line 339 "src/vm/jit/verify/icmds.c"
   GENERATED    if (!TYPEINFO_MAYBE_PRIMITIVE_ARRAY(OP1->typeinfo, ARRAYTYPE_SHORT))
   GENERATED            VERIFY_ERROR("Array type mismatch");
   GENERATED  
@@ -1340,7 +1340,7 @@
   GENERATED    maythrow = true;
   GENERATED  
   GENERATED  
-#              line 157 "src/vm/jit/verify/icmds.c"
+#              line 195 "src/vm/jit/verify/icmds.c"
   GENERATED    /* XXX this mess will go away with const operands */
   GENERATED    INSTRUCTION_GET_FIELDREF(state->iptr, fieldref);
   GENERATED    constvalue.type = fieldref->parseddesc.fd->type;
@@ -1372,7 +1372,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 136 "src/vm/jit/verify/icmds.c"
+#              line 174 "src/vm/jit/verify/icmds.c"
   GENERATED    /* XXX this mess will go away with const operands */
   GENERATED    INSTRUCTION_GET_FIELDREF(state->iptr, fieldref);
   GENERATED    constvalue.type = fieldref->parseddesc.fd->type;
@@ -1407,7 +1407,7 @@
 #              define OP1  VAROP(iptr->s1)
   GENERATED  
   GENERATED  
-#              line 631 "src/vm/jit/verify/icmds.c"
+#              line 669 "src/vm/jit/verify/icmds.c"
   GENERATED    TYPECHECK_COUNT(stat_ins_builtin);
   GENERATED    if (!verify_builtin(state))
   GENERATED            EXCEPTION;