test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Template.java
author dholmes
Sat, 23 Jun 2018 01:32:41 -0400
changeset 50735 2f2af62dfac7
parent 47216 71c04702a3d5
permissions -rw-r--r--
8010319: Implementation of JEP 181: Nest-Based Access Control Reviewed-by: alanb, psandoz, mchung, coleenp, acorn, mcimadamore, forax, jlahoda, sspitsyn, abuckley Contributed-by: alex.buckley@oracle.com, maurizio.mimadamore@oracle.com, mandy.chung@oracle.com, tobias.hartmann@oracle.com, david.holmes@oracle.com, vladimir.x.ivanov@oracle.com, karen.kinnear@oracle.com, vladimir.kozlov@oracle.com, john.r.rose@oracle.com, daniel.smith@oracle.com, serguei.spitsyn@oracle.com, kumardotsrinivasan@gmail.com, boris.ulasevich@bell-sw.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
37196
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
     1
/*
50735
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
     2
 * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
37196
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
     4
 *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
     7
 * published by the Free Software Foundation.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
     8
 *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    13
 * accompanied this code).
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    14
 *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    18
 *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    21
 * questions.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    22
 */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    23
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    24
package selectionresolution;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    25
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    26
import java.util.function.BiConsumer;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    27
import java.util.function.Consumer;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    28
import java.util.Arrays;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    29
import java.util.Collection;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    30
import java.util.Collections;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    31
import java.util.EnumSet;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    32
import java.util.HashSet;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    33
import java.util.LinkedList;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    34
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    35
/**
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    36
 * Templates are sets of transformations that are applied to a
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    37
 * SelectionResolutionTestCase.Builder as part of building up a test
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    38
 * case.  Templates should contain a collection of different
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    39
 * transforms, all of which represent an "interesting" case in a
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    40
 * general category of cases.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    41
 *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    42
 */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    43
public class Template {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    44
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    45
    public enum Kind { CLASS, INTERFACE; }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    46
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    47
    public final Collection<Consumer<SelectionResolutionTestCase.Builder>> cases;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    48
    public final String name;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    49
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    50
    /**
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    51
     * Create a template from a collection of lambdas that modify a Builder.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    52
     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    53
     * @param name The name of the template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    54
     * @param cases The cases in the template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    55
     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    56
    public Template(final String name,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    57
                    final Collection<Consumer<SelectionResolutionTestCase.Builder>> cases) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    58
        this.cases = cases;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    59
        this.name = name;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    60
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    61
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    62
    /**
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    63
     * Build a template out of a set of lambdas that modify a Builder.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    64
     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    65
     * @param name The name of the template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    66
     * @param cases The cases in the template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    67
     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    68
    public Template(final String name,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    69
                    final Consumer<SelectionResolutionTestCase.Builder>... cases) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    70
        this(name, Arrays.asList(cases));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    71
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    72
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    73
    /**
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    74
     * Build a template out of a set of lambdas that modify a Builder.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    75
     * Also include all cases from another template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    76
     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    77
     * @param name The name of the template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    78
     * @param include Include all cases from this template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    79
     * @param cases The cases in the template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    80
     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    81
    public Template(final String name,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    82
                    final Template include,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    83
                    final Consumer<SelectionResolutionTestCase.Builder>... cases) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    84
        this(name, new LinkedList(include.cases));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    85
        this.cases.addAll(Arrays.asList(cases));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    86
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    87
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    88
    /**
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    89
     * Build a template out of a set of lambdas that modify a Builder.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    90
     * Also include all cases from another template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    91
     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    92
     * @param name The name of the template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    93
     * @param include Include all cases from this template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    94
     * @param cases The cases in the template.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    95
     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    96
    public Template(final String name,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    97
                    final Template... others) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    98
        this(name, new LinkedList());
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
    99
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   100
        for(final Template template : others) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   101
            cases.addAll(template.cases);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   102
        }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   103
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   104
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   105
    /**
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   106
     * Run all cases in the template.  This will run each action in
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   107
     * the template and then call the next action on a separate copy
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   108
     * of the builder parameter.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   109
     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   110
     * @param The next action to perform of the Builder.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   111
     * @param The Builder to modify.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   112
     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   113
    public void runCases(final Consumer<SelectionResolutionTestCase.Builder> next,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   114
                         final SelectionResolutionTestCase.Builder builder) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   115
        for(final Consumer<SelectionResolutionTestCase.Builder> thiscase : cases) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   116
            final SelectionResolutionTestCase.Builder localbuilder = builder.copy();
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   117
            thiscase.accept(localbuilder);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   118
            next.accept(localbuilder);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   119
        }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   120
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   121
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   122
    public void printCases(final SelectionResolutionTestCase.Builder builder) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   123
        int i = 1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   124
        System.err.println("Template " + name + ":\n");
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   125
        for(final Consumer<SelectionResolutionTestCase.Builder> thiscase : cases) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   126
            final SelectionResolutionTestCase.Builder localbuilder = builder.copy();
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   127
            thiscase.accept(localbuilder);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   128
            System.err.println("Case " + i++);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   129
            System.err.println(localbuilder);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   130
        }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   131
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   132
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   133
    /* Create an empty class in the given package */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   134
    public static final ClassData emptyClass(final ClassData.Package pck) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   135
        return new ClassData(pck, null);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   136
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   137
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   138
    /* These are functions that are used to build callsite templates */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   139
    public static void callsiteIsMethodref(final SelectionResolutionTestCase.Builder builder) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   140
        builder.callsite = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   141
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   142
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   143
    public static void callsiteSubclassMethodref(final SelectionResolutionTestCase.Builder builder) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   144
        final int callsite =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   145
            builder.addClass(Template.emptyClass(ClassData.Package.SAME));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   146
        builder.hier.addInherit(callsite, builder.methodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   147
        builder.callsite = callsite;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   148
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   149
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   150
    public static void callsiteUnrelatedMethodref(final SelectionResolutionTestCase.Builder builder) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   151
        final int callsite =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   152
            builder.addClass(Template.emptyClass(ClassData.Package.SAME));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   153
        builder.callsite = callsite;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   154
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   155
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   156
    public static void methodrefIsExpected(final SelectionResolutionTestCase.Builder builder) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   157
        builder.methodref = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   158
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   159
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   160
    public static final Template MethodrefEqualsExpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   161
        new Template("MethodrefEqualsExpected",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   162
                     Template::methodrefIsExpected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   163
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   164
    /*****************************
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   165
     *    Set Invoke Template    *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   166
     *****************************/
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   167
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   168
    public static final Template SetInvoke(final SelectionResolutionTestCase.InvokeInstruction invoke) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   169
        return new Template("SetInvoke(" + invoke + ")",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   170
                            Collections.singleton((builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   171
                                    builder.invoke = invoke;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   172
                                }));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   173
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   174
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   175
    /*****************************
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   176
     *   Result Combo Template   *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   177
     *****************************/
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   178
    public static Template ResultCombo(final EnumSet<Kind> kinds,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   179
                                       final EnumSet<MethodData.Access> accesses,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   180
                                       final EnumSet<MethodData.Context> contexts,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   181
                                       final EnumSet<ClassData.Package> packages) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   182
        final LinkedList<Consumer<SelectionResolutionTestCase.Builder>> cases =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   183
            new LinkedList<>();
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   184
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   185
        for (final Kind kind : kinds) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   186
            for (final MethodData.Access acc : accesses) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   187
                for (final MethodData.Context ctx : contexts) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   188
                    if (!(acc == MethodData.Access.PRIVATE &&
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   189
                          ctx == MethodData.Context.ABSTRACT)) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   190
                        for (final ClassData.Package pck : packages) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   191
                            cases.add((builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   192
                                    final MethodData meth = new MethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   193
                                    final ClassData cls = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   194
                                    switch(kind) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   195
                                    case CLASS:
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   196
                                        builder.expected = builder.addClass(cls);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   197
                                        break;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   198
                                    case INTERFACE:
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   199
                                        builder.expected = builder.addInterface(cls);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   200
                                        break;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   201
                                    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   202
                                });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   203
                        }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   204
                    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   205
                }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   206
            }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   207
        }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   208
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   209
        return new Template("ResultCombo", cases);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   210
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   211
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   212
    public static Template ResolutionOverride(final EnumSet<Kind> kinds,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   213
                                              final EnumSet<MethodData.Access> accesses,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   214
                                              final EnumSet<MethodData.Context> contexts,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   215
                                              final EnumSet<ClassData.Package> packages) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   216
        final LinkedList<Consumer<SelectionResolutionTestCase.Builder>> cases =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   217
            new LinkedList<>();
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   218
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   219
        for (final Kind kind : kinds) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   220
            for (final MethodData.Access acc : accesses) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   221
                for (final MethodData.Context ctx : contexts) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   222
                    if (!(acc == MethodData.Access.PRIVATE &&
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   223
                          ctx == MethodData.Context.ABSTRACT)) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   224
                        for (final ClassData.Package pck : packages) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   225
                            cases.add((builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   226
                                    final MethodData meth = new MethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   227
                                    final ClassData cls = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   228
                                    int override = -1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   229
                                    switch(kind) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   230
                                    case CLASS:
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   231
                                        override = builder.addClass(cls);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   232
                                        break;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   233
                                    case INTERFACE:
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   234
                                        override = builder.addInterface(cls);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   235
                                        break;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   236
                                    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   237
                                    builder.hier.addInherit(override, builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   238
                                });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   239
                        }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   240
                    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   241
                }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   242
            }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   243
        }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   244
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   245
        return new Template("ResultCombo", cases);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   246
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   247
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   248
    /******************************
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   249
     *    Resolution Templates    *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   250
     ******************************/
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   251
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   252
    private static MethodData getMethodData(final MethodData.Access acc,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   253
                                            final MethodData.Context ctx) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   254
        if (!(acc == MethodData.Access.PUBLIC ||
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   255
              acc == MethodData.Access.PLACEHOLDER) &&
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   256
            ctx != MethodData.Context.STATIC) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   257
            return null;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   258
        } else {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   259
            return new MethodData(MethodData.Access.PUBLIC, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   260
        }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   261
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   262
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   263
    public static final Template MethodrefNotEqualsExpectedClass =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   264
        new Template("MethodrefNotEqualsExpectedClass",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   265
                     /* Case 1: Inherit from super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   266
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   267
                      * C2[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   268
                      * C1[C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   269
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   270
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   271
                         final int C2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   272
                         final int C1 = builder.addClass(emptyClass(ClassData.Package.SAME));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   273
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   274
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   275
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   276
                     /* Case 2: Inherit from super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   277
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   278
                      * C2[](res), I[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   279
                      * C1[C2,I]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   280
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   281
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   282
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   283
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   284
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   285
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   286
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   287
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   288
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   289
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   290
                         final int C2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   291
                         final int C1 = builder.addClass(emptyClass(ClassData.Package.SAME));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   292
                         final int I = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   293
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   294
                         builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   295
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   296
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   297
                     /* Case 3: Inherit from super's super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   298
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   299
                      * C3[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   300
                      * C2[](), I[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   301
                      * C1[C2,I]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   302
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   303
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   304
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   305
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   306
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   307
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   308
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   309
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   310
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   311
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   312
                         final int C3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   313
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   314
                         final int C1 = builder.addClass(emptyClass(ClassData.Package.SAME));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   315
                         final int I = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   316
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   317
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   318
                         builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   319
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   320
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   321
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   322
    public static final Template IfaceMethodrefNotEqualsExpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   323
        new Template("IfaceMethodrefNotEqualsExpected",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   324
                     /* Case 1: Inherit from super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   325
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   326
                      * I2[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   327
                      * I1[I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   328
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   329
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   330
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   331
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   332
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   333
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   334
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   335
                         builder.methodref = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   336
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   337
                     /* Case 2: Inherit from super, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   338
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   339
                      * I2[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   340
                      * I2[I3](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   341
                      * I1[I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   342
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   343
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   344
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   345
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   346
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   347
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   348
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   349
                         final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   350
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   351
                         final int I2 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   352
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   353
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   354
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   355
                         builder.methodref = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   356
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   357
                     /* Case 3: Inherit from super, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   358
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   359
                      * I2[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   360
                      * I2[I3](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   361
                      * I1[I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   362
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   363
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   364
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   365
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   366
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   367
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   368
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   369
                         final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   370
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   371
                         final int I2 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   372
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   373
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   374
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   375
                         builder.methodref = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   376
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   377
                     /* Case 4: Maximally-specific.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   378
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   379
                      * I3[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   380
                      * I2[I3](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   381
                      * I1[I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   382
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   383
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   384
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   385
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   386
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   387
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   388
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   389
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   390
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   391
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   392
                         final int I3 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   393
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   394
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   395
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   396
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   397
                         builder.methodref = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   398
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   399
                     /* Case 5: Diamond, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   400
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   401
                      * I4[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   402
                      * I2[I4](), I3[I4]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   403
                      * I1[I2,I3]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   404
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   405
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   406
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   407
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   408
                         final int I4 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   409
                         final int I3 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   410
                         final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   411
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   412
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   413
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   414
                         builder.hier.addInherit(I2, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   415
                         builder.hier.addInherit(I3, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   416
                         builder.methodref = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   417
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   418
                     /* Case 6: Diamond, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   419
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   420
                      * I4[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   421
                      * I2[I4](priv), I3[I4]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   422
                      * I1[I2,I3]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   423
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   424
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   425
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   426
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   427
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   428
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   429
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   430
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   431
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   432
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   433
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   434
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   435
                         final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   436
                         final int I4 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   437
                         final int I3 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   438
                         final int I2 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   439
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   440
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   441
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   442
                         builder.hier.addInherit(I2, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   443
                         builder.hier.addInherit(I3, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   444
                         builder.methodref = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   445
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   446
                     /* Case 7: Diamond, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   447
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   448
                      * I4[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   449
                      * I2[I4](stat), I3[I4]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   450
                      * I1[I2,I3]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   451
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   452
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   453
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   454
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   455
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   456
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   457
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   458
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   459
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   460
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   461
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   462
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   463
                         final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   464
                         final int I4 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   465
                         final int I3 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   466
                         final int I2 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   467
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   468
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   469
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   470
                         builder.hier.addInherit(I2, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   471
                         builder.hier.addInherit(I3, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   472
                         builder.methodref = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   473
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   474
                     /* Case 8: Diamond, maximally-specific.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   475
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   476
                      * I4[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   477
                      * I2[I4](res), I3[I4]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   478
                      * I1[I2,I3]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   479
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   480
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   481
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   482
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   483
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   484
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   485
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   486
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   487
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   488
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   489
                         final int I4 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   490
                         final int I3 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   491
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   492
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   493
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   494
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   495
                         builder.hier.addInherit(I2, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   496
                         builder.hier.addInherit(I3, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   497
                         builder.methodref = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   498
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   499
                     /* Case 9: Diamond, maximally-specific, skipping private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   500
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   501
                      * I4[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   502
                      * I2[I4](res), I3[I4](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   503
                      * I1[I2,I3]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   504
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   505
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   506
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   507
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   508
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   509
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   510
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   511
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   512
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   513
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   514
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   515
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   516
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   517
                         final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   518
                         final int I4 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   519
                         final int I3 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   520
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   521
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   522
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   523
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   524
                         builder.hier.addInherit(I2, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   525
                         builder.hier.addInherit(I3, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   526
                         builder.methodref = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   527
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   528
                     /* Case 10: Diamond, maximally-specific, skipping static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   529
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   530
                      * I4[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   531
                      * I2[I4](res), I3[I4](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   532
                      * I1[I2,I3]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   533
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   534
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   535
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   536
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   537
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   538
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   539
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   540
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   541
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   542
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   543
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   544
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   545
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   546
                         final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   547
                         final int I4 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   548
                         final int I3 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   549
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   550
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   551
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   552
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   553
                         builder.hier.addInherit(I2, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   554
                         builder.hier.addInherit(I3, I4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   555
                         builder.methodref = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   556
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   557
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   558
    public static final Template MethodrefNotEqualsExpectedIface =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   559
        new Template("MethodrefNotEqualsExpectedIface",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   560
                    /* Case 1: Inherit from superinterface.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   561
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   562
                     * I[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   563
                     * C[I]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   564
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   565
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   566
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   567
                            builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   568
                        final int I = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   569
                        final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   570
                        builder.hier.addInherit(C, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   571
                        builder.methodref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   572
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   573
                     /* Case 2: Diamond, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   574
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   575
                      * I3[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   576
                      * I1[I3](), I2[I3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   577
                      * C[I1,I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   578
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   579
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   580
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   581
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   582
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   583
                         final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   584
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   585
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   586
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   587
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   588
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   589
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   590
                         builder.methodref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   591
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   592
                     /* Case 3: Diamond, skipping private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   593
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   594
                      * I3[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   595
                      * I1[I3](priv), I2[I3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   596
                      * C[I1,I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   597
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   598
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   599
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   600
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   601
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   602
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   603
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   604
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   605
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   606
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   607
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   608
                         final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   609
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   610
                         final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   611
                         final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   612
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   613
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   614
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   615
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   616
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   617
                         builder.methodref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   618
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   619
                     /* Case 4: Diamond, skipping static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   620
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   621
                      * I3[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   622
                      * I1[I3](stat), I2[I3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   623
                      * C[I1,I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   624
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   625
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   626
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   627
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   628
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   629
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   630
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   631
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   632
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   633
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   634
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   635
                         final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   636
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   637
                         final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   638
                         final int I1 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   639
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   640
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   641
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   642
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   643
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   644
                         builder.methodref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   645
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   646
                     /* Case 5: Diamond, maximally-specific.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   647
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   648
                      * I3[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   649
                      * I1[I3](res), I2[I3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   650
                      * C[I1,I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   651
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   652
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   653
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   654
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   655
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   656
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   657
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   658
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   659
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   660
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   661
                         final int I3 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   662
                         final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   663
                         final int I1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   664
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   665
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   666
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   667
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   668
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   669
                         builder.methodref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   670
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   671
                     /* Case 6: Diamond, maximally-specific, skipping private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   672
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   673
                      * I3[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   674
                      * I1[I3](res), I2[I3](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   675
                      * C[I1,I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   676
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   677
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   678
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   679
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   680
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   681
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   682
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   683
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   684
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   685
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   686
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   687
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   688
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   689
                         final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   690
                         final int I3 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   691
                         final int I2 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   692
                         final int I1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   693
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   694
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   695
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   696
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   697
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   698
                         builder.methodref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   699
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   700
                     /* Case 7: Diamond, maximally-specific, skipping static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   701
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   702
                      * I3[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   703
                      * I1[I3](res), I2[I3](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   704
                      * C[I1,I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   705
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   706
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   707
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   708
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   709
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   710
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   711
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   712
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   713
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   714
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   715
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   716
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   717
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   718
                         final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   719
                         final int I3 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   720
                         final int I2 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   721
                         final int I1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   722
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   723
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   724
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   725
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   726
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   727
                         builder.methodref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   728
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   729
                     /* Case 8: Diamond, with superclass, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   730
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   731
                      * I2[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   732
                      * C2[I2](), I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   733
                      * C1[I1,C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   734
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   735
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   736
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   737
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   738
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   739
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   740
                         final int C2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   741
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   742
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   743
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   744
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   745
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   746
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   747
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   748
                     /* Case 9: Diamond with superclass, maximally-specific.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   749
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   750
                      * I2[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   751
                      * C2[I2](), I1[I2](res),
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   752
                      * C1[I1,C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   753
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   754
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   755
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   756
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   757
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   758
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   759
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   760
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   761
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   762
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   763
                         final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   764
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   765
                         final int I1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   766
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   767
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   768
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   769
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   770
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   771
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   772
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   773
                     /* Case 10: Inherit through superclass.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   774
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   775
                      * I[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   776
                      * C2[I]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   777
                      * C1[C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   778
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   779
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   780
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   781
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   782
                         final int I = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   783
                         final int C2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   784
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   785
                         builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   786
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   787
                         builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   788
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   789
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   790
                     /* Case 11: Diamond, inherit through superclass,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   791
                      * expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   792
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   793
                      * I3[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   794
                      * I1[I3](), I2[I3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   795
                      * C2[I1,I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   796
                      * C1[C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   797
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   798
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   799
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   800
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   801
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   802
                         final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   803
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   804
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   805
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   806
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   807
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   808
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   809
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   810
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   811
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   812
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   813
                     /* Case 12: Diamond through superclass, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   814
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   815
                      * I3[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   816
                      * I1[I3](priv), I2[I3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   817
                      * C2[I1,I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   818
                      * C1[C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   819
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   820
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   821
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   822
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   823
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   824
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   825
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   826
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   827
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   828
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   829
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   830
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   831
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   832
                         final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   833
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   834
                         final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   835
                         final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   836
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   837
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   838
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   839
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   840
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   841
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   842
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   843
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   844
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   845
                     /* Case 13: Diamond through superclass, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   846
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   847
                      * I3[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   848
                      * I1[I3](stat), I2[I3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   849
                      * C2[I1,I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   850
                      * C1[C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   851
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   852
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   853
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   854
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   855
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   856
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   857
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   858
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   859
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   860
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   861
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   862
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   863
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   864
                         final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   865
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   866
                         final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   867
                         final int I1 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   868
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   869
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   870
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   871
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   872
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   873
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   874
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   875
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   876
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   877
                     /* Case 14: Diamond through superclass, maximally-specific.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   878
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   879
                      * I3[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   880
                      * I1[I3](res), I2[I3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   881
                      * C2[I1,I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   882
                      * C1[C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   883
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   884
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   885
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   886
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   887
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   888
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   889
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   890
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   891
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   892
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   893
                         final int I3 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   894
                         final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   895
                         final int I1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   896
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   897
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   898
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   899
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   900
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   901
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   902
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   903
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   904
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   905
                     /* Case 15: Diamond through superclass,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   906
                      * maximally-specific, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   907
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   908
                      * I3[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   909
                      * I1[I3](res), I2[I3](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   910
                      * C2[I1,I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   911
                      * C1[C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   912
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   913
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   914
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   915
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   916
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   917
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   918
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   919
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   920
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   921
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   922
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   923
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   924
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   925
                         final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   926
                         final int I3 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   927
                         final int I2 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   928
                         final int I1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   929
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   930
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   931
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   932
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   933
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   934
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   935
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   936
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   937
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   938
                     /* Case 16: Diamond through superclass,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   939
                      * maximally-specific, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   940
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   941
                      * I3[](pub)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   942
                      * I1[I3](res), I2[I3](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   943
                      * C2[I1,I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   944
                      * C1[C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   945
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   946
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   947
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   948
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   949
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   950
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   951
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   952
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   953
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   954
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   955
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   956
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   957
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   958
                         final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   959
                         final int I3 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   960
                         final int I2 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   961
                         final int I1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   962
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   963
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   964
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   965
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   966
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   967
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   968
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   969
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   970
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   971
                     /* Case 17: Diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   972
                      * superclass, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   973
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   974
                      * I2[](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   975
                      * C3[I2](), I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   976
                      * C2[I1,C3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   977
                      * C1[C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   978
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   979
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   980
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   981
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   982
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   983
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   984
                         final int C3 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   985
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   986
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   987
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   988
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   989
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   990
                         builder.hier.addInherit(C3, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   991
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   992
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   993
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   994
                     /* Case 18: Diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   995
                      * superclass, maximally-specific.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   996
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   997
                      * I2[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   998
                      * C3[I2](), I1[I2](res),
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
   999
                      * C2[I1,C3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1000
                      * C1[I1,C2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1001
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1002
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1003
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1004
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1005
                         final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1006
                             builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1007
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1008
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1009
                         final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1010
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1011
                         final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1012
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1013
                         final int I1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1014
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1015
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1016
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1017
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1018
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1019
                         builder.hier.addInherit(C3, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1020
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1021
                         builder.methodref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1022
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1023
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1024
    public static final Template IfaceMethodrefAmbiguous =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1025
        new Template("IfaceMethodrefAmbiguous",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1026
                     /* Ambiguous.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1027
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1028
                      * I2[](def), I3[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1029
                      * I1[I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1030
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1031
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1032
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1033
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1034
                         final ClassData expected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1035
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1036
                         final int I3 = builder.addInterface(expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1037
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1038
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1039
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1040
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1041
                         builder.methodref = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1042
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1043
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1044
    public static final Template MethodrefAmbiguous =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1045
        new Template("MethodrefAmbiguous",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1046
                     /* Ambiguous.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1047
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1048
                      * I1[](def), I2[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1049
                      * C[I2]() = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1050
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1051
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1052
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1053
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1054
                         final ClassData expected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1055
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1056
                         final int I1 = builder.addInterface(expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1057
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1058
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1059
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1060
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1061
                         builder.methodref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1062
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1063
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1064
    /******************************
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1065
     *     Callsite Templates     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1066
     ******************************/
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1067
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1068
    public static final Template AllCallsiteCases =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1069
        new Template("AllCallsiteCases",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1070
                     Template::callsiteIsMethodref,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1071
                     Template::callsiteSubclassMethodref,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1072
                     Template::callsiteUnrelatedMethodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1073
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1074
    public static final Template InvokespecialCallsiteCases =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1075
        new Template("InvokespecialCallsiteCases",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1076
                     Template::callsiteIsMethodref,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1077
                     Template::callsiteSubclassMethodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1078
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1079
    public static final Template CallsiteEqualsMethodref =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1080
        new Template("CallsiteEqualsMethodref",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1081
                     Template::callsiteIsMethodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1082
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1083
    public static final Template CallsiteSubclassMethodref =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1084
        new Template("CallsiteSubclassMethodref",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1085
                     Template::callsiteSubclassMethodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1086
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1087
    public static final Template CallsiteUnrelatedToMethodref =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1088
        new Template("CallsiteUnrelatedToMethodref",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1089
                     Template::callsiteUnrelatedMethodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1090
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1091
    public static final Template CallsiteNotEqualsMethodref =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1092
        new Template("CallsiteNotEqualsMethodref",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1093
                     Template::callsiteSubclassMethodref,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1094
                     Template::callsiteUnrelatedMethodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1095
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1096
    /*********************************
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1097
     * AbstractMethodError Templates *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1098
     *********************************/
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1099
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1100
    public static final Template ReabstractExpectedIface =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1101
        new Template("ReabstractExpectedIface",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1102
                     (builder) -> {},
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1103
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1104
                         final ClassData expected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1105
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1106
                         final ClassData.Package pck = expected.packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1107
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1108
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1109
                         final MethodData mdata =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1110
                             getMethodData(acc, MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1111
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1112
                         final int C2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1113
                         final int C1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1114
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1115
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1116
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1117
                         final ClassData expected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1118
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1119
                         final ClassData.Package pck = expected.packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1120
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1121
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1122
                         final MethodData mdata =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1123
                             getMethodData(acc, MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1124
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1125
                         final int C2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1126
                         final int C1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1127
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1128
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1129
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1130
    public static final Template ReabstractExpectedClass =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1131
        new Template("ReabstractExpectedClass",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1132
                     ReabstractExpectedIface,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1133
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1134
                         final ClassData expected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1135
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1136
                         final ClassData.Package pck = expected.packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1137
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1138
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1139
                         final MethodData mdata =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1140
                             getMethodData(acc, MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1141
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1142
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1143
                         final int C1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1144
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1145
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1146
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1147
                         final ClassData expected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1148
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1149
                         final ClassData.Package pck = expected.packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1150
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1151
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1152
                         final MethodData mdata =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1153
                             getMethodData(acc, MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1154
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1155
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1156
                         final int C1 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1157
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1158
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1159
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1160
    public static final Template ReabstractMethodrefResolvedClass =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1161
        new Template("ReabstractMethodrefResolvedClass",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1162
                    /* Case 1: Objectref overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1163
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1164
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1165
                     * C1[C2](res) = oref = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1166
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1167
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1168
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1169
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1170
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1171
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1172
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1173
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1174
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1175
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1176
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1177
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1178
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1179
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1180
                        builder.expected = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1181
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1182
                    /* Case 2: Objectref's super overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1183
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1184
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1185
                     * C2[C3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1186
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1187
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1188
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1189
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1190
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1191
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1192
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1193
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1194
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1195
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1196
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1197
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1198
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1199
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1200
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1201
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1202
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1203
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1204
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1205
                    /* Case 3: Objectref's super overrides, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1206
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1207
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1208
                     * C2[C3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1209
                     * C1[C2](priv) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1210
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1211
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1212
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1213
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1214
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1215
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1216
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1217
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1218
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1219
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1220
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1221
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1222
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1223
                        final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1224
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1225
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1226
                        final int C1 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1227
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1228
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1229
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1230
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1231
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1232
                    /* Case 4: Objectref's super overrides, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1233
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1234
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1235
                     * C2[C3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1236
                     * C1[C2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1237
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1238
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1239
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1240
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1241
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1242
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1243
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1244
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1245
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1246
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1247
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1248
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1249
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1250
                        final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1251
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1252
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1253
                        final int C1 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1254
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1255
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1256
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1257
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1258
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1259
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1260
    public static final Template ReabstractMethodrefResolvedIface =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1261
        new Template("ReabstractMethodrefResolvedIface",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1262
                    /* Case 1: Objectref overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1263
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1264
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1265
                     * C1[C2](res) = oref = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1266
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1267
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1268
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1269
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1270
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1271
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1272
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1273
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1274
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1275
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1276
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1277
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1278
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1279
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1280
                        builder.expected = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1281
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1282
                    /* Case 2: Objectref's super overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1283
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1284
                     * C3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1285
                     * C2[C3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1286
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1287
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1288
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1289
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1290
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1291
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1292
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1293
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1294
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1295
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1296
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1297
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1298
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1299
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1300
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1301
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1302
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1303
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1304
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1305
                    /* Case 3: Objectref's super overrides, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1306
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1307
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1308
                     * C2[C3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1309
                     * C1[C2](priv) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1310
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1311
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1312
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1313
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1314
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1315
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1316
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1317
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1318
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1319
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1320
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1321
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1322
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1323
                        final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1324
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1325
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1326
                        final int C1 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1327
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1328
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1329
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1330
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1331
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1332
                    /* Case 4: Objectref's super overrides, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1333
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1334
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1335
                     * C2[C3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1336
                     * C1[C2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1337
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1338
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1339
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1340
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1341
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1342
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1343
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1344
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1345
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1346
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1347
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1348
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1349
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1350
                        final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1351
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1352
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1353
                        final int C1 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1354
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1355
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1356
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1357
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1358
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1359
                    /* Case 5: Overlapping with new interface overriding.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1360
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1361
                     * I2[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1362
                     * C2[*](*) = mref, I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1363
                     * C1[C2,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1364
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1365
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1366
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1367
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1368
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1369
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1370
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1371
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1372
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1373
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1374
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1375
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1376
                        final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1377
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1378
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1379
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1380
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1381
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1382
                        builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1383
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1384
                    /* Case 6: Overlapping with new interface, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1385
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1386
                     * I2[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1387
                     * C2[*](*) = mref, I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1388
                     * C1[C2,I2](priv) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1389
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1390
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1391
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1392
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1393
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1394
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1395
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1396
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1397
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1398
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1399
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1400
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1401
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1402
                        final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1403
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1404
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1405
                        final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1406
                        final int C1 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1407
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1408
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1409
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1410
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1411
                        builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1412
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1413
                    /* Case 7: Overlapping with new interface, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1414
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1415
                     * I2[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1416
                     * C2[*](*) = mref, I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1417
                     * C1[C2,I2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1418
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1419
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1420
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1421
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1422
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1423
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1424
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1425
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1426
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1427
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1428
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1429
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1430
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1431
                        final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1432
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1433
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1434
                        final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1435
                        final int C1 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1436
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1437
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1438
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1439
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1440
                        builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1441
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1442
                    /* Case 8: Overlap with objectref's super with new
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1443
                     * interface overriding, inherit through class.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1444
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1445
                     * I2[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1446
                     * C3[](*) = mref, I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1447
                     * C2[C3,I1]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1448
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1449
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1450
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1451
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1452
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1453
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1454
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1455
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1456
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1457
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1458
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1459
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1460
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1461
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1462
                        final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1463
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1464
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1465
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1466
                        builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1467
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1468
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1469
                        builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1470
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1471
                    /* Case 9: Overlap with objectref's super with new
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1472
                     * interface double diamond, overriding.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1473
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1474
                     * I3[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1475
                     * C3[](*) = mref, I2[I3](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1476
                     * C2[C3,I2](), I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1477
                     * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1478
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1479
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1480
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1481
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1482
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1483
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1484
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1485
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1486
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1487
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1488
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1489
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1490
                        final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1491
                        final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1492
                        final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1493
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1494
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1495
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1496
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1497
                        builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1498
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1499
                        builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1500
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1501
                        builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1502
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1503
                    /* Case 10: Overlap with objectref's super with new
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1504
                     * interface double diamond, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1505
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1506
                     * I3[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1507
                     * C3[](*) = mref, I2[I3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1508
                     * C2[C3,I2](), I1[I2](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1509
                     * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1510
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1511
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1512
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1513
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1514
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1515
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1516
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1517
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1518
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1519
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1520
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1521
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1522
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1523
                        final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1524
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1525
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1526
                        final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1527
                        final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1528
                        final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1529
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1530
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1531
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1532
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1533
                        builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1534
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1535
                        builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1536
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1537
                        builder.expected = I2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1538
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1539
                    /* Case 11: Overlap with objectref's super with new
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1540
                     * interface double diamond, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1541
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1542
                     * I3[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1543
                     * C3[](*) = mref, I2[I3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1544
                     * C2[C3,I2](), I1[I2](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1545
                     * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1546
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1547
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1548
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1549
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1550
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1551
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1552
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1553
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1554
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1555
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1556
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1557
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1558
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1559
                        final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1560
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1561
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1562
                        final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1563
                        final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1564
                        final int I1 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1565
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1566
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1567
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1568
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1569
                        builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1570
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1571
                        builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1572
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1573
                        builder.expected = I2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1574
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1575
                    /* Case 12: Objectref's super overrides, skip interface below.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1576
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1577
                     * C3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1578
                     * C2[C3](res) = expected, I[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1579
                     * C1[C2,I]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1580
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1581
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1582
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1583
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1584
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1585
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1586
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1587
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1588
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1589
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1590
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1591
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1592
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1593
                        final int I = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1594
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1595
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1596
                        builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1597
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1598
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1599
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1600
                    /* Case 13: Objectref's super overrides, skip interface above.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1601
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1602
                     * C3[](*) = mref, I[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1603
                     * C2[C3,I](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1604
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1605
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1606
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1607
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1608
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1609
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1610
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1611
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1612
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1613
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1614
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1615
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1616
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1617
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1618
                        final int I = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1619
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1620
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1621
                        builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1622
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1623
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1624
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1625
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1626
    public static final Template ReabstractIfaceMethodrefResolved =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1627
        new Template("ReabstractIfaceMethodrefResolved",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1628
                     /* Case 1: Objectref overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1629
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1630
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1631
                      * C[I](res) = oref = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1632
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1633
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1634
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1635
                             builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1636
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1637
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1638
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1639
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1640
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1641
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1642
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1643
                         final int C = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1644
                         builder.hier.addInherit(C, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1645
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1646
                         builder.expected = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1647
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1648
                     /* Case 2: Diamond, methodref at top, overriding.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1649
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1650
                      * I3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1651
                      * I1[I3](), I2[I3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1652
                      * C[I1,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1653
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1654
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1655
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1656
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1657
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1658
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1659
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1660
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1661
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1662
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1663
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1664
                         final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1665
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1666
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1667
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1668
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1669
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1670
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1671
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1672
                         builder.expected = I2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1673
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1674
                     /* Case 3: Diamond, methodref at top, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1675
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1676
                      * I3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1677
                      * I1[I3](), I2[I3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1678
                      * C[I1,I2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1679
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1680
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1681
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1682
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1683
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1684
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1685
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1686
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1687
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1688
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1689
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1690
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1691
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1692
                        final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1693
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1694
                         final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1695
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1696
                         final int C = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1697
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1698
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1699
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1700
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1701
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1702
                         builder.expected = I2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1703
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1704
                     /* Case 4: Diamond, with superclass, methodref at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1705
                      * class overriding.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1706
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1707
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1708
                      * C2[I2](res) = expected, I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1709
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1710
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1711
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1712
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1713
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1714
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1715
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1716
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1717
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1718
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1719
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1720
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1721
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1722
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1723
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1724
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1725
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1726
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1727
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1728
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1729
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1730
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1731
                     /* Case 5: Diamond, with superclass, methodref at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1732
                      * class overriding, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1733
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1734
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1735
                      * C2[I2](res) = expected, I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1736
                      * C1[I1,C2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1737
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1738
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1739
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1740
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1741
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1742
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1743
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1744
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1745
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1746
                            new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1747
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1748
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1749
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1750
                        final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1751
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1752
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1753
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1754
                         final int C1 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1755
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1756
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1757
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1758
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1759
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1760
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1761
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1762
                     /* Case 6: Diamond, with superclass, expected at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1763
                      * interface overriding
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1764
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1765
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1766
                      * C2[I2](), I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1767
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1768
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1769
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1770
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1771
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1772
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1773
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1774
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1775
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1776
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1777
                             new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1778
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1779
                         final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1780
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1781
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1782
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1783
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1784
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1785
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1786
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1787
                         builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1788
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1789
                     /* Case 7: Diamond, with superclass, expected at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1790
                      * interface skip static
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1791
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1792
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1793
                      * C2[I2](), I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1794
                      * C1[I1,C2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1795
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1796
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1797
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1798
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1799
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1800
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1801
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1802
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1803
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1804
                             new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1805
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1806
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1807
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1808
                         final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1809
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1810
                         final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1811
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1812
                         final int C1 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1813
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1814
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1815
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1816
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1817
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1818
                         builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1819
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1820
                     /* Case 8: Y, with superclass, overlaping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1821
                      * at top, class overrides
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1822
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1823
                      * C2[I2](res) = expected, I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1824
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1825
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1826
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1827
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1828
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1829
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1830
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1831
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1832
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1833
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1834
                             new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1835
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1836
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1837
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1838
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1839
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1840
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1841
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1842
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1843
                     /* Case 9: Diamond, with superclass, overlaping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1844
                      * at top, class overrides
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1845
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1846
                      * I2[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1847
                      * C2[I2](res) = expected, I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1848
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1849
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1850
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1851
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1852
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1853
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1854
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1855
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1856
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1857
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1858
                             new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1859
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1860
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1861
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1862
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1863
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1864
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1865
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1866
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1867
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1868
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1869
                     /* Case 10: Diamond, with superclass, overlaping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1870
                      * at top, class overrides, skipping static
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1871
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1872
                      * I2[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1873
                      * C2[I2](res) = expected, I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1874
                      * C1[I1,C2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1875
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1876
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1877
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1878
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1879
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1880
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1881
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1882
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1883
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1884
                             new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1885
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1886
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1887
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1888
                         final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1889
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1890
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1891
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1892
                         final int C1 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1893
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1894
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1895
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1896
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1897
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1898
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1899
                     /* Case 11: Superclass overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1900
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1901
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1902
                      * C2[I](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1903
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1904
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1905
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1906
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1907
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1908
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1909
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1910
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1911
                             new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1912
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1913
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1914
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1915
                         builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1916
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1917
                         builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1918
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1919
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1920
                     /* Case 12: Superclass overrides, skipping static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1921
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1922
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1923
                      * C2[I](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1924
                      * C1[C2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1925
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1926
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1927
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1928
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1929
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1930
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1931
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1932
                             new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1933
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1934
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1935
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1936
                         final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1937
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1938
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1939
                         final int C1 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1940
                         builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1941
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1942
                         builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1943
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1944
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1945
                     /* Case 13: Double diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1946
                      * superclass, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1947
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1948
                      * I3[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1949
                      * C3[I3](), I2[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1950
                      * C2[I2,C3](), I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1951
                      * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1952
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1953
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1954
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1955
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1956
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1957
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1958
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1959
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1960
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1961
                             new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1962
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1963
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1964
                         final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1965
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1966
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1967
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1968
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1969
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1970
                         builder.hier.addInherit(C3, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1971
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1972
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1973
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1974
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1975
                         builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1976
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1977
                     /* Case 14: Double diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1978
                      * superclass, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1979
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1980
                      * I3[](def) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1981
                      * C3[I3](), I2[*](*) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1982
                      * C2[I2,C3](), I1[I2](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1983
                      * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1984
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1985
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1986
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1987
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1988
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1989
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1990
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1991
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1992
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1993
                             new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1994
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1995
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1996
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1997
                         final ClassData withPrivDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1998
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  1999
                         final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2000
                         final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2001
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2002
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2003
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2004
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2005
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2006
                         builder.hier.addInherit(C3, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2007
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2008
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2009
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2010
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2011
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2012
                         builder.expected = I2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2013
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2014
                     /* Case 15: Double diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2015
                      * superclass, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2016
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2017
                      * I3[](def) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2018
                      * C3[I3](), I2[*](*) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2019
                      * C2[I2,C3](), I1[I2](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2020
                      * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2021
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2022
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2023
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2024
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2025
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2026
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2027
                         final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2028
                             builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2029
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2030
                             new ClassData(pck, new MethodData(acc, MethodData.Context.ABSTRACT));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2031
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2032
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2033
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2034
                         final ClassData withStatDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2035
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2036
                         final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2037
                         final int I1 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2038
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2039
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2040
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2041
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2042
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2043
                         builder.hier.addInherit(C3, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2044
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2045
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2046
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2047
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2048
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2049
                         builder.expected = I2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2050
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2051
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2052
    /******************************
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2053
     *    Abstract Overrides      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2054
     ******************************/
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2055
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2056
    public static final Template OverrideAbstractExpectedIface =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2057
        Template.ResolutionOverride(EnumSet.of(Template.Kind.INTERFACE),
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2058
                                    EnumSet.of(MethodData.Access.PUBLIC),
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2059
                                    EnumSet.allOf(MethodData.Context.class),
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2060
                                    EnumSet.of(ClassData.Package.SAME));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2061
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2062
    public static final Template OverrideAbstractExpectedClass =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2063
        Template.ResolutionOverride(EnumSet.allOf(Template.Kind.class),
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2064
                                    EnumSet.of(MethodData.Access.PUBLIC),
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2065
                                    EnumSet.allOf(MethodData.Context.class),
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2066
                                    EnumSet.of(ClassData.Package.SAME));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2067
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2068
    public static final Template SelectionOverrideAbstract =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2069
        new Template("SelectionOverrideAbstract",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2070
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2071
                         final ClassData expected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2072
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2073
                         final MethodData olddef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2074
                             expected.methoddata;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2075
                         if (MethodData.Context.ABSTRACT == olddef.context) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2076
                             final ClassData.Package pck = expected.packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2077
                             final MethodData.Access acc = olddef.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2078
                             final MethodData mdata =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2079
                                 getMethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2080
                                               MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2081
                             final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2082
                             final int C2 = builder.objectref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2083
                             final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2084
                             builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2085
                             builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2086
                             builder.expected = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2087
                         }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2088
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2089
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2090
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2091
    /******************************
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2092
     * Ignored Abstract Templates *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2093
     ******************************/
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2094
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2095
    public static final Template IgnoredAbstract =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2096
        new Template("IgnoredAbstract",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2097
                     (builder) -> {},
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2098
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2099
                         final ClassData methodref =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2100
                             builder.classdata.get(builder.methodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2101
                         final ClassData.Package pck = methodref.packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2102
                         final MethodData mdata =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2103
                             getMethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2104
                                           MethodData.Context.ABSTRACT);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2105
                         final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2106
                         final int C2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2107
                         final int C1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2108
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2109
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2110
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2111
    /******************************
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2112
     *     Selection Templates    *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2113
     ******************************/
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2114
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2115
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2116
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2117
    public static final Template TrivialObjectref =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2118
        new Template("TrivialObjectref",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2119
                     Collections.singleton((builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2120
                             builder.objectref = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2121
                         }));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2122
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2123
    public static final Template TrivialObjectrefNotEqualMethodref =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2124
        new Template("TrivialObjectrefNotEqualMethodref",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2125
                     Collections.singleton(
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2126
                         (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2127
                             final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2128
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2129
                             final ClassData.Package pck = oldexpected.packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2130
                             final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2131
                             final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2132
                             builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2133
                             builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2134
                         }));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2135
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2136
    public static final Template MethodrefSelectionResolvedIsClassNoOverride =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2137
        new Template("MethodrefSelectionResolvedIsClassNoOverride",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2138
                    /* Trivial.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2139
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2140
                     * C[](*) = mref = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2141
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2142
                    (builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2143
                        builder.objectref = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2144
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2145
                    /* Case 1: Inherit from super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2146
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2147
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2148
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2149
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2150
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2151
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2152
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2153
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2154
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2155
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2156
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2157
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2158
                    /* Case 2: Objectref has private def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2159
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2160
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2161
                     * C1[C2](priv) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2162
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2163
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2164
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2165
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2166
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2167
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2168
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2169
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2170
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2171
                        final ClassData withDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2172
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2173
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2174
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2175
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2176
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2177
                    /* Case 3: Objectref has static def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2178
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2179
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2180
                     * C1[C2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2181
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2182
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2183
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2184
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2185
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2186
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2187
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2188
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2189
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2190
                        final ClassData withDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2191
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2192
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2193
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2194
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2195
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2196
                    /* Case 4: Skip inherit from interface.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2197
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2198
                     * C2[](*) = mref, I[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2199
                     * C1[C2,I]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2200
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2201
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2202
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2203
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2204
                        final ClassData.Package pck = oldexpected.packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2205
                        final MethodData.Context ctx =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2206
                            builder.classdata.get(builder.expected).methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2207
                        final MethodData.Access acc =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2208
                            builder.classdata.get(builder.expected).methoddata.access;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2209
                        final MethodData mdata = getMethodData(acc, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2210
                        final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2211
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2212
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2213
                        final int I = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2214
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2215
                        builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2216
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2217
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2218
                    /* Case 5: Objectref's super has a private def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2219
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2220
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2221
                     * C2[C3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2222
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2223
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2224
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2225
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2226
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2227
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2228
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2229
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2230
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2231
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2232
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2233
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2234
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2235
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2236
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2237
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2238
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2239
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2240
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2241
                    /* Case 6: Objectref's super has a static def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2242
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2243
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2244
                     * C2[C3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2245
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2246
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2247
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2248
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2249
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2250
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2251
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2252
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2253
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2254
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2255
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2256
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2257
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2258
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2259
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2260
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2261
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2262
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2263
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2264
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2265
    public static final Template MethodrefSelectionResolvedIsClassOverride =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2266
        new Template("MethodrefSelectionResolvedIsClassOverride",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2267
                    /* Case 7: Objectref overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2268
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2269
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2270
                     * C1[C2](res) = oref = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2271
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2272
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2273
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2274
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2275
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2276
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2277
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2278
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2279
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2280
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2281
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2282
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2283
                        builder.expected = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2284
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2285
                    /* Case 8: Objectref's super overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2286
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2287
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2288
                     * C2[C3](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2289
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2290
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2291
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2292
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2293
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2294
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2295
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2296
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2297
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2298
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2299
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2300
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2301
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2302
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2303
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2304
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2305
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2306
                    /* Case 9: Objectref's super overrides,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2307
                     *         objectref has a private def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2308
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2309
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2310
                     * C2[C3](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2311
                     * C1[C2](priv) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2312
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2313
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2314
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2315
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2316
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2317
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2318
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2319
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2320
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2321
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2322
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2323
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2324
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2325
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2326
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2327
                        final int C1 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2328
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2329
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2330
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2331
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2332
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2333
                    /* Case 10: Objectref's super overrides,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2334
                     *          objectref has a static def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2335
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2336
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2337
                     * C2[C3](res)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2338
                     * C1[C2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2339
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2340
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2341
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2342
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2343
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2344
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2345
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2346
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2347
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2348
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2349
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2350
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2351
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2352
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2353
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2354
                        final int C1 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2355
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2356
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2357
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2358
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2359
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2360
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2361
    public static final Template MethodrefSelectionResolvedIsClass =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2362
        new Template("MethodrefSelectionResolvedIsClass",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2363
                     MethodrefSelectionResolvedIsClassNoOverride,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2364
                     MethodrefSelectionResolvedIsClassOverride);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2365
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2366
    public static final Template MethodrefSelectionPackageSkipNoOverride =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2367
        new Template("MethodrefSelectionPackageSkipNoOverride",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2368
                     MethodrefSelectionResolvedIsClass,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2369
                    /* Case 11: Objectref has public def in other package.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2370
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2371
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2372
                     * Other.C1[C2](pub) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2373
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2374
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2375
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2376
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2377
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2378
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2379
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2380
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2381
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2382
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2383
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2384
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2385
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2386
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2387
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2388
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2389
                    /* Case 12: Objectref has package private def in other package.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2390
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2391
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2392
                     * Other.C1[C2](pack) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2393
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2394
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2395
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2396
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2397
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2398
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2399
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2400
                            new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2401
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2402
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2403
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2404
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2405
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2406
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2407
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2408
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2409
                    /* Case 13: Objectref has protected def in other package.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2410
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2411
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2412
                     * Other.C1[C2](prot) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2413
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2414
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2415
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2416
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2417
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2418
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2419
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2420
                            new MethodData(MethodData.Access.PROTECTED,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2421
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2422
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2423
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2424
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2425
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2426
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2427
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2428
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2429
                    /* Case 14: Objectref's super has a public def in other package.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2430
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2431
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2432
                     * Other.C2[C3](pub) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2433
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2434
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2435
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2436
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2437
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2438
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2439
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2440
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2441
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2442
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2443
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2444
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2445
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2446
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2447
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2448
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2449
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2450
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2451
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2452
                    /* Case 15: Objectref's super has a package
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2453
                     * private def in other package.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2454
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2455
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2456
                     * Other.C2[C3](pack) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2457
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2458
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2459
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2460
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2461
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2462
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2463
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2464
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2465
                            new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2466
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2467
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2468
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2469
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2470
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2471
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2472
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2473
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2474
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2475
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2476
                    /* Case 16: Objectref's super has a protected def
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2477
                     * in other package.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2478
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2479
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2480
                     * Other.C2[C3](pack) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2481
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2482
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2483
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2484
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2485
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2486
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2487
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2488
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2489
                            new MethodData(MethodData.Access.PROTECTED,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2490
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2491
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2492
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2493
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2494
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2495
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2496
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2497
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2498
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2499
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2500
                    /* Case 18: Objectref's has a public def in other
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2501
                     * package, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2502
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2503
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2504
                     * Other.C2[C3](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2505
                     * C1[C2](pub) = oref, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2506
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2507
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2508
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2509
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2510
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2511
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2512
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2513
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2514
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2515
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2516
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2517
                        final MethodData privmeth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2518
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2519
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2520
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2521
                            new ClassData(pck, privmeth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2522
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2523
                        final int C2 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2524
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2525
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2526
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2527
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2528
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2529
                    /* Case 19: Objectref's has a package private def in other
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2530
                     * package, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2531
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2532
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2533
                     * Other.C2[C3](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2534
                     * C1[C2](pack) = oref, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2535
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2536
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2537
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2538
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2539
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2540
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2541
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2542
                            new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2543
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2544
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2545
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2546
                        final MethodData privmeth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2547
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2548
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2549
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2550
                            new ClassData(pck, privmeth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2551
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2552
                        final int C2 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2553
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2554
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2555
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2556
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2557
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2558
                    /* Case 20: Objectref's has a protected def in other
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2559
                     * package, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2560
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2561
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2562
                     * Other.C2[C3](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2563
                     * C1[C2](pro) = oref, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2564
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2565
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2566
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2567
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2568
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2569
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2570
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2571
                            new MethodData(MethodData.Access.PROTECTED,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2572
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2573
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2574
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2575
                        final MethodData privmeth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2576
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2577
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2578
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2579
                            new ClassData(pck, privmeth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2580
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2581
                        final int C2 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2582
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2583
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2584
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2585
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2586
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2587
                    /* Case 21: Objectref's super has a public def in other
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2588
                     * package, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2589
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2590
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2591
                     * Other.C2[C3](pub) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2592
                     * C1[C2](priv) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2593
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2594
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2595
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2596
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2597
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2598
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2599
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2600
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2601
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2602
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2603
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2604
                        final MethodData privmeth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2605
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2606
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2607
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2608
                            new ClassData(pck, privmeth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2609
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2610
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2611
                        final int C1 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2612
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2613
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2614
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2615
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2616
                    /* Case 22: Objectref's superhas a package private
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2617
                     * def in other package, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2618
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2619
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2620
                     * Other.C2[C3](pack) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2621
                     * C1[C2](priv) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2622
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2623
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2624
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2625
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2626
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2627
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2628
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2629
                            new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2630
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2631
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2632
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2633
                        final MethodData privmeth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2634
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2635
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2636
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2637
                            new ClassData(pck, privmeth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2638
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2639
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2640
                        final int C1 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2641
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2642
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2643
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2644
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2645
                    /* Case 23: Objectref's super has a protected def
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2646
                     * in other package, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2647
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2648
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2649
                     * Other.C2[C3](pro) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2650
                     * C1[C2](priv) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2651
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2652
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2653
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2654
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2655
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2656
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2657
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2658
                            new MethodData(MethodData.Access.PROTECTED,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2659
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2660
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2661
                            new ClassData(ClassData.Package.OTHER, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2662
                        final MethodData privmeth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2663
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2664
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2665
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2666
                            new ClassData(pck, privmeth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2667
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2668
                        final int C2 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2669
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2670
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2671
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2672
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2673
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2674
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2675
    public static final Template MethodrefSelectionPackageSkip =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2676
        new Template("MethodrefSelectionPackageSkip",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2677
                     MethodrefSelectionPackageSkipNoOverride,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2678
                    /* Case 17: Transitive override.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2679
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2680
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2681
                     * C2[C3](pub)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2682
                     * Other.C1[C2](pack) = oref, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2683
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2684
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2685
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2686
                            builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2687
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2688
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2689
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2690
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2691
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2692
                        final MethodData packmeth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2693
                            new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2694
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2695
                        final ClassData withPubDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2696
                        final ClassData withPackDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2697
                            new ClassData(ClassData.Package.OTHER, packmeth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2698
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2699
                        final int C2 = builder.addClass(withPubDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2700
                        final int C1 = builder.addClass(withPackDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2701
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2702
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2703
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2704
                        builder.expected = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2705
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2706
                    /* Case 24: Transitive override, skip private in between.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2707
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2708
                     * C4[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2709
                     * C3[C4](pub)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2710
                     * C2[C3](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2711
                     * Other.C1[C2](pack) = oref, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2712
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2713
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2714
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2715
                            builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2716
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2717
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2718
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2719
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2720
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2721
                        final MethodData packmeth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2722
                            new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2723
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2724
                        final ClassData withPubDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2725
                        final ClassData withPackDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2726
                            new ClassData(ClassData.Package.OTHER, packmeth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2727
                        final MethodData privmeth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2728
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2729
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2730
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2731
                            new ClassData(pck, privmeth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2732
                        final int C4 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2733
                        final int C3 = builder.addClass(withPubDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2734
                        final int C2 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2735
                        final int C1 = builder.addClass(withPackDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2736
                        builder.hier.addInherit(C3, C4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2737
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2738
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2739
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2740
                        builder.expected = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2741
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2742
                    /* Case 25: Transitive override, skip private in between.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2743
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2744
                     * C4[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2745
                     * C3[C4](pub)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2746
                     * Other.C2[C3](pack) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2747
                     * C1[C2](pack) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2748
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2749
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2750
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2751
                            builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2752
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2753
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2754
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2755
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2756
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2757
                        final MethodData packmeth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2758
                            new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2759
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2760
                        final ClassData withPubDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2761
                        final ClassData withPackDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2762
                            new ClassData(ClassData.Package.OTHER, packmeth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2763
                        final MethodData privmeth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2764
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2765
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2766
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2767
                            new ClassData(pck, privmeth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2768
                        final int C4 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2769
                        final int C3 = builder.addClass(withPubDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2770
                        final int C2 = builder.addClass(withPackDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2771
                        final int C1 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2772
                        builder.hier.addInherit(C3, C4);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2773
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2774
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2775
                        builder.objectref = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2776
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2777
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2778
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2779
    public static final Template MethodrefSelectionResolvedIsIfaceNoOverride =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2780
        new Template("MethodrefSelectionResolvedIsIfaceNoOverride",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2781
                    /* Trivial objectref.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2782
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2783
                     * C[](*) = mref = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2784
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2785
                    (builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2786
                        builder.objectref = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2787
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2788
                    /* Case 1: Inherit from super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2789
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2790
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2791
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2792
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2793
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2794
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2795
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2796
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2797
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2798
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2799
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2800
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2801
                    /* Case 2: Objectref has private def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2802
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2803
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2804
                     * C1[C2](priv) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2805
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2806
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2807
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2808
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2809
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2810
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2811
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2812
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2813
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2814
                        final ClassData withDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2815
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2816
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2817
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2818
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2819
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2820
                    /* Case 3: Objectref has static def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2821
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2822
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2823
                     * C1[C2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2824
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2825
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2826
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2827
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2828
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2829
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2830
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2831
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2832
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2833
                        final ClassData withDef = new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2834
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2835
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2836
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2837
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2838
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2839
                    /* Case 4: Overlapping.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2840
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2841
                     * I[*](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2842
                     * C2[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2843
                     * C1[C2,I]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2844
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2845
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2846
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2847
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2848
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2849
                        final int I = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2850
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2851
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2852
                        builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2853
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2854
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2855
                    /* Case 5: Overlapping with new interface.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2856
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2857
                     * I2[*](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2858
                     * C2[*](*) = mref, I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2859
                     * C1[C2,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2860
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2861
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2862
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2863
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2864
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2865
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2866
                        final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2867
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2868
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2869
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2870
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2871
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2872
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2873
                    /* Case 6: Overlapping with new interface with private def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2874
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2875
                     * I2[*](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2876
                     * C2[*](*) = mref, I1[I2](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2877
                     * C1[C2,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2878
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2879
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2880
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2881
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2882
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2883
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2884
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2885
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2886
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2887
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2888
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2889
                        final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2890
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2891
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2892
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2893
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2894
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2895
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2896
                    /* Case 7: Overlapping with new interface with static def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2897
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2898
                     * I2[*](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2899
                     * C2[*](*) = mref, I1[I2](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2900
                     * C1[C2,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2901
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2902
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2903
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2904
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2905
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2906
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2907
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2908
                        final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2909
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2910
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2911
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2912
                        final int I1 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2913
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2914
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2915
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2916
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2917
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2918
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2919
                    /* Case 8: Objectref's super has a private def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2920
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2921
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2922
                     * C2[C3](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2923
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2924
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2925
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2926
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2927
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2928
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2929
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2930
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2931
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2932
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2933
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2934
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2935
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2936
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2937
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2938
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2939
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2940
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2941
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2942
                    /* Case 9: Objectref's super has a static def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2943
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2944
                     * C3[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2945
                     * C2[C3](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2946
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2947
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2948
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2949
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2950
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2951
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2952
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2953
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2954
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2955
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2956
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2957
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2958
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2959
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2960
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2961
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2962
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2963
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2964
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2965
                    /* Case 10: Overlap with objectref's super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2966
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2967
                     * I[*](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2968
                     * C3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2969
                     * C2[C3,I]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2970
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2971
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2972
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2973
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2974
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2975
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2976
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2977
                        final int I = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2978
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2979
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2980
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2981
                        builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2982
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2983
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2984
                    /* Case 11: Overlap with objectref's super with new interface.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2985
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2986
                     * I2[*](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2987
                     * C3[](*) = mref, I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2988
                     * C2[C3,I1]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2989
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2990
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2991
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2992
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2993
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2994
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2995
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2996
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2997
                        final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2998
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  2999
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3000
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3001
                        builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3002
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3003
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3004
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3005
                    /* Case 12: Overlap with objectref's super with new
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3006
                     * interface with private def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3007
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3008
                     * I2[*](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3009
                     * C3[](*) = mref, I1[I2](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3010
                     * C2[C3,I1]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3011
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3012
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3013
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3014
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3015
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3016
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3017
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3018
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3019
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3020
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3021
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3022
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3023
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3024
                        final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3025
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3026
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3027
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3028
                        builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3029
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3030
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3031
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3032
                    /* Case 13: Overlap with objectref's super with new
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3033
                     * interface with static def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3034
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3035
                     * I2[*](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3036
                     * C3[](*) = mref, I1[I2](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3037
                     * C2[C3,I1]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3038
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3039
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3040
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3041
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3042
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3043
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3044
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3045
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3046
                        final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3047
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3048
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3049
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3050
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3051
                        final int I1 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3052
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3053
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3054
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3055
                        builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3056
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3057
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3058
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3059
                    /* Case 14: Overlap with objectref's super with new
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3060
                     * interface double diamond.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3061
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3062
                     * I3[*](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3063
                     * C3[](*) = mref, I2[I3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3064
                     * C2[C3,I2](), I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3065
                     * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3066
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3067
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3068
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3069
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3070
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3071
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3072
                        final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3073
                        final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3074
                        final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3075
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3076
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3077
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3078
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3079
                        builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3080
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3081
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3082
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3083
                    /* Case 15: Overlapping with new interface with private def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3084
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3085
                     * C2[*](*) = mref, I1[](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3086
                     * C1[C2,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3087
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3088
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3089
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3090
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3091
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3092
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3093
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3094
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3095
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3096
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3097
                        final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3098
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3099
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3100
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3101
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3102
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3103
                    /* Case 16: Overlapping with new interface with static def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3104
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3105
                     * C2[*](*) = mref, I1[](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3106
                     * C1[C2,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3107
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3108
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3109
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3110
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3111
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3112
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3113
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3114
                        final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3115
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3116
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3117
                        final int I1 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3118
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3119
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3120
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3121
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3122
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3123
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3124
    public static final Template MethodrefSelectionResolvedIsIface =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3125
        new Template("MethodrefSelectionResolvedIsIface",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3126
                     MethodrefSelectionResolvedIsIfaceNoOverride,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3127
                    /* Case 17: Objectref overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3128
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3129
                     * C2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3130
                     * C1[C2](res) = oref = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3131
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3132
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3133
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3134
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3135
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3136
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3137
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3138
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3139
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3140
                        final int C1 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3141
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3142
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3143
                        builder.expected = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3144
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3145
                    /* Case 18: Overlapping with new interface overriding.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3146
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3147
                     * I2[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3148
                     * C2[*](*) = mref, I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3149
                     * C1[C2,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3150
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3151
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3152
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3153
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3154
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3155
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3156
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3157
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3158
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3159
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3160
                        final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3161
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3162
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3163
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3164
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3165
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3166
                        builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3167
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3168
                    /* Case 19: Objectref's super overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3169
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3170
                     * C3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3171
                     * C2[C3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3172
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3173
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3174
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3175
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3176
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3177
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3178
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3179
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3180
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3181
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3182
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3183
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3184
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3185
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3186
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3187
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3188
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3189
                    /* Case 20: Overlap with objectref's super with
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3190
                     * new interface overriding.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3191
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3192
                     * I2[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3193
                     * C3[](*) = mref, I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3194
                     * C2[C3,I1]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3195
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3196
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3197
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3198
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3199
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3200
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3201
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3202
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3203
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3204
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3205
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3206
                        final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3207
                        final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3208
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3209
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3210
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3211
                        builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3212
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3213
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3214
                        builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3215
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3216
                    /* Case 21: Overlap with objectref's super with new
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3217
                     * interface double diamond, overriding.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3218
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3219
                     * I3[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3220
                     * C3[](*) = mref, I2[I3](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3221
                     * C2[C3,I2](), I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3222
                     * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3223
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3224
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3225
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3226
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3227
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3228
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3229
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3230
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3231
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3232
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3233
                        final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3234
                        final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3235
                        final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3236
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3237
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3238
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3239
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3240
                        builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3241
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3242
                        builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3243
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3244
                        builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3245
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3246
                    /* Case 22: Objectref's super overrides, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3247
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3248
                     * C3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3249
                     * C2[C3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3250
                     * C1[C2](priv) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3251
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3252
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3253
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3254
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3255
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3256
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3257
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3258
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3259
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3260
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3261
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3262
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3263
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3264
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3265
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3266
                        final int C1 = builder.addClass(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3267
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3268
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3269
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3270
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3271
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3272
                    /* Case 23: Objectref's super overrides, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3273
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3274
                     * C3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3275
                     * C2[C3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3276
                     * C1[C2](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3277
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3278
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3279
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3280
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3281
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3282
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3283
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3284
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3285
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3286
                        final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3287
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3288
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3289
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3290
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3291
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3292
                        final int C1 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3293
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3294
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3295
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3296
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3297
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3298
                    /* Case 24: Overlap with objectref's super with new
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3299
                     * interface double diamond, overriding, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3300
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3301
                     * I3[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3302
                     * C3[](*) = mref, I2[I3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3303
                     * C2[C3,I2](), I1[I2](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3304
                     * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3305
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3306
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3307
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3308
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3309
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3310
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3311
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3312
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3313
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3314
                            new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3315
                                           MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3316
                        final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3317
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3318
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3319
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3320
                        final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3321
                        final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3322
                        final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3323
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3324
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3325
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3326
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3327
                        builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3328
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3329
                        builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3330
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3331
                        builder.expected = I2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3332
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3333
                    /* Case 25: Overlap with objectref's super with new
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3334
                     * interface double diamond, overriding, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3335
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3336
                     * I3[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3337
                     * C3[](*) = mref, I2[I3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3338
                     * C2[C3,I2](), I1[I2](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3339
                     * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3340
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3341
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3342
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3343
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3344
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3345
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3346
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3347
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3348
                        final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3349
                            new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3350
                                           MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3351
                        final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3352
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3353
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3354
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3355
                        final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3356
                        final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3357
                        final int I1 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3358
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3359
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3360
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3361
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3362
                        builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3363
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3364
                        builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3365
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3366
                        builder.expected = I2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3367
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3368
                    /* Case 26: Skip interface method after class overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3369
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3370
                     * C3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3371
                     * C2[C3](res) = expected, I[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3372
                     * C1[C2, I]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3373
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3374
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3375
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3376
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3377
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3378
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3379
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3380
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3381
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3382
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3383
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3384
                        final int I = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3385
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3386
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3387
                        builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3388
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3389
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3390
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3391
                    /* Case 27: Skip interface method after class overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3392
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3393
                     * C3[](*) = mref, I[](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3394
                     * C2[C3,I](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3395
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3396
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3397
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3398
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3399
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3400
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3401
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3402
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3403
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3404
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3405
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3406
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3407
                        final int I = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3408
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3409
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3410
                        builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3411
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3412
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3413
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3414
                    /* Case 28: Overlap with objectref's super with new
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3415
                     * interface double diamond, overriding.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3416
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3417
                     * I3[*](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3418
                     * C3[](*) = mref, I2[I3](def)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3419
                     * C2[C3,I2](res) = expected, I1[I2](def) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3420
                     * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3421
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3422
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3423
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3424
                            builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3425
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3426
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3427
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3428
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3429
                        final int C3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3430
                        final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3431
                        final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3432
                        final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3433
                        final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3434
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3435
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3436
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3437
                        builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3438
                        builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3439
                        builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3440
                        builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3441
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3442
                        builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3443
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3444
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3445
    public static final Template IfaceMethodrefSelectionNoOverride =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3446
        new Template("IfaceMethodrefSelectionNoOverride",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3447
                     /* Case 1: Inherit from super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3448
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3449
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3450
                      * C[I]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3451
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3452
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3453
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3454
                             builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3455
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3456
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3457
                         builder.hier.addInherit(C, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3458
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3459
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3460
                     /* Case 2: Objectref has static def
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3461
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3462
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3463
                      * C[I](stat) = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3464
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3465
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3466
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3467
                             builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3468
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3469
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3470
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3471
                         final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3472
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3473
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3474
                         final int C = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3475
                         builder.hier.addInherit(C, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3476
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3477
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3478
                     /* Case 3: Diamond, methodref at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3479
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3480
                      * I3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3481
                      * I1[I3](), I2[I3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3482
                      * C[I1,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3483
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3484
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3485
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3486
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3487
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3488
                         final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3489
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3490
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3491
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3492
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3493
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3494
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3495
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3496
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3497
                     /* Case 4: Diamond, methodref at top, skip private def
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3498
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3499
                      * I3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3500
                      * I1[I3](), I2[I3](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3501
                      * C[I1,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3502
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3503
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3504
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3505
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3506
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3507
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3508
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3509
                         final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3510
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3511
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3512
                         final int I2 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3513
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3514
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3515
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3516
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3517
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3518
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3519
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3520
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3521
                     /* Case 5: Diamond, methodref at top, skip static def
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3522
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3523
                      * I3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3524
                      * I1[I3](), I2[I3](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3525
                      * C[I1,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3526
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3527
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3528
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3529
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3530
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3531
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3532
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3533
                         final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3534
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3535
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3536
                         final int I2 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3537
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3538
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3539
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3540
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3541
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3542
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3543
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3544
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3545
                     /* Case 6: Diamond, overlap with resolution.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3546
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3547
                      * I3[](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3548
                      * I1[I3](), I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3549
                      * C[I1,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3550
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3551
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3552
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3553
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3554
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3555
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3556
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3557
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3558
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3559
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3560
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3561
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3562
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3563
                     /* Case 7: Diamond, with superclass, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3564
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3565
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3566
                      * C2[I2](), I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3567
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3568
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3569
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3570
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3571
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3572
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3573
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3574
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3575
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3576
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3577
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3578
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3579
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3580
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3581
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3582
                     /* Case 8: Diamond, with superclass, expected at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3583
                      * class has static def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3584
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3585
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3586
                      * C2[I2](stat), I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3587
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3588
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3589
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3590
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3591
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3592
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3593
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3594
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3595
                         final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3596
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3597
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3598
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3599
                         final int C2 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3600
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3601
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3602
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3603
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3604
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3605
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3606
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3607
                     /* Case 9: Diamond, with superclass, expected at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3608
                      * interface has private def
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3609
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3610
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3611
                      * C2[I2](), I1[I2](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3612
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3613
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3614
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3615
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3616
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3617
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3618
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3619
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3620
                         final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3621
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3622
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3623
                         final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3624
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3625
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3626
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3627
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3628
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3629
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3630
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3631
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3632
                     /* Case 10: Diamond, with superclass, expected at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3633
                      * interface has static def
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3634
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3635
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3636
                      * C2[I2](), I1[I2](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3637
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3638
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3639
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3640
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3641
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3642
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3643
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3644
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3645
                         final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3646
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3647
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3648
                         final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3649
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3650
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3651
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3652
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3653
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3654
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3655
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3656
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3657
                     /* Case 11: Y, with superclass, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3658
                      * at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3659
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3660
                      * C2[](), I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3661
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3662
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3663
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3664
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3665
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3666
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3667
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3668
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3669
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3670
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3671
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3672
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3673
                     /* Case 12: Y, with superclass, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3674
                      * at top, class has static def
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3675
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3676
                      * C2[](stat), I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3677
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3678
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3679
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3680
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3681
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3682
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3683
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3684
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3685
                         final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3686
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3687
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3688
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3689
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3690
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3691
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3692
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3693
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3694
                     /* Case 13: Diamond, with superclass, overlapping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3695
                      * at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3696
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3697
                      * I2[](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3698
                      * C2[I2](), I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3699
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3700
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3701
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3702
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3703
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3704
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3705
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3706
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3707
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3708
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3709
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3710
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3711
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3712
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3713
                     /* Case 14: Diamond, with superclass, overlapping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3714
                      * at top, class has static def
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3715
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3716
                      * I2[](def) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3717
                      * C2[I2](stat), I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3718
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3719
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3720
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3721
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3722
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3723
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3724
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3725
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3726
                         final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3727
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3728
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3729
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3730
                         final int C2 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3731
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3732
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3733
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3734
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3735
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3736
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3737
                     /* Case 15: Inherit through superclass.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3738
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3739
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3740
                      * C2[I]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3741
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3742
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3743
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3744
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3745
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3746
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3747
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3748
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3749
                         builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3750
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3751
                         builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3752
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3753
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3754
                     /* Case 16: Superclass has static def.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3755
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3756
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3757
                      * C2[I](stat) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3758
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3759
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3760
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3761
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3762
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3763
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3764
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3765
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3766
                         final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3767
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3768
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3769
                         final int C2 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3770
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3771
                         builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3772
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3773
                         builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3774
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3775
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3776
                     /* Case 17: Diamond, inherit through superclass,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3777
                      * methodref at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3778
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3779
                      * I3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3780
                      * I1[I3](), I2[I3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3781
                      * C2[I1,I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3782
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3783
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3784
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3785
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3786
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3787
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3788
                         final int I2 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3789
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3790
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3791
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3792
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3793
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3794
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3795
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3796
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3797
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3798
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3799
                     /* Case 18: Diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3800
                      * superclass, methodref at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3801
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3802
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3803
                      * C3[I2](), I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3804
                      * C2[I1,C3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3805
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3806
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3807
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3808
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3809
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3810
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3811
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3812
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3813
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3814
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3815
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3816
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3817
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3818
                         builder.hier.addInherit(C3, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3819
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3820
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3821
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3822
                     /* Case 19: Diamond, inherit through superclass,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3823
                      * expected at top, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3824
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3825
                      * I3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3826
                      * I1[I3](), I2[I3](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3827
                      * C2[I1,I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3828
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3829
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3830
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3831
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3832
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3833
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3834
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3835
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3836
                         final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3837
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3838
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3839
                         final int I2 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3840
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3841
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3842
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3843
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3844
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3845
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3846
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3847
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3848
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3849
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3850
                     /* Case 20: Diamond, inherit through superclass,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3851
                      * expected at top, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3852
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3853
                      * I3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3854
                      * I1[I3](), I2[I3](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3855
                      * C2[I1,I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3856
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3857
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3858
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3859
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3860
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3861
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3862
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3863
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3864
                         final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3865
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3866
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3867
                         final int I2 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3868
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3869
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3870
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3871
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3872
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3873
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3874
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3875
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3876
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3877
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3878
                     /* Case 21: Diamond, inherit through superclass,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3879
                      * overlapping, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3880
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3881
                      * I3[](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3882
                      * I1[I3](), I2[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3883
                      * C2[I1,I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3884
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3885
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3886
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3887
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3888
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3889
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3890
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3891
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3892
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3893
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3894
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3895
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3896
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3897
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3898
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3899
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3900
                     /* Case 22: Y, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3901
                      * superclass, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3902
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3903
                      * C3[](), I1[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3904
                      * C2[I1,C3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3905
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3906
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3907
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3908
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3909
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3910
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3911
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3912
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3913
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3914
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3915
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3916
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3917
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3918
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3919
                     /* Case 23: Diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3920
                      * superclass, overlapping, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3921
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3922
                      * I2[](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3923
                      * C3[I2](), I1[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3924
                      * C2[I1,C3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3925
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3926
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3927
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3928
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3929
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3930
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3931
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3932
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3933
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3934
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3935
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3936
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3937
                         builder.hier.addInherit(C3, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3938
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3939
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3940
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3941
                     /* Case 24: Double diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3942
                      * superclass, overlapping expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3943
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3944
                      * I3[](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3945
                      * C3[I3](), I2[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3946
                      * C2[I2,C3](), I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3947
                      * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3948
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3949
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3950
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3951
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3952
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3953
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3954
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3955
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3956
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3957
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3958
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3959
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3960
                         builder.hier.addInherit(C3, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3961
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3962
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3963
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3964
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3965
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3966
                     /* Case 25: Double diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3967
                      * superclass, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3968
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3969
                      * I3[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3970
                      * C3[I3](), I2[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3971
                      * C2[I2,C3](), I1[I2](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3972
                      * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3973
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3974
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3975
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3976
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3977
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3978
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3979
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3980
                         final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3981
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3982
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3983
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3984
                         final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3985
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3986
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3987
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3988
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3989
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3990
                         builder.hier.addInherit(C3, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3991
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3992
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3993
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3994
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3995
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3996
                     /* Case 26: Double diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3997
                      * superclass, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3998
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  3999
                      * I3[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4000
                      * C3[I3](), I2[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4001
                      * C2[I2,C3](), I1[I2](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4002
                      * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4003
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4004
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4005
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4006
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4007
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4008
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4009
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4010
                         final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4011
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4012
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4013
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4014
                         final int I1 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4015
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4016
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4017
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4018
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4019
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4020
                         builder.hier.addInherit(C3, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4021
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4022
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4023
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4024
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4025
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4026
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4027
    public static final Template IfaceMethodrefSelection =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4028
        new Template("IfaceMethodrefSelection",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4029
                     IfaceMethodrefSelectionNoOverride,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4030
                     /* Case 27: Objectref overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4031
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4032
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4033
                      * C[I](res) = oref = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4034
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4035
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4036
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4037
                             builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4038
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4039
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4040
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4041
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4042
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4043
                         final int C = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4044
                         builder.hier.addInherit(C, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4045
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4046
                         builder.expected = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4047
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4048
                     /* Case 28: Diamond, methodref at top, overriding.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4049
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4050
                      * I3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4051
                      * I1[I3](), I2[I3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4052
                      * C[I1,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4053
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4054
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4055
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4056
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4057
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4058
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4059
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4060
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4061
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4062
                         final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4063
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4064
                         final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4065
                         builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4066
                         builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4067
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4068
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4069
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4070
                         builder.expected = I2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4071
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4072
                     /* Case 29: Diamond, with superclass, expected at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4073
                      * class overriding.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4074
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4075
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4076
                      * C2[I2](res) = expected, I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4077
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4078
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4079
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4080
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4081
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4082
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4083
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4084
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4085
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4086
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4087
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4088
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4089
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4090
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4091
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4092
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4093
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4094
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4095
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4096
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4097
                     /* Case 30: Diamond, with superclass, expected at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4098
                      * interface overriding
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4099
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4100
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4101
                      * C2[I2](), I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4102
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4103
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4104
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4105
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4106
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4107
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4108
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4109
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4110
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4111
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4112
                         final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4113
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4114
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4115
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4116
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4117
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4118
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4119
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4120
                         builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4121
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4122
                     /* Case 31: Y, with superclass, overlaping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4123
                      * at top, class overrides
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4124
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4125
                      * C2[](res) = expected, I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4126
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4127
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4128
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4129
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4130
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4131
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4132
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4133
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4134
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4135
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4136
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4137
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4138
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4139
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4140
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4141
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4142
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4143
                     /* Case 32: Diamond, with superclass, overlaping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4144
                      * at top, class overrides
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4145
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4146
                      * I2[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4147
                      * C2[I2](res) = expected, I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4148
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4149
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4150
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4151
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4152
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4153
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4154
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4155
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4156
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4157
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4158
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4159
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4160
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4161
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4162
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4163
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4164
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4165
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4166
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4167
                     /* Case 33: Superclass overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4168
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4169
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4170
                      * C2[I](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4171
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4172
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4173
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4174
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4175
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4176
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4177
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4178
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4179
                            new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4180
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4181
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4182
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4183
                         builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4184
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4185
                         builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4186
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4187
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4188
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4189
                     /* Case 34: Diamond, inherit through superclass,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4190
                      * expected at top, override.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4191
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4192
                      * I3[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4193
                      * I1[I3](), I2[I3](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4194
                      * C2[I1,I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4195
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4196
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4197
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4198
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4199
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4200
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4201
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4202
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4203
                             new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4204
                         final int I3 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4205
                         final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4206
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4207
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4208
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4209
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4210
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4211
                         builder.hier.addInherit(I1, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4212
                         builder.hier.addInherit(I2, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4213
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4214
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4215
                         builder.expected = I2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4216
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4217
                     /* Case 35: Y, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4218
                      * superclass, overlapping, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4219
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4220
                      * C3[](res) = expected, I1[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4221
                      * C2[I1,C3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4222
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4223
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4224
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4225
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4226
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4227
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4228
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4229
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4230
                             new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4231
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4232
                         final int C3 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4233
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4234
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4235
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4236
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4237
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4238
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4239
                         builder.expected = C3;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4240
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4241
                     /* Case 36: Diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4242
                      * superclass, overlapping, expected at top.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4243
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4244
                      * I2[](*) = oldexpected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4245
                      * C3[I2](res) = expected, I1[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4246
                      * C2[I1,C3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4247
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4248
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4249
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4250
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4251
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4252
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4253
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4254
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4255
                             new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4256
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4257
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4258
                         final int C3 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4259
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4260
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4261
                         builder.hier.addInherit(C2, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4262
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4263
                         builder.hier.addInherit(C3, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4264
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4265
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4266
                         builder.expected = C3;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4267
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4268
                     /* Case 37: Double diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4269
                      * superclass, overriding.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4270
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4271
                      * I3[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4272
                      * C3[I3](), I2[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4273
                      * C2[I2,C3](), I1[I2](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4274
                      * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4275
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4276
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4277
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4278
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4279
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4280
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4281
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4282
                             new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4283
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4284
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4285
                         final int I1 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4286
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4287
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4288
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4289
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4290
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4291
                         builder.hier.addInherit(C3, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4292
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4293
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4294
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4295
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4296
                         builder.expected = I1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4297
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4298
                     /* Case 38: Double diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4299
                      * superclass, skip private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4300
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4301
                      * I3[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4302
                      * C3[I3](), I2[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4303
                      * C2[I2,C3](), I1[I2](priv)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4304
                      * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4305
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4306
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4307
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4308
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4309
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4310
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4311
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4312
                             new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4313
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4314
                             new MethodData(MethodData.Access.PRIVATE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4315
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4316
                         final ClassData withPrivDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4317
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4318
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4319
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4320
                         final int I1 = builder.addInterface(withPrivDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4321
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4322
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4323
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4324
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4325
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4326
                         builder.hier.addInherit(C3, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4327
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4328
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4329
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4330
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4331
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4332
                     /* Case 39: Double diamond, with superclass, inherit through
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4333
                      * superclass, skip static.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4334
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4335
                      * I3[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4336
                      * C3[I3](), I2[*](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4337
                      * C2[I2,C3](), I1[I2](stat)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4338
                      * C1[C2,I1]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4339
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4340
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4341
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4342
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4343
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4344
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4345
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4346
                             new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4347
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4348
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4349
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4350
                         final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4351
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4352
                         final int I3 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4353
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4354
                         final int I1 = builder.addInterface(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4355
                         final int C3 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4356
                         final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4357
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4358
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4359
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4360
                         builder.hier.addInherit(C3, I3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4361
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4362
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4363
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4364
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4365
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4366
                     /* Case 40: Superclass overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4367
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4368
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4369
                      * C3[I](res) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4370
                      * C2[C3](stat) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4371
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4372
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4373
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4374
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4375
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4376
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4377
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4378
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4379
                             new ClassData(pck, oldexpected.methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4380
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4381
                             new MethodData(MethodData.Access.PUBLIC,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4382
                                            MethodData.Context.STATIC);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4383
                         final ClassData withStatDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4384
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4385
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4386
                         final int C3 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4387
                         final int C2 = builder.addClass(withStatDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4388
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4389
                         builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4390
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4391
                         builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4392
                         builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4393
                         builder.expected = C3;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4394
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4395
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4396
50735
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4397
    // NOTE: The selection changes in JVMS 11 mean that private class methods
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4398
    // are never selected to satisfy an interface method invocation, and so no
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4399
    // IllegalAccessError is subsequently thrown. Because of this all the
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4400
    // "private" cases below are commented out. At some point in the future
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4401
    // these should be factored out and moved to a test that expects success
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4402
    // but it is not that simple as the commented out cases result in 2600
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4403
    // testcases being excluded, but only ~150 failing cases were seen. Though
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4404
    // it is not clear from the test if a single failure can result in further
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4405
    // testcases being skipped.
37196
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4406
    public static final Template IfaceMethodrefSelectionOverrideNonPublic =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4407
        new Template("IfaceMethodrefSelection",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4408
                     /* Case 1: Objectref overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4409
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4410
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4411
                      * C[I](priv) = oref = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4412
                      */
50735
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4413
                     // (final SelectionResolutionTestCase.Builder builder) -> {
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4414
                     //     final ClassData.Package pck =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4415
                     //         builder.classdata.get(builder.methodref).packageId;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4416
                     //     final ClassData oldexpected =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4417
                     //         builder.classdata.get(builder.expected);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4418
                     //     final MethodData meth =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4419
                     //         new MethodData(MethodData.Access.PRIVATE,
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4420
                     //                        MethodData.Context.INSTANCE);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4421
                     //     final ClassData withDef =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4422
                     //         new ClassData(pck, meth);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4423
                     //     final int I = builder.methodref;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4424
                     //     final int C = builder.addClass(withDef);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4425
                     //     builder.hier.addInherit(C, I);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4426
                     //     builder.objectref = C;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4427
                     //     builder.expected = C;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4428
                     // },
37196
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4429
                     /* Case 2: Objectref overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4430
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4431
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4432
                      * C[I](prot) = oref = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4433
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4434
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4435
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4436
                             builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4437
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4438
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4439
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4440
                             new MethodData(MethodData.Access.PROTECTED,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4441
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4442
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4443
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4444
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4445
                         final int C = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4446
                         builder.hier.addInherit(C, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4447
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4448
                         builder.expected = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4449
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4450
                     /* Case 3: Objectref overrides package private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4451
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4452
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4453
                      * C[I](pack) = oref = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4454
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4455
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4456
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4457
                             builder.classdata.get(builder.methodref).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4458
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4459
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4460
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4461
                             new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4462
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4463
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4464
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4465
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4466
                         final int C = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4467
                         builder.hier.addInherit(C, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4468
                         builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4469
                         builder.expected = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4470
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4471
                     /* Case 4: Diamond, with superclass, expected at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4472
                      * class overriding with private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4473
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4474
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4475
                      * C2[I2](priv) = expected, I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4476
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4477
                      */
50735
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4478
                     // (final SelectionResolutionTestCase.Builder builder) -> {
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4479
                     //     final ClassData.Package pck =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4480
                     //         builder.classdata.get(builder.expected).packageId;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4481
                     //     final ClassData oldexpected =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4482
                     //         builder.classdata.get(builder.expected);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4483
                     //     final MethodData meth =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4484
                     //         new MethodData(MethodData.Access.PRIVATE,
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4485
                     //                        MethodData.Context.INSTANCE);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4486
                     //     final ClassData withDef =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4487
                     //         new ClassData(pck, meth);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4488
                     //     final int I2 = builder.methodref;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4489
                     //     final int I1 = builder.addInterface(emptyClass(pck));
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4490
                     //     final int C2 = builder.addClass(withDef);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4491
                     //     final int C1 = builder.addClass(emptyClass(pck));
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4492
                     //     builder.hier.addInherit(C1, I1);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4493
                     //     builder.hier.addInherit(C1, C2);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4494
                     //     builder.hier.addInherit(I1, I2);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4495
                     //     builder.hier.addInherit(C2, I2);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4496
                     //     builder.objectref = C1;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4497
                     //     builder.expected = C2;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4498
                     // },
37196
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4499
                     /* Case 5: Diamond, with superclass, expected at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4500
                      * class overriding with package private.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4501
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4502
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4503
                      * C2[I2](pack) = expected, I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4504
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4505
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4506
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4507
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4508
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4509
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4510
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4511
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4512
                             new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4513
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4514
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4515
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4516
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4517
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4518
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4519
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4520
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4521
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4522
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4523
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4524
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4525
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4526
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4527
                     /* Case 6: Diamond, with superclass, expected at top,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4528
                      * class overriding with protected.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4529
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4530
                      * I2[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4531
                      * C2[I2](prot) = expected, I1[I2]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4532
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4533
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4534
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4535
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4536
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4537
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4538
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4539
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4540
                             new MethodData(MethodData.Access.PROTECTED,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4541
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4542
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4543
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4544
                         final int I2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4545
                         final int I1 = builder.addInterface(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4546
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4547
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4548
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4549
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4550
                         builder.hier.addInherit(I1, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4551
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4552
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4553
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4554
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4555
                     /* Case 7: Y, with superclass, overlaping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4556
                      * at top, class overrides
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4557
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4558
                      * C2[](priv) = expected, I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4559
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4560
                      */
50735
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4561
                     // (final SelectionResolutionTestCase.Builder builder) -> {
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4562
                     //     final ClassData.Package pck =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4563
                     //         builder.classdata.get(builder.expected).packageId;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4564
                     //    final ClassData oldexpected =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4565
                     //        builder.classdata.get(builder.expected);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4566
                     //     final MethodData meth =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4567
                     //         new MethodData(MethodData.Access.PRIVATE,
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4568
                     //                        MethodData.Context.INSTANCE);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4569
                     //    final ClassData withDef =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4570
                     //        new ClassData(pck, meth);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4571
                     //     final int I1 = builder.methodref;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4572
                     //     final int C2 = builder.addClass(withDef);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4573
                     //     final int C1 = builder.addClass(emptyClass(pck));
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4574
                     //     builder.hier.addInherit(C1, I1);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4575
                     //     builder.hier.addInherit(C1, C2);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4576
                     //     builder.objectref = C1;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4577
                     //     builder.expected = C2;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4578
                     // },
37196
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4579
                     /* Case 8: Y, with superclass, overlaping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4580
                      * at top, class overrides
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4581
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4582
                      * C2[](prot) = expected, I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4583
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4584
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4585
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4586
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4587
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4588
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4589
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4590
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4591
                             new MethodData(MethodData.Access.PROTECTED,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4592
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4593
                        final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4594
                            new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4595
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4596
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4597
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4598
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4599
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4600
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4601
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4602
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4603
                     /* Case 9: Y, with superclass, overlaping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4604
                      * at top, class overrides
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4605
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4606
                      * C2[](pack) = expected, I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4607
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4608
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4609
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4610
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4611
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4612
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4613
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4614
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4615
                             new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4616
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4617
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4618
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4619
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4620
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4621
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4622
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4623
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4624
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4625
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4626
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4627
                     /* Case 10: Diamond, with superclass, overlaping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4628
                      * at top, class overrides
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4629
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4630
                      * I2[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4631
                      * C2[I2](priv) = expected, I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4632
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4633
                      */
50735
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4634
                     // (final SelectionResolutionTestCase.Builder builder) -> {
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4635
                     //     final ClassData.Package pck =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4636
                     //         builder.classdata.get(builder.expected).packageId;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4637
                     //     final ClassData oldexpected =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4638
                     //         builder.classdata.get(builder.expected);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4639
                     //     final MethodData meth =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4640
                     //         new MethodData(MethodData.Access.PRIVATE,
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4641
                     //                        MethodData.Context.INSTANCE);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4642
                     //     final ClassData withDef =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4643
                     //         new ClassData(pck, meth);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4644
                     //     final int I2 = builder.expected;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4645
                     //     final int I1 = builder.methodref;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4646
                     //     final int C2 = builder.addClass(withDef);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4647
                     //     final int C1 = builder.addClass(emptyClass(pck));
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4648
                     //     builder.hier.addInherit(C1, I1);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4649
                     //     builder.hier.addInherit(C1, C2);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4650
                     //     builder.hier.addInherit(C2, I2);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4651
                     //     builder.objectref = C1;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4652
                     //     builder.expected = C2;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4653
                     // },
37196
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4654
                     /* Case 11: Diamond, with superclass, overlaping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4655
                      * at top, class overrides
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4656
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4657
                      * I2[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4658
                      * C2[I2](pack) = expected, I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4659
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4660
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4661
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4662
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4663
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4664
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4665
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4666
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4667
                             new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4668
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4669
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4670
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4671
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4672
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4673
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4674
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4675
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4676
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4677
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4678
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4679
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4680
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4681
                     /* Case 12: Diamond, with superclass, overlaping, expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4682
                      * at top, class overrides
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4683
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4684
                      * I2[](def) = old expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4685
                      * C2[I2](prot) = expected, I1[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4686
                      * C1[I1,C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4687
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4688
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4689
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4690
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4691
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4692
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4693
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4694
                             new MethodData(MethodData.Access.PROTECTED,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4695
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4696
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4697
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4698
                         final int I2 = builder.expected;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4699
                         final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4700
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4701
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4702
                         builder.hier.addInherit(C1, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4703
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4704
                         builder.hier.addInherit(C2, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4705
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4706
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4707
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4708
                     /* Case 13: Superclass overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4709
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4710
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4711
                      * C2[I](priv) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4712
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4713
                      */
50735
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4714
                     // (final SelectionResolutionTestCase.Builder builder) -> {
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4715
                     //     final ClassData.Package pck =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4716
                     //         builder.classdata.get(builder.expected).packageId;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4717
                     //     final ClassData oldexpected =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4718
                     //         builder.classdata.get(builder.expected);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4719
                     //     final MethodData meth =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4720
                     //         new MethodData(MethodData.Access.PRIVATE,
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4721
                     //                        MethodData.Context.INSTANCE);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4722
                     //     final ClassData withDef =
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4723
                     //         new ClassData(pck, meth);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4724
                     //     final int I = builder.methodref;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4725
                     //     final int C2 = builder.addClass(withDef);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4726
                     //     final int C1 = builder.addClass(emptyClass(pck));
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4727
                     //     builder.hier.addInherit(C1, I);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4728
                     //     builder.hier.addInherit(C1, C2);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4729
                     //     builder.hier.addInherit(C2, I);
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4730
                     //     builder.expected = C2;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4731
                     //     builder.objectref = C1;
2f2af62dfac7 8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents: 47216
diff changeset
  4732
                     // },
37196
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4733
                     /* Case 14: Superclass overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4734
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4735
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4736
                      * C2[I](prot) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4737
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4738
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4739
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4740
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4741
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4742
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4743
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4744
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4745
                             new MethodData(MethodData.Access.PROTECTED,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4746
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4747
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4748
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4749
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4750
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4751
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4752
                         builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4753
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4754
                         builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4755
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4756
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4757
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4758
                     /* Case 15: Superclass overrides.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4759
                      *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4760
                      * I[](*) = mref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4761
                      * C2[I](pack) = expected
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4762
                      * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4763
                      */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4764
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4765
                         final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4766
                             builder.classdata.get(builder.expected).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4767
                         final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4768
                             builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4769
                         final MethodData meth =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4770
                             new MethodData(MethodData.Access.PACKAGE,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4771
                                            MethodData.Context.INSTANCE);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4772
                         final ClassData withDef =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4773
                             new ClassData(pck, meth);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4774
                         final int I = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4775
                         final int C2 = builder.addClass(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4776
                         final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4777
                         builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4778
                         builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4779
                         builder.hier.addInherit(C2, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4780
                         builder.expected = C2;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4781
                         builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4782
                     });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4783
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4784
    /***********************
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4785
     * Ambiguous selection *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4786
     ***********************/
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4787
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4788
    public static final Template MethodrefAmbiguousResolvedIsIface =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4789
        new Template("MethodrefAmbiguousResolvedIsIface",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4790
                    /* Inherit from interface.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4791
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4792
                     * C2[](*) = mref, I[](any)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4793
                     * C1[C2,I]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4794
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4795
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4796
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4797
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4798
                        final ClassData.Package pck = oldexpected.packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4799
                        final MethodData.Context ctx = oldexpected.methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4800
                        final MethodData mdata =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4801
                            new MethodData(MethodData.Access.PUBLIC, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4802
                        final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4803
                        final int C2 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4804
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4805
                        final int I = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4806
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4807
                        builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4808
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4809
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4810
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4811
    public static final Template IfaceMethodrefAmbiguousResolvedIsIface =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4812
        new Template("IfaceMethodrefAmbiguousResolvedIsIface",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4813
                    /* Inherit from interface.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4814
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4815
                     * I1[](*) = mref, I2[](any)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4816
                     * C1[I1,I2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4817
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4818
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4819
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4820
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4821
                        final ClassData.Package pck = oldexpected.packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4822
                        final MethodData.Context ctx = oldexpected.methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4823
                        final MethodData mdata =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4824
                            new MethodData(MethodData.Access.PUBLIC, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4825
                        final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4826
                        final int I1 = builder.methodref;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4827
                        final int C = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4828
                        final int I2 = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4829
                        builder.hier.addInherit(C, I1);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4830
                        builder.hier.addInherit(C, I2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4831
                        builder.objectref = C;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4832
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4833
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4834
    public static final Template InvokespecialAmbiguousResolvedIsIface =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4835
        new Template("InvokespecialAmbiguousResolvedIsIface",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4836
                    /* Inherit from interface.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4837
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4838
                     * C2[](*) = csite, I[](any)
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4839
                     * C1[C2,I]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4840
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4841
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4842
                        final ClassData oldexpected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4843
                            builder.classdata.get(builder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4844
                        final ClassData.Package pck = oldexpected.packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4845
                        final MethodData.Context ctx = oldexpected.methoddata.context;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4846
                        final MethodData mdata =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4847
                            new MethodData(MethodData.Access.PUBLIC, ctx);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4848
                        final ClassData withDef = new ClassData(pck, mdata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4849
                        final int C2 = builder.callsite;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4850
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4851
                        final int I = builder.addInterface(withDef);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4852
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4853
                        builder.hier.addInherit(C1, I);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4854
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4855
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4856
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4857
    /******************************
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4858
     *   invokespecial Templates  *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4859
     ******************************/
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4860
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4861
    // Create this by taking MethodrefSelection and replacing
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4862
    // methodref with callsite.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4863
    public static final Template ObjectrefAssignableToCallsite =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4864
        new Template("ObjectrefAssignableToCallsite",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4865
                    /* Case 1: Objectref equals callsite
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4866
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4867
                     * C[](*) = csite = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4868
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4869
                    (builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4870
                        builder.objectref = builder.callsite;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4871
                    },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4872
                    /* Case 2: Inherit from super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4873
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4874
                     * C2[](*) = csite
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4875
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4876
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4877
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4878
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4879
                            builder.classdata.get(builder.callsite).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4880
                        final int C2 = builder.callsite;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4881
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4882
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4883
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4884
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4885
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4886
    public static final Template ObjectrefExactSubclassOfCallsite =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4887
        new Template("ObjectrefSubclassOfCallsite",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4888
                    /* Inherit from super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4889
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4890
                     * C2[](*) = csite
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4891
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4892
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4893
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4894
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4895
                            builder.classdata.get(builder.callsite).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4896
                        final int C2 = builder.callsite;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4897
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4898
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4899
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4900
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4901
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4902
    public static final Template ObjectrefEqualsOrExactSubclassOfCallsite =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4903
        new Template("ObjectrefEqualsOrExactSubclassOfCallsite",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4904
                     (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4905
                         builder.objectref = builder.callsite;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4906
                     },
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4907
                    /* Inherit from super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4908
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4909
                     * C2[](*) = csite
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4910
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4911
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4912
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4913
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4914
                            builder.classdata.get(builder.callsite).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4915
                        final int C2 = builder.callsite;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4916
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4917
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4918
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4919
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4920
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4921
    public static final Template ObjectrefEqualsCallsite =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4922
        new Template("TrivialObjectref",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4923
                     Collections.singleton((builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4924
                             builder.objectref = builder.callsite;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4925
                         }));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4926
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4927
    public static final Template ObjectrefSubclassOfSubclassOfCallsite =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4928
        new Template("ObjectrefSubclassOfCallsite",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4929
                    /* Inherit from super.
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4930
                     *
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4931
                     * C3[](*) = csite
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4932
                     * C2[C3]()
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4933
                     * C1[C2]() = oref
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4934
                     */
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4935
                    (final SelectionResolutionTestCase.Builder builder) -> {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4936
                        final ClassData.Package pck =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4937
                            builder.classdata.get(builder.callsite).packageId;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4938
                        final int C3 = builder.callsite;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4939
                        final int C2 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4940
                        final int C1 = builder.addClass(emptyClass(pck));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4941
                        builder.hier.addInherit(C2, C3);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4942
                        builder.hier.addInherit(C1, C2);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4943
                        builder.objectref = C1;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4944
                    });
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4945
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4946
    private static class Placeholder extends ClassData {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4947
        private final String placeholder;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4948
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4949
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4950
        private Placeholder(final String placeholder,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4951
                            final MethodData methoddata) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4952
            super(ClassData.Package.PLACEHOLDER, methoddata);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4953
            this.placeholder = placeholder;
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4954
        }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4955
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4956
        private Placeholder(final String placeholder) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4957
            this(placeholder, null);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4958
        }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4959
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4960
        public String toString() {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4961
            return " = <Placeholder for " + placeholder + ">\n\n";
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4962
        }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4963
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4964
        public static final Placeholder objectref = new Placeholder("objectref");
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4965
        public static final Placeholder methodref = new Placeholder("methodref");
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4966
        public static final Placeholder callsite = new Placeholder("callsite");
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4967
        public static final Placeholder expected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4968
            new Placeholder("expected",
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4969
                            new MethodData(MethodData.Access.PLACEHOLDER,
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4970
                                           MethodData.Context.PLACEHOLDER));
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4971
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4972
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4973
    public static void main(String... args) {
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4974
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4975
        System.err.println("*** Resolution Templates ***\n");
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4976
        final SelectionResolutionTestCase.Builder withExpectedIface =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4977
            new SelectionResolutionTestCase.Builder();
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4978
        withExpectedIface.expected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4979
            withExpectedIface.addInterface(Placeholder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4980
        final SelectionResolutionTestCase.Builder withExpectedClass =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4981
            new SelectionResolutionTestCase.Builder();
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4982
        withExpectedClass.expected =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4983
            withExpectedClass.addClass(Placeholder.expected);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4984
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4985
        MethodrefNotEqualsExpectedClass.printCases(withExpectedClass);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4986
        MethodrefNotEqualsExpectedIface.printCases(withExpectedIface);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4987
        IfaceMethodrefNotEqualsExpected.printCases(withExpectedIface);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4988
        MethodrefAmbiguous.printCases(withExpectedIface);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4989
        IfaceMethodrefAmbiguous.printCases(withExpectedIface);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4990
        ReabstractExpectedIface.printCases(withExpectedIface);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4991
        ReabstractExpectedClass.printCases(withExpectedClass);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4992
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4993
        final SelectionResolutionTestCase.Builder methodrefExpectedIface =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4994
            withExpectedIface.copy();
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4995
        methodrefExpectedIface.methodref =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4996
            methodrefExpectedIface.addClass(Placeholder.methodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4997
        final SelectionResolutionTestCase.Builder methodrefExpectedClass =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4998
            withExpectedClass.copy();
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  4999
        methodrefExpectedClass.methodref =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5000
            methodrefExpectedClass.addClass(Placeholder.methodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5001
        final SelectionResolutionTestCase.Builder ifaceMethodref =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5002
            withExpectedIface.copy();
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5003
        ifaceMethodref.methodref =
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5004
            ifaceMethodref.addInterface(Placeholder.methodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5005
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5006
        IgnoredAbstract.printCases(methodrefExpectedIface);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5007
        MethodrefSelectionResolvedIsClass.printCases(methodrefExpectedClass);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5008
        MethodrefSelectionResolvedIsIface.printCases(methodrefExpectedIface);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5009
        IfaceMethodrefSelection.printCases(ifaceMethodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5010
        IfaceMethodrefSelectionOverrideNonPublic.printCases(ifaceMethodref);
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5011
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5012
    }
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5013
f3f7367e8c53 8078112: [TESTBUG] Integrate Selection/Resolution test suite into jtreg tests
ddmitriev
parents:
diff changeset
  5014
}