src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
author alanb
Thu, 02 Nov 2017 13:20:21 -0700
changeset 47489 6d0e943bcd24
parent 47216 71c04702a3d5
child 52515 746df0ae4fe1
permissions -rw-r--r--
8186236: ModuleInfoExtender should be ASM6 aware Reviewed-by: ksrini, mchung, sundar
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
     1
/*
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
     2
 * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
     4
 *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    10
 *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    15
 * accompanied this code).
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    16
 *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    20
 *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    23
 * questions.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    24
 */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    25
package jdk.tools.jlink.internal.plugins;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    26
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    27
import java.io.ByteArrayInputStream;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    28
import java.io.ByteArrayOutputStream;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    29
import java.io.IOException;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    30
import java.io.InputStream;
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    31
import java.lang.module.Configuration;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    32
import java.lang.module.ModuleDescriptor;
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
    33
import java.lang.module.ModuleDescriptor.Exports;
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
    34
import java.lang.module.ModuleDescriptor.Opens;
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
    35
import java.lang.module.ModuleDescriptor.Provides;
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
    36
import java.lang.module.ModuleDescriptor.Requires;
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
    37
import java.lang.module.ModuleDescriptor.Version;
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
    38
import java.lang.module.ModuleFinder;
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
    39
import java.lang.module.ModuleReader;
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
    40
import java.lang.module.ModuleReference;
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    41
import java.lang.module.ResolvedModule;
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
    42
import java.net.URI;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    43
import java.util.ArrayList;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    44
import java.util.Collection;
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    45
import java.util.Collections;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    46
import java.util.EnumSet;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    47
import java.util.HashMap;
42770
d363e7c3584a 8171400: Move checking of duplicate packages in the boot layer to link time
redestad
parents: 42752
diff changeset
    48
import java.util.HashSet;
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    49
import java.util.LinkedHashMap;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    50
import java.util.List;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    51
import java.util.Map;
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
    52
import java.util.Objects;
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
    53
import java.util.Optional;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    54
import java.util.Set;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    55
import java.util.TreeSet;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    56
import java.util.function.IntSupplier;
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    57
import java.util.function.Supplier;
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
    58
import java.util.stream.Collectors;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    59
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    60
import jdk.internal.module.Checks;
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    61
import jdk.internal.module.DefaultRoots;
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
    62
import jdk.internal.module.IllegalAccessMaps;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    63
import jdk.internal.module.ModuleHashes;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    64
import jdk.internal.module.ModuleInfo.Attributes;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    65
import jdk.internal.module.ModuleInfoExtender;
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    66
import jdk.internal.module.ModuleReferenceImpl;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    67
import jdk.internal.module.ModuleResolution;
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
    68
import jdk.internal.module.ModuleTarget;
47489
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
    69
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
    70
import jdk.internal.org.objectweb.asm.ClassReader;
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
    71
import jdk.internal.org.objectweb.asm.ClassVisitor;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    72
import jdk.internal.org.objectweb.asm.ClassWriter;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    73
import jdk.internal.org.objectweb.asm.MethodVisitor;
47489
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
    74
import jdk.internal.org.objectweb.asm.ModuleVisitor;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    75
import jdk.internal.org.objectweb.asm.Opcodes;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    76
import static jdk.internal.org.objectweb.asm.Opcodes.*;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    77
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
    78
import jdk.tools.jlink.internal.ModuleSorter;
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    79
import jdk.tools.jlink.plugin.Plugin;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    80
import jdk.tools.jlink.plugin.PluginException;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    81
import jdk.tools.jlink.plugin.ResourcePool;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    82
import jdk.tools.jlink.plugin.ResourcePoolBuilder;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    83
import jdk.tools.jlink.plugin.ResourcePoolEntry;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    84
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    85
/**
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    86
 * Jlink plugin to reconstitute module descriptors and other attributes for system
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    87
 * modules. The plugin generates implementations of SystemModules to avoid parsing
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    88
 * module-info.class files at startup. It also generates SystemModulesMap to return
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    89
 * the SystemModules implementation for a specific initial module.
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    90
 *
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    91
 * As a side effect, the plugin adds the ModulePackages class file attribute to the
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    92
 * module-info.class files that don't have the attribute.
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    93
 *
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    94
 * @see jdk.internal.module.SystemModuleFinders
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    95
 * @see jdk.internal.module.SystemModules
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    96
 */
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
    97
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    98
public final class SystemModulesPlugin implements Plugin {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
    99
    private static final String NAME = "system-modules";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   100
    private static final String DESCRIPTION =
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   101
            PluginsResourceBundle.getDescription(NAME);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   102
    private static final String SYSTEM_MODULES_MAP_CLASS =
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   103
            "jdk/internal/module/SystemModulesMap";
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   104
    private static final String SYSTEM_MODULES_CLASS_PREFIX =
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   105
            "jdk/internal/module/SystemModules$";
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   106
    private static final String ALL_SYSTEM_MODULES_CLASS =
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   107
            SYSTEM_MODULES_CLASS_PREFIX + "all";
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   108
    private static final String DEFAULT_SYSTEM_MODULES_CLASS =
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   109
            SYSTEM_MODULES_CLASS_PREFIX + "default";
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   110
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   111
    private boolean enabled;
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   112
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   113
    public SystemModulesPlugin() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   114
        this.enabled = true;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   115
    }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   116
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   117
    @Override
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   118
    public String getName() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   119
        return NAME;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   120
    }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   121
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   122
    @Override
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   123
    public String getDescription() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   124
        return DESCRIPTION;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   125
    }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   126
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   127
    @Override
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   128
    public Set<State> getState() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   129
        return enabled ? EnumSet.of(State.AUTO_ENABLED, State.FUNCTIONAL)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   130
                       : EnumSet.of(State.DISABLED);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   131
    }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   132
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   133
    @Override
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   134
    public boolean hasArguments() {
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   135
        return true;
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   136
    }
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   137
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   138
    @Override
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   139
    public String getArgumentsDescription() {
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   140
        return PluginsResourceBundle.getArgument(NAME);
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   141
    }
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   142
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   143
    @Override
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   144
    public void configure(Map<String, String> config) {
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   145
        String arg = config.get(NAME);
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   146
        if (arg != null) {
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   147
            throw new IllegalArgumentException(NAME + ": " + arg);
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   148
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   149
    }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   150
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   151
    @Override
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   152
    public ResourcePool transform(ResourcePool in, ResourcePoolBuilder out) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   153
        if (!enabled) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   154
            throw new PluginException(NAME + " was set");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   155
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   156
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   157
        // validate, transform (if needed), and add the module-info.class files
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   158
        List<ModuleInfo> moduleInfos = transformModuleInfos(in, out);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   159
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   160
        // generate and add the SystemModuleMap and SystemModules classes
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   161
        Set<String> generated = genSystemModulesClasses(moduleInfos, out);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   162
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   163
        // pass through all other resources
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   164
        in.entries()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   165
            .filter(data -> !data.path().endsWith("/module-info.class")
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   166
                    && !generated.contains(data.path()))
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   167
            .forEach(data -> out.add(data));
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   168
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   169
        return out.build();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   170
    }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   171
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   172
    /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   173
     * Validates and transforms the module-info.class files in the modules, adding
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   174
     * the ModulePackages class file attribute if needed.
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   175
     *
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   176
     * @return the list of ModuleInfo objects, the first element is java.base
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   177
     */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   178
    List<ModuleInfo> transformModuleInfos(ResourcePool in, ResourcePoolBuilder out) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   179
        List<ModuleInfo> moduleInfos = new ArrayList<>();
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   180
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   181
        // Sort modules in the topological order so that java.base is always first.
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   182
        new ModuleSorter(in.moduleView()).sorted().forEach(module -> {
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   183
            ResourcePoolEntry data = module.findEntry("module-info.class").orElseThrow(
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   184
                // automatic modules not supported
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   185
                () ->  new PluginException("module-info.class not found for " +
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   186
                        module.name() + " module")
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   187
            );
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   188
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   189
            assert module.name().equals(data.moduleName());
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   190
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   191
            try {
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   192
                byte[] content = data.contentBytes();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   193
                Set<String> packages = module.packages();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   194
                ModuleInfo moduleInfo = new ModuleInfo(content, packages);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   195
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   196
                // link-time validation
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   197
                moduleInfo.validateNames();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   198
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   199
                // check if any exported or open package is not present
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   200
                moduleInfo.validatePackages();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   201
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   202
                // module-info.class may be overridden to add ModulePackages
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   203
                if (moduleInfo.shouldRewrite()) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   204
                    data = data.copyWithContent(moduleInfo.getBytes());
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   205
                }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   206
                moduleInfos.add(moduleInfo);
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   207
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   208
                // add resource pool entry
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   209
                out.add(data);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   210
            } catch (IOException e) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   211
                throw new PluginException(e);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   212
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   213
        });
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   214
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   215
        return moduleInfos;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   216
    }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   217
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   218
    /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   219
     * Generates the SystemModules classes (at least one) and the SystemModulesMap
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   220
     * class to map initial modules to a SystemModules class.
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   221
     *
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   222
     * @return the resource names of the resources added to the pool
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   223
     */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   224
    private Set<String> genSystemModulesClasses(List<ModuleInfo> moduleInfos,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   225
                                                ResourcePoolBuilder out) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   226
        int moduleCount = moduleInfos.size();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   227
        ModuleFinder finder = finderOf(moduleInfos);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   228
        assert finder.findAll().size() == moduleCount;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   229
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   230
        // map of initial module name to SystemModules class name
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   231
        Map<String, String> map = new LinkedHashMap<>();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   232
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   233
        // the names of resources written to the pool
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   234
        Set<String> generated = new HashSet<>();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   235
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   236
        // generate the SystemModules implementation to reconstitute all modules
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   237
        Set<String> allModuleNames = moduleInfos.stream()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   238
                .map(ModuleInfo::moduleName)
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   239
                .collect(Collectors.toSet());
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   240
        String rn = genSystemModulesClass(moduleInfos,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   241
                                          resolve(finder, allModuleNames),
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   242
                                          ALL_SYSTEM_MODULES_CLASS,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   243
                                          out);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   244
        generated.add(rn);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   245
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   246
        // generate, if needed, a SystemModules class to reconstitute the modules
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   247
        // needed for the case that the initial module is the unnamed module.
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   248
        String defaultSystemModulesClassName;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   249
        Configuration cf = resolve(finder, DefaultRoots.compute(finder));
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   250
        if (cf.modules().size() == moduleCount) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   251
            // all modules are resolved so no need to generate a class
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   252
            defaultSystemModulesClassName = ALL_SYSTEM_MODULES_CLASS;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   253
        } else {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   254
            defaultSystemModulesClassName = DEFAULT_SYSTEM_MODULES_CLASS;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   255
            rn = genSystemModulesClass(sublist(moduleInfos, cf),
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   256
                                       cf,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   257
                                       defaultSystemModulesClassName,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   258
                                       out);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   259
            generated.add(rn);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   260
        }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   261
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   262
        // Generate a SystemModules class for each module with a main class
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   263
        int suffix = 0;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   264
        for (ModuleInfo mi : moduleInfos) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   265
            if (mi.descriptor().mainClass().isPresent()) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   266
                String moduleName = mi.moduleName();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   267
                cf = resolve(finder, Set.of(moduleName));
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   268
                if (cf.modules().size() == moduleCount) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   269
                    // resolves all modules so no need to generate a class
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   270
                    map.put(moduleName, ALL_SYSTEM_MODULES_CLASS);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   271
                } else {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   272
                    String cn = SYSTEM_MODULES_CLASS_PREFIX + (suffix++);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   273
                    rn = genSystemModulesClass(sublist(moduleInfos, cf), cf, cn, out);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   274
                    map.put(moduleName, cn);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   275
                    generated.add(rn);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   276
                }
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   277
            }
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   278
        }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   279
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   280
        // generate SystemModulesMap
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   281
        rn = genSystemModulesMapClass(ALL_SYSTEM_MODULES_CLASS,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   282
                                      defaultSystemModulesClassName,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   283
                                      map,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   284
                                      out);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   285
        generated.add(rn);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   286
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   287
        // return the resource names of the generated classes
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   288
        return generated;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   289
    }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   290
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   291
    /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   292
     * Resolves a collection of root modules, with service binding, to create
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   293
     * configuration.
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   294
     */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   295
    private Configuration resolve(ModuleFinder finder, Set<String> roots) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   296
        return Configuration.empty().resolveAndBind(finder, ModuleFinder.of(), roots);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   297
    }
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   298
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   299
    /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   300
     * Returns the list of ModuleInfo objects that correspond to the modules in
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   301
     * the given configuration.
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   302
     */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   303
    private List<ModuleInfo> sublist(List<ModuleInfo> moduleInfos, Configuration cf) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   304
        Set<String> names = cf.modules()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   305
                .stream()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   306
                .map(ResolvedModule::name)
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   307
                .collect(Collectors.toSet());
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   308
        return moduleInfos.stream()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   309
                .filter(mi -> names.contains(mi.moduleName()))
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   310
                .collect(Collectors.toList());
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   311
    }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   312
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   313
    /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   314
     * Generate a SystemModules implementation class and add it as a resource.
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   315
     *
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   316
     * @return the name of the class resource added to the pool
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   317
     */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   318
    private String genSystemModulesClass(List<ModuleInfo> moduleInfos,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   319
                                         Configuration cf,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   320
                                         String className,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   321
                                         ResourcePoolBuilder out) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   322
        SystemModulesClassGenerator generator
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   323
            = new SystemModulesClassGenerator(className, moduleInfos);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   324
        byte[] bytes = generator.getClassWriter(cf).toByteArray();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   325
        String rn = "/java.base/" + className + ".class";
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   326
        ResourcePoolEntry e = ResourcePoolEntry.create(rn, bytes);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   327
        out.add(e);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   328
        return rn;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   329
    }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   330
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   331
    static class ModuleInfo {
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   332
        private final ByteArrayInputStream bais;
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   333
        private final Attributes attrs;
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   334
        private final Set<String> packages;
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   335
        private final boolean addModulePackages;
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   336
        private ModuleDescriptor descriptor;  // may be different that the original one
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   337
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   338
        ModuleInfo(byte[] bytes, Set<String> packages) throws IOException {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   339
            this.bais = new ByteArrayInputStream(bytes);
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   340
            this.packages = packages;
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   341
            this.attrs = jdk.internal.module.ModuleInfo.read(bais, null);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   342
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   343
            // If ModulePackages attribute is present, the packages from this
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   344
            // module descriptor returns the packages in that attribute.
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   345
            // If it's not present, ModuleDescriptor::packages only contains
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   346
            // the exported and open packages from module-info.class
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   347
            this.descriptor = attrs.descriptor();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   348
            if (descriptor.isAutomatic()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   349
                throw new InternalError("linking automatic module is not supported");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   350
            }
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   351
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   352
            // add ModulePackages attribute if this module contains some packages
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   353
            // and ModulePackages is not present
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   354
            this.addModulePackages = packages.size() > 0 && !hasModulePackages();
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   355
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   356
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   357
        String moduleName() {
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   358
            return attrs.descriptor().name();
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   359
        }
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   360
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   361
        ModuleDescriptor descriptor() {
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   362
            return descriptor;
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   363
        }
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   364
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   365
        Set<String> packages() {
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   366
            return packages;
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   367
        }
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   368
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   369
        ModuleTarget target() {
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   370
            return attrs.target();
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   371
        }
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   372
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   373
        ModuleHashes recordedHashes() {
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   374
            return attrs.recordedHashes();
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   375
        }
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   376
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   377
        ModuleResolution moduleResolution() {
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   378
            return attrs.moduleResolution();
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   379
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   380
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   381
        /**
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   382
         * Validates names in ModuleDescriptor
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   383
         */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   384
        void validateNames() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   385
            Checks.requireModuleName(descriptor.name());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   386
            for (Requires req : descriptor.requires()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   387
                Checks.requireModuleName(req.name());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   388
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   389
            for (Exports e : descriptor.exports()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   390
                Checks.requirePackageName(e.source());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   391
                if (e.isQualified())
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   392
                    e.targets().forEach(Checks::requireModuleName);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   393
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   394
            for (Opens opens : descriptor.opens()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   395
                Checks.requirePackageName(opens.source());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   396
                if (opens.isQualified())
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   397
                    opens.targets().forEach(Checks::requireModuleName);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   398
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   399
            for (Provides provides : descriptor.provides()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   400
                Checks.requireServiceTypeName(provides.service());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   401
                provides.providers().forEach(Checks::requireServiceProviderName);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   402
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   403
            for (String service : descriptor.uses()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   404
                Checks.requireServiceTypeName(service);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   405
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   406
            for (String pn : descriptor.packages()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   407
                Checks.requirePackageName(pn);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   408
            }
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   409
            for (String pn : packages) {
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   410
                Checks.requirePackageName(pn);
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   411
            }
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   412
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   413
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   414
        /**
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   415
         * Validates if exported and open packages are present
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   416
         */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   417
        void validatePackages() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   418
            Set<String> nonExistPackages = new TreeSet<>();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   419
            descriptor.exports().stream()
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   420
                .map(Exports::source)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   421
                .filter(pn -> !packages.contains(pn))
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   422
                .forEach(nonExistPackages::add);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   423
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   424
            descriptor.opens().stream()
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   425
                .map(Opens::source)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   426
                .filter(pn -> !packages.contains(pn))
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   427
                .forEach(nonExistPackages::add);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   428
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   429
            if (!nonExistPackages.isEmpty()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   430
                throw new PluginException("Packages that are exported or open in "
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   431
                    + descriptor.name() + " are not present: " + nonExistPackages);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   432
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   433
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   434
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   435
        boolean hasModulePackages() throws IOException {
47489
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   436
            Set<String> packages = new HashSet<>();
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   437
            ClassVisitor cv = new ClassVisitor(Opcodes.ASM6) {
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   438
                @Override
47489
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   439
                public ModuleVisitor visitModule(String name,
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   440
                                                 int flags,
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   441
                                                 String version) {
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   442
                    return new ModuleVisitor(Opcodes.ASM6) {
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   443
                        public void visitPackage(String pn) {
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   444
                            packages.add(pn);
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   445
                        }
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   446
                    };
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   447
                }
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   448
            };
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   449
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   450
            try (InputStream in = getInputStream()) {
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   451
                // parse module-info.class
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   452
                ClassReader cr = new ClassReader(in);
47489
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   453
                cr.accept(cv, 0);
6d0e943bcd24 8186236: ModuleInfoExtender should be ASM6 aware
alanb
parents: 47216
diff changeset
   454
                return packages.size() > 0;
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   455
            }
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   456
        }
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   457
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   458
        /**
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   459
         * Returns true if module-info.class should be rewritten to add the
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   460
         * ModulePackages attribute.
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   461
         */
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   462
        boolean shouldRewrite() {
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   463
            return addModulePackages;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   464
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   465
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   466
        /**
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   467
         * Returns the bytes for the (possibly updated) module-info.class.
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   468
         */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   469
        byte[] getBytes() throws IOException {
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   470
            try (InputStream in = getInputStream()) {
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   471
                if (shouldRewrite()) {
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   472
                    ModuleInfoRewriter rewriter = new ModuleInfoRewriter(in);
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   473
                    if (addModulePackages) {
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   474
                        rewriter.addModulePackages(packages);
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   475
                    }
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   476
                    // rewritten module descriptor
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   477
                    byte[] bytes = rewriter.getBytes();
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   478
                    try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes)) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   479
                        this.descriptor = ModuleDescriptor.read(bais);
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   480
                    }
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   481
                    return bytes;
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   482
                } else {
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   483
                    return in.readAllBytes();
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   484
                }
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   485
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   486
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   487
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   488
        /*
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   489
         * Returns the input stream of the module-info.class
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   490
         */
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   491
        InputStream getInputStream() {
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   492
            bais.reset();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   493
            return bais;
43732
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   494
        }
358d327a8220 8174740: RuntimeException: Module m's descriptor returns inconsistent package set
mchung
parents: 43712
diff changeset
   495
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   496
        class ModuleInfoRewriter extends ByteArrayOutputStream {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   497
            final ModuleInfoExtender extender;
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   498
            ModuleInfoRewriter(InputStream in) {
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   499
                this.extender = ModuleInfoExtender.newExtender(in);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   500
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   501
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   502
            void addModulePackages(Set<String> packages) {
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   503
                // Add ModulePackages attribute
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   504
                if (packages.size() > 0) {
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   505
                    extender.packages(packages);
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   506
                }
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   507
            }
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   508
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   509
            byte[] getBytes() throws IOException {
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   510
                extender.write(this);
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   511
                return buf;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   512
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   513
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   514
    }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   515
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   516
    /**
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   517
     * Generates a SystemModules class to reconstitute the ModuleDescriptor
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   518
     * and other attributes of system modules.
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   519
     */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   520
    static class SystemModulesClassGenerator {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   521
        private static final String MODULE_DESCRIPTOR_BUILDER =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   522
            "jdk/internal/module/Builder";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   523
        private static final String MODULE_DESCRIPTOR_ARRAY_SIGNATURE =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   524
            "[Ljava/lang/module/ModuleDescriptor;";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   525
        private static final String REQUIRES_MODIFIER_CLASSNAME =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   526
            "java/lang/module/ModuleDescriptor$Requires$Modifier";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   527
        private static final String EXPORTS_MODIFIER_CLASSNAME =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   528
            "java/lang/module/ModuleDescriptor$Exports$Modifier";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   529
        private static final String OPENS_MODIFIER_CLASSNAME =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   530
            "java/lang/module/ModuleDescriptor$Opens$Modifier";
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   531
        private static final String MODULE_TARGET_CLASSNAME  =
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   532
            "jdk/internal/module/ModuleTarget";
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   533
        private static final String MODULE_TARGET_ARRAY_SIGNATURE  =
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   534
            "[Ljdk/internal/module/ModuleTarget;";
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   535
        private static final String MODULE_HASHES_ARRAY_SIGNATURE  =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   536
            "[Ljdk/internal/module/ModuleHashes;";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   537
        private static final String MODULE_RESOLUTION_CLASSNAME  =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   538
            "jdk/internal/module/ModuleResolution";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   539
        private static final String MODULE_RESOLUTIONS_ARRAY_SIGNATURE  =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   540
            "[Ljdk/internal/module/ModuleResolution;";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   541
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   542
        private static final int MAX_LOCAL_VARS = 256;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   543
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   544
        private final int BUILDER_VAR    = 0;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   545
        private final int MD_VAR         = 1;  // variable for ModuleDescriptor
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   546
        private final int MT_VAR         = 1;  // variable for ModuleTarget
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   547
        private final int MH_VAR         = 1;  // variable for ModuleHashes
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   548
        private int nextLocalVar         = 2;  // index to next local variable
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   549
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   550
        // Method visitor for generating the SystemModules::modules() method
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   551
        private MethodVisitor mv;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   552
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   553
        // name of class to generate
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   554
        private final String className;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   555
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   556
        // list of all ModuleDescriptorBuilders, invoked in turn when building.
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   557
        private final List<ModuleInfo> moduleInfos;
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   558
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   559
        // A builder to create one single Set instance for a given set of
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   560
        // names or modifiers to reduce the footprint
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   561
        // e.g. target modules of qualified exports
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   562
        private final DedupSetBuilder dedupSetBuilder
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   563
            = new DedupSetBuilder(this::getNextLocalVar);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   564
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   565
        public SystemModulesClassGenerator(String className,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   566
                                           List<ModuleInfo> moduleInfos) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   567
            this.className = className;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   568
            this.moduleInfos = moduleInfos;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   569
            moduleInfos.forEach(mi -> dedups(mi.descriptor()));
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   570
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   571
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   572
        private int getNextLocalVar() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   573
            return nextLocalVar++;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   574
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   575
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   576
        /*
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   577
         * Adds the given ModuleDescriptor to the system module list.
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   578
         * It performs link-time validation and prepares mapping from various
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   579
         * Sets to SetBuilders to emit an optimized number of sets during build.
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   580
         */
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   581
        private void dedups(ModuleDescriptor md) {
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   582
            // exports
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   583
            for (Exports e : md.exports()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   584
                dedupSetBuilder.stringSet(e.targets());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   585
                dedupSetBuilder.exportsModifiers(e.modifiers());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   586
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   587
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   588
            // opens
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   589
            for (Opens opens : md.opens()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   590
                dedupSetBuilder.stringSet(opens.targets());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   591
                dedupSetBuilder.opensModifiers(opens.modifiers());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   592
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   593
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   594
            // requires
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   595
            for (Requires r : md.requires()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   596
                dedupSetBuilder.requiresModifiers(r.modifiers());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   597
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   598
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   599
            // uses
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   600
            dedupSetBuilder.stringSet(md.uses());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   601
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   602
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   603
        /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   604
         * Generate SystemModules class
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   605
         */
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   606
        public ClassWriter getClassWriter(Configuration cf) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   607
            ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   608
                                             + ClassWriter.COMPUTE_FRAMES);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   609
            cw.visit(Opcodes.V1_8,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   610
                     ACC_FINAL+ACC_SUPER,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   611
                     className,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   612
                     null,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   613
                     "java/lang/Object",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   614
                     new String[] { "jdk/internal/module/SystemModules" });
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   615
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   616
            // generate <init>
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   617
            genConstructor(cw);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   618
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   619
            // generate hasSplitPackages
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   620
            genHasSplitPackages(cw);
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   621
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   622
            // generate hasIncubatorModules
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   623
            genIncubatorModules(cw);
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   624
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   625
            // generate moduleDescriptors
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   626
            genModuleDescriptorsMethod(cw);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   627
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   628
            // generate moduleTargets
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   629
            genModuleTargetsMethod(cw);
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   630
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   631
            // generate moduleHashes
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   632
            genModuleHashesMethod(cw);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   633
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   634
            // generate moduleResolutions
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   635
            genModuleResolutionsMethod(cw);
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   636
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   637
            // generate moduleReads
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   638
            genModuleReads(cw, cf);
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   639
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   640
            // generate concealedPackagesToOpen and exportedPackagesToOpen
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   641
            genXXXPackagesToOpenMethods(cw);
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   642
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   643
            return cw;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   644
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   645
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   646
        /**
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   647
         * Generate byteccode for no-arg constructor
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   648
         */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   649
        private void genConstructor(ClassWriter cw) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   650
            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   651
            mv.visitVarInsn(ALOAD, 0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   652
            mv.visitMethodInsn(INVOKESPECIAL,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   653
                               "java/lang/Object",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   654
                               "<init>",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   655
                               "()V",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   656
                               false);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   657
            mv.visitInsn(RETURN);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   658
            mv.visitMaxs(0, 0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   659
            mv.visitEnd();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   660
        }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   661
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   662
        /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   663
         * Generate bytecode for hasSplitPackages method
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   664
         */
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   665
        private void genHasSplitPackages(ClassWriter cw) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   666
            boolean distinct = moduleInfos.stream()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   667
                    .map(ModuleInfo::packages)
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   668
                    .flatMap(Set::stream)
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   669
                    .allMatch(new HashSet<>()::add);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   670
            boolean hasSplitPackages = !distinct;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   671
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   672
            mv = cw.visitMethod(ACC_PUBLIC,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   673
                                "hasSplitPackages",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   674
                                "()Z",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   675
                                "()Z",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   676
                                null);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   677
            mv.visitCode();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   678
            if (hasSplitPackages) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   679
                mv.visitInsn(ICONST_1);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   680
            } else {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   681
                mv.visitInsn(ICONST_0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   682
            }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   683
            mv.visitInsn(IRETURN);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   684
            mv.visitMaxs(0, 0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   685
            mv.visitEnd();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   686
        }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   687
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   688
        /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   689
         * Generate bytecode for hasIncubatorModules method
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   690
         */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   691
        private void genIncubatorModules(ClassWriter cw) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   692
            boolean hasIncubatorModules = moduleInfos.stream()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   693
                    .map(ModuleInfo::moduleResolution)
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   694
                    .filter(mres -> (mres != null && mres.hasIncubatingWarning()))
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   695
                    .findFirst()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   696
                    .isPresent();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   697
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   698
            mv = cw.visitMethod(ACC_PUBLIC,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   699
                                "hasIncubatorModules",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   700
                                "()Z",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   701
                                "()Z",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   702
                                null);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   703
            mv.visitCode();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   704
            if (hasIncubatorModules) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   705
                mv.visitInsn(ICONST_1);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   706
            } else {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   707
                mv.visitInsn(ICONST_0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   708
            }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   709
            mv.visitInsn(IRETURN);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   710
            mv.visitMaxs(0, 0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   711
            mv.visitEnd();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   712
        }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   713
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   714
        /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   715
         * Generate bytecode for moduleDescriptors method
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   716
         */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   717
        private void genModuleDescriptorsMethod(ClassWriter cw) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   718
            this.mv = cw.visitMethod(ACC_PUBLIC,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   719
                                     "moduleDescriptors",
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   720
                                     "()" + MODULE_DESCRIPTOR_ARRAY_SIGNATURE,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   721
                                     "()" + MODULE_DESCRIPTOR_ARRAY_SIGNATURE,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   722
                                     null);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   723
            mv.visitCode();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   724
            pushInt(mv, moduleInfos.size());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   725
            mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   726
            mv.visitVarInsn(ASTORE, MD_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   727
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   728
            for (int index = 0; index < moduleInfos.size(); index++) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   729
                ModuleInfo minfo = moduleInfos.get(index);
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   730
                new ModuleDescriptorBuilder(minfo.descriptor(),
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   731
                                            minfo.packages(),
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   732
                                            index).build();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   733
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   734
            mv.visitVarInsn(ALOAD, MD_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   735
            mv.visitInsn(ARETURN);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   736
            mv.visitMaxs(0, 0);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   737
            mv.visitEnd();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   738
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   739
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   740
        /**
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   741
         * Generate bytecode for moduleTargets method
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   742
         */
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   743
        private void genModuleTargetsMethod(ClassWriter cw) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   744
            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   745
                                              "moduleTargets",
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   746
                                              "()" + MODULE_TARGET_ARRAY_SIGNATURE,
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   747
                                              "()" + MODULE_TARGET_ARRAY_SIGNATURE,
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   748
                                              null);
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   749
            mv.visitCode();
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   750
            pushInt(mv, moduleInfos.size());
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   751
            mv.visitTypeInsn(ANEWARRAY, MODULE_TARGET_CLASSNAME);
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   752
            mv.visitVarInsn(ASTORE, MT_VAR);
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   753
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   754
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   755
            // if java.base has a ModuleTarget attribute then generate the array
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   756
            // with one element, all other elements will be null.
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   757
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   758
            ModuleInfo base = moduleInfos.get(0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   759
            if (!base.moduleName().equals("java.base"))
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   760
                throw new InternalError("java.base should be first module in list");
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   761
            ModuleTarget target = base.target();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   762
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   763
            int count;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   764
            if (target != null && target.targetPlatform() != null) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   765
                count = 1;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   766
            } else {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   767
                count = moduleInfos.size();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   768
            }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   769
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   770
            for (int index = 0; index < count; index++) {
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   771
                ModuleInfo minfo = moduleInfos.get(index);
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   772
                if (minfo.target() != null) {
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   773
                    mv.visitVarInsn(ALOAD, MT_VAR);
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   774
                    pushInt(mv, index);
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   775
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   776
                    // new ModuleTarget(String)
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   777
                    mv.visitTypeInsn(NEW, MODULE_TARGET_CLASSNAME);
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   778
                    mv.visitInsn(DUP);
45004
ea3137042a61 8178380: Module system implementation refresh (5/2017)
alanb
parents: 44359
diff changeset
   779
                    mv.visitLdcInsn(minfo.target().targetPlatform());
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   780
                    mv.visitMethodInsn(INVOKESPECIAL, MODULE_TARGET_CLASSNAME,
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   781
                                       "<init>", "(Ljava/lang/String;)V", false);
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   782
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   783
                    mv.visitInsn(AASTORE);
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   784
                }
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   785
            }
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   786
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   787
            mv.visitVarInsn(ALOAD, MT_VAR);
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   788
            mv.visitInsn(ARETURN);
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   789
            mv.visitMaxs(0, 0);
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   790
            mv.visitEnd();
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   791
        }
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   792
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   793
        /**
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   794
         * Generate bytecode for moduleHashes method
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   795
         */
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   796
        private void genModuleHashesMethod(ClassWriter cw) {
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   797
            MethodVisitor hmv =
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   798
                cw.visitMethod(ACC_PUBLIC,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   799
                               "moduleHashes",
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   800
                               "()" + MODULE_HASHES_ARRAY_SIGNATURE,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   801
                               "()" + MODULE_HASHES_ARRAY_SIGNATURE,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   802
                               null);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   803
            hmv.visitCode();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   804
            pushInt(hmv, moduleInfos.size());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   805
            hmv.visitTypeInsn(ANEWARRAY, "jdk/internal/module/ModuleHashes");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   806
            hmv.visitVarInsn(ASTORE, MH_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   807
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   808
            for (int index = 0; index < moduleInfos.size(); index++) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   809
                ModuleInfo minfo = moduleInfos.get(index);
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   810
                if (minfo.recordedHashes() != null) {
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   811
                    new ModuleHashesBuilder(minfo.recordedHashes(),
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   812
                                            index,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   813
                                            hmv).build();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   814
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   815
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   816
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   817
            hmv.visitVarInsn(ALOAD, MH_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   818
            hmv.visitInsn(ARETURN);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   819
            hmv.visitMaxs(0, 0);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   820
            hmv.visitEnd();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   821
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   822
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
   823
        /**
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   824
         * Generate bytecode for moduleResolutions method
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   825
         */
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   826
        private void genModuleResolutionsMethod(ClassWriter cw) {
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   827
            MethodVisitor mresmv =
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   828
                cw.visitMethod(ACC_PUBLIC,
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   829
                               "moduleResolutions",
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   830
                               "()" + MODULE_RESOLUTIONS_ARRAY_SIGNATURE,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   831
                               "()" + MODULE_RESOLUTIONS_ARRAY_SIGNATURE,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   832
                               null);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   833
            mresmv.visitCode();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   834
            pushInt(mresmv, moduleInfos.size());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   835
            mresmv.visitTypeInsn(ANEWARRAY, MODULE_RESOLUTION_CLASSNAME);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   836
            mresmv.visitVarInsn(ASTORE, 0);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   837
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   838
            for (int index=0; index < moduleInfos.size(); index++) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   839
                ModuleInfo minfo = moduleInfos.get(index);
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   840
                if (minfo.moduleResolution() != null) {
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   841
                    mresmv.visitVarInsn(ALOAD, 0);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   842
                    pushInt(mresmv, index);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   843
                    mresmv.visitTypeInsn(NEW, MODULE_RESOLUTION_CLASSNAME);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   844
                    mresmv.visitInsn(DUP);
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
   845
                    mresmv.visitLdcInsn(minfo.moduleResolution().value());
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   846
                    mresmv.visitMethodInsn(INVOKESPECIAL,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   847
                                           MODULE_RESOLUTION_CLASSNAME,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   848
                                           "<init>",
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   849
                                           "(I)V", false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   850
                    mresmv.visitInsn(AASTORE);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   851
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   852
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   853
            mresmv.visitVarInsn(ALOAD, 0);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   854
            mresmv.visitInsn(ARETURN);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   855
            mresmv.visitMaxs(0, 0);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   856
            mresmv.visitEnd();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   857
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   858
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   859
        /**
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   860
         * Generate bytecode for moduleReads method
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   861
         */
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   862
        private void genModuleReads(ClassWriter cw, Configuration cf) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   863
            // module name -> names of modules that it reads
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   864
            Map<String, Set<String>> map = cf.modules().stream()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   865
                    .collect(Collectors.toMap(
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   866
                            ResolvedModule::name,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   867
                            m -> m.reads().stream()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   868
                                    .map(ResolvedModule::name)
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   869
                                    .collect(Collectors.toSet())));
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   870
            generate(cw, "moduleReads", map, true);
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   871
        }
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   872
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   873
        /**
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   874
         * Generate concealedPackagesToOpen and exportedPackagesToOpen methods.
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   875
         */
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   876
        private void genXXXPackagesToOpenMethods(ClassWriter cw) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   877
            ModuleFinder finder = finderOf(moduleInfos);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   878
            IllegalAccessMaps maps = IllegalAccessMaps.generate(finder);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   879
            generate(cw, "concealedPackagesToOpen", maps.concealedPackagesToOpen(), false);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   880
            generate(cw, "exportedPackagesToOpen", maps.exportedPackagesToOpen(), false);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   881
        }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   882
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   883
        /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   884
         * Generate method to return {@code Map<String, Set<String>>}.
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   885
         *
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   886
         * If {@code dedup} is true then the values are de-duplicated.
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   887
         */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   888
        private void generate(ClassWriter cw,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   889
                              String methodName,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   890
                              Map<String, Set<String>> map,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   891
                              boolean dedup) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   892
            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC,
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   893
                                              methodName,
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   894
                                              "()Ljava/util/Map;",
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   895
                                              "()Ljava/util/Map;",
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   896
                                              null);
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   897
            mv.visitCode();
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   898
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   899
            // map of Set -> local
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   900
            Map<Set<String>, Integer> locals;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   901
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   902
            // generate code to create the sets that are duplicated
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   903
            if (dedup) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   904
                Collection<Set<String>> values = map.values();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   905
                Set<Set<String>> duplicateSets = values.stream()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   906
                        .distinct()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   907
                        .filter(s -> Collections.frequency(values, s) > 1)
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   908
                        .collect(Collectors.toSet());
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   909
                locals = new HashMap<>();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   910
                int index = 1;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   911
                for (Set<String> s : duplicateSets) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   912
                    genImmutableSet(mv, s);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   913
                    mv.visitVarInsn(ASTORE, index);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   914
                    locals.put(s, index);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   915
                    if (++index >= MAX_LOCAL_VARS) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   916
                        break;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   917
                    }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   918
                }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   919
            } else {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   920
                locals = Map.of();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   921
            }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   922
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   923
            // new Map$Entry[size]
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   924
            pushInt(mv, map.size());
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   925
            mv.visitTypeInsn(ANEWARRAY, "java/util/Map$Entry");
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   926
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   927
            int index = 0;
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   928
            for (Map.Entry<String, Set<String>> e : map.entrySet()) {
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   929
                String name = e.getKey();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   930
                Set<String> s = e.getValue();
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   931
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   932
                mv.visitInsn(DUP);
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   933
                pushInt(mv, index);
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   934
                mv.visitLdcInsn(name);
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   935
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   936
                // if de-duplicated then load the local, otherwise generate code
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   937
                Integer varIndex = locals.get(s);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   938
                if (varIndex == null) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   939
                    genImmutableSet(mv, s);
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   940
                } else {
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   941
                    mv.visitVarInsn(ALOAD, varIndex);
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   942
                }
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   943
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   944
                String desc = "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map$Entry;";
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   945
                mv.visitMethodInsn(INVOKESTATIC,
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   946
                                   "java/util/Map",
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   947
                                   "entry",
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   948
                                   desc,
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   949
                                   true);
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   950
                mv.visitInsn(AASTORE);
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   951
                index++;
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   952
            }
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   953
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   954
            // invoke Map.ofEntries(Map$Entry[])
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   955
            mv.visitMethodInsn(INVOKESTATIC, "java/util/Map", "ofEntries",
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   956
                    "([Ljava/util/Map$Entry;)Ljava/util/Map;", true);
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   957
            mv.visitInsn(ARETURN);
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   958
            mv.visitMaxs(0, 0);
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   959
            mv.visitEnd();
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   960
        }
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
   961
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   962
        /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   963
         * Generate code to generate an immutable set.
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   964
         */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   965
        private void genImmutableSet(MethodVisitor mv, Set<String> set) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   966
            int size = set.size();
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   967
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   968
            // use Set.of(Object[]) when there are more than 2 elements
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   969
            // use Set.of(Object) or Set.of(Object, Object) when fewer
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   970
            if (size > 2) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   971
                pushInt(mv, size);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   972
                mv.visitTypeInsn(ANEWARRAY, "java/lang/String");
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   973
                int i = 0;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   974
                for (String element : set) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   975
                    mv.visitInsn(DUP);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   976
                    pushInt(mv, i);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   977
                    mv.visitLdcInsn(element);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   978
                    mv.visitInsn(AASTORE);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   979
                    i++;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   980
                }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   981
                mv.visitMethodInsn(INVOKESTATIC,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   982
                        "java/util/Set",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   983
                        "of",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   984
                        "([Ljava/lang/Object;)Ljava/util/Set;",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   985
                        true);
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   986
            } else {
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   987
                StringBuilder sb = new StringBuilder("(");
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   988
                for (String element : set) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   989
                    mv.visitLdcInsn(element);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   990
                    sb.append("Ljava/lang/Object;");
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   991
                }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   992
                sb.append(")Ljava/util/Set;");
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   993
                mv.visitMethodInsn(INVOKESTATIC,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   994
                        "java/util/Set",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   995
                        "of",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   996
                        sb.toString(),
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
   997
                        true);
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   998
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
   999
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1000
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1001
        class ModuleDescriptorBuilder {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1002
            static final String BUILDER_TYPE = "Ljdk/internal/module/Builder;";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1003
            static final String EXPORTS_TYPE =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1004
                "Ljava/lang/module/ModuleDescriptor$Exports;";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1005
            static final String OPENS_TYPE =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1006
                "Ljava/lang/module/ModuleDescriptor$Opens;";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1007
            static final String PROVIDES_TYPE =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1008
                "Ljava/lang/module/ModuleDescriptor$Provides;";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1009
            static final String REQUIRES_TYPE =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1010
                "Ljava/lang/module/ModuleDescriptor$Requires;";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1011
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1012
            // method signature for static Builder::newExports, newOpens,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1013
            // newProvides, newRequires methods
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1014
            static final String EXPORTS_MODIFIER_SET_STRING_SET_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1015
                "(Ljava/util/Set;Ljava/lang/String;Ljava/util/Set;)"
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1016
                    + EXPORTS_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1017
            static final String EXPORTS_MODIFIER_SET_STRING_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1018
                "(Ljava/util/Set;Ljava/lang/String;)" + EXPORTS_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1019
            static final String OPENS_MODIFIER_SET_STRING_SET_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1020
                "(Ljava/util/Set;Ljava/lang/String;Ljava/util/Set;)"
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1021
                    + OPENS_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1022
            static final String OPENS_MODIFIER_SET_STRING_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1023
                "(Ljava/util/Set;Ljava/lang/String;)" + OPENS_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1024
            static final String PROVIDES_STRING_LIST_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1025
                "(Ljava/lang/String;Ljava/util/List;)" + PROVIDES_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1026
            static final String REQUIRES_SET_STRING_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1027
                "(Ljava/util/Set;Ljava/lang/String;)" + REQUIRES_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1028
            static final String REQUIRES_SET_STRING_STRING_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1029
                "(Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)" + REQUIRES_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1030
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1031
            // method signature for Builder instance methods that
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1032
            // return this Builder instance
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1033
            static final String EXPORTS_ARRAY_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1034
                "([" + EXPORTS_TYPE + ")" + BUILDER_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1035
            static final String OPENS_ARRAY_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1036
                "([" + OPENS_TYPE + ")" + BUILDER_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1037
            static final String PROVIDES_ARRAY_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1038
                "([" + PROVIDES_TYPE + ")" + BUILDER_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1039
            static final String REQUIRES_ARRAY_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1040
                "([" + REQUIRES_TYPE + ")" + BUILDER_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1041
            static final String SET_SIG = "(Ljava/util/Set;)" + BUILDER_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1042
            static final String STRING_SIG = "(Ljava/lang/String;)" + BUILDER_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1043
            static final String BOOLEAN_SIG = "(Z)" + BUILDER_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1044
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1045
            final ModuleDescriptor md;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1046
            final Set<String> packages;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1047
            final int index;
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43732
diff changeset
  1048
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1049
            ModuleDescriptorBuilder(ModuleDescriptor md, Set<String> packages, int index) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1050
                if (md.isAutomatic()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1051
                    throw new InternalError("linking automatic module is not supported");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1052
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1053
                this.md = md;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1054
                this.packages = packages;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1055
                this.index = index;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1056
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1057
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1058
            void build() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1059
                // new jdk.internal.module.Builder
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1060
                newBuilder();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1061
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1062
                // requires
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1063
                requires(md.requires());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1064
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1065
                // exports
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1066
                exports(md.exports());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1067
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1068
                // opens
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1069
                opens(md.opens());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1070
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1071
                // uses
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1072
                uses(md.uses());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1073
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1074
                // provides
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1075
                provides(md.provides());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1076
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1077
                // all packages
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1078
                packages(packages);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1079
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1080
                // version
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1081
                md.version().ifPresent(this::version);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1082
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1083
                // main class
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1084
                md.mainClass().ifPresent(this::mainClass);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1085
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1086
                putModuleDescriptor();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1087
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1088
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1089
            void newBuilder() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1090
                mv.visitTypeInsn(NEW, MODULE_DESCRIPTOR_BUILDER);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1091
                mv.visitInsn(DUP);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1092
                mv.visitLdcInsn(md.name());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1093
                mv.visitMethodInsn(INVOKESPECIAL, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1094
                    "<init>", "(Ljava/lang/String;)V", false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1095
                mv.visitVarInsn(ASTORE, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1096
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1097
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1098
                if (md.isOpen()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1099
                    setModuleBit("open", true);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1100
                }
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43336
diff changeset
  1101
                if (md.modifiers().contains(ModuleDescriptor.Modifier.SYNTHETIC)) {
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1102
                    setModuleBit("synthetic", true);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1103
                }
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43336
diff changeset
  1104
                if (md.modifiers().contains(ModuleDescriptor.Modifier.MANDATED)) {
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43336
diff changeset
  1105
                    setModuleBit("mandated", true);
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43336
diff changeset
  1106
                }
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1107
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1108
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1109
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1110
             * Invoke Builder.<methodName>(boolean value)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1111
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1112
            void setModuleBit(String methodName, boolean value) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1113
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1114
                if (value) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1115
                    mv.visitInsn(ICONST_1);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1116
                } else {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1117
                    mv.visitInsn(ICONST_0);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1118
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1119
                mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1120
                    methodName, BOOLEAN_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1121
                mv.visitInsn(POP);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1122
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1123
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1124
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1125
             * Put ModuleDescriptor into the modules array
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1126
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1127
            void putModuleDescriptor() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1128
                mv.visitVarInsn(ALOAD, MD_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1129
                pushInt(mv, index);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1130
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1131
                mv.visitLdcInsn(md.hashCode());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1132
                mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1133
                    "build", "(I)Ljava/lang/module/ModuleDescriptor;",
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1134
                    false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1135
                mv.visitInsn(AASTORE);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1136
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1137
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1138
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1139
             * Call Builder::newRequires to create Requires instances and
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1140
             * then pass it to the builder by calling:
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1141
             *      Builder.requires(Requires[])
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1142
             *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1143
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1144
            void requires(Set<Requires> requires) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1145
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1146
                pushInt(mv, requires.size());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1147
                mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Requires");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1148
                int arrayIndex = 0;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1149
                for (Requires require : requires) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1150
                    String compiledVersion = null;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1151
                    if (require.compiledVersion().isPresent()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1152
                        compiledVersion = require.compiledVersion().get().toString();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1153
                    }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1154
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1155
                    mv.visitInsn(DUP);               // arrayref
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1156
                    pushInt(mv, arrayIndex++);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1157
                    newRequires(require.modifiers(), require.name(), compiledVersion);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1158
                    mv.visitInsn(AASTORE);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1159
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1160
                mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1161
                    "requires", REQUIRES_ARRAY_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1162
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1163
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1164
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1165
             * Invoke Builder.newRequires(Set<Modifier> mods, String mn, String compiledVersion)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1166
             *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1167
             * Set<Modifier> mods = ...
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1168
             * Builder.newRequires(mods, mn, compiledVersion);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1169
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1170
            void newRequires(Set<Requires.Modifier> mods, String name, String compiledVersion) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1171
                int varIndex = dedupSetBuilder.indexOfRequiresModifiers(mods);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1172
                mv.visitVarInsn(ALOAD, varIndex);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1173
                mv.visitLdcInsn(name);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1174
                if (compiledVersion != null) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1175
                    mv.visitLdcInsn(compiledVersion);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1176
                    mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1177
                        "newRequires", REQUIRES_SET_STRING_STRING_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1178
                } else {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1179
                    mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1180
                        "newRequires", REQUIRES_SET_STRING_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1181
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1182
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1183
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1184
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1185
             * Call Builder::newExports to create Exports instances and
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1186
             * then pass it to the builder by calling:
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1187
             *      Builder.exports(Exports[])
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1188
             *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1189
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1190
            void exports(Set<Exports> exports) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1191
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1192
                pushInt(mv, exports.size());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1193
                mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Exports");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1194
                int arrayIndex = 0;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1195
                for (Exports export : exports) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1196
                    mv.visitInsn(DUP);    // arrayref
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1197
                    pushInt(mv, arrayIndex++);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1198
                    newExports(export.modifiers(), export.source(), export.targets());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1199
                    mv.visitInsn(AASTORE);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1200
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1201
                mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1202
                    "exports", EXPORTS_ARRAY_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1203
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1204
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1205
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1206
             * Invoke
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1207
             *     Builder.newExports(Set<Exports.Modifier> ms, String pn,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1208
             *                        Set<String> targets)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1209
             * or
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1210
             *     Builder.newExports(Set<Exports.Modifier> ms, String pn)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1211
             *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1212
             * Set<String> targets = new HashSet<>();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1213
             * targets.add(t);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1214
             * :
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1215
             * :
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1216
             *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1217
             * Set<Modifier> mods = ...
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1218
             * Builder.newExports(mods, pn, targets);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1219
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1220
            void newExports(Set<Exports.Modifier> ms, String pn, Set<String> targets) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1221
                int modifiersSetIndex = dedupSetBuilder.indexOfExportsModifiers(ms);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1222
                if (!targets.isEmpty()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1223
                    int stringSetIndex = dedupSetBuilder.indexOfStringSet(targets);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1224
                    mv.visitVarInsn(ALOAD, modifiersSetIndex);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1225
                    mv.visitLdcInsn(pn);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1226
                    mv.visitVarInsn(ALOAD, stringSetIndex);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1227
                    mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1228
                        "newExports", EXPORTS_MODIFIER_SET_STRING_SET_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1229
                } else {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1230
                    mv.visitVarInsn(ALOAD, modifiersSetIndex);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1231
                    mv.visitLdcInsn(pn);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1232
                    mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1233
                        "newExports", EXPORTS_MODIFIER_SET_STRING_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1234
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1235
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1236
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1237
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1238
            /**
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1239
             * Call Builder::newOpens to create Opens instances and
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1240
             * then pass it to the builder by calling:
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1241
             * Builder.opens(Opens[])
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1242
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1243
            void opens(Set<Opens> opens) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1244
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1245
                pushInt(mv, opens.size());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1246
                mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Opens");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1247
                int arrayIndex = 0;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1248
                for (Opens open : opens) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1249
                    mv.visitInsn(DUP);    // arrayref
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1250
                    pushInt(mv, arrayIndex++);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1251
                    newOpens(open.modifiers(), open.source(), open.targets());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1252
                    mv.visitInsn(AASTORE);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1253
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1254
                mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1255
                    "opens", OPENS_ARRAY_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1256
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1257
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1258
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1259
             * Invoke
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1260
             *     Builder.newOpens(Set<Opens.Modifier> ms, String pn,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1261
             *                        Set<String> targets)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1262
             * or
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1263
             *     Builder.newOpens(Set<Opens.Modifier> ms, String pn)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1264
             *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1265
             * Set<String> targets = new HashSet<>();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1266
             * targets.add(t);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1267
             * :
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1268
             * :
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1269
             *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1270
             * Set<Modifier> mods = ...
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1271
             * Builder.newOpens(mods, pn, targets);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1272
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1273
            void newOpens(Set<Opens.Modifier> ms, String pn, Set<String> targets) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1274
                int modifiersSetIndex = dedupSetBuilder.indexOfOpensModifiers(ms);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1275
                if (!targets.isEmpty()) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1276
                    int stringSetIndex = dedupSetBuilder.indexOfStringSet(targets);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1277
                    mv.visitVarInsn(ALOAD, modifiersSetIndex);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1278
                    mv.visitLdcInsn(pn);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1279
                    mv.visitVarInsn(ALOAD, stringSetIndex);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1280
                    mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1281
                        "newOpens", OPENS_MODIFIER_SET_STRING_SET_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1282
                } else {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1283
                    mv.visitVarInsn(ALOAD, modifiersSetIndex);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1284
                    mv.visitLdcInsn(pn);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1285
                    mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1286
                        "newOpens", OPENS_MODIFIER_SET_STRING_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1287
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1288
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1289
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1290
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1291
             * Invoke Builder.uses(Set<String> uses)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1292
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1293
            void uses(Set<String> uses) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1294
                int varIndex = dedupSetBuilder.indexOfStringSet(uses);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1295
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1296
                mv.visitVarInsn(ALOAD, varIndex);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1297
                mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1298
                    "uses", SET_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1299
                mv.visitInsn(POP);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1300
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1301
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1302
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1303
            * Call Builder::newProvides to create Provides instances and
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1304
            * then pass it to the builder by calling:
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1305
            *      Builder.provides(Provides[] provides)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1306
            *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1307
            */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1308
            void provides(Collection<Provides> provides) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1309
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1310
                pushInt(mv, provides.size());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1311
                mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Provides");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1312
                int arrayIndex = 0;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1313
                for (Provides provide : provides) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1314
                    mv.visitInsn(DUP);    // arrayref
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1315
                    pushInt(mv, arrayIndex++);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1316
                    newProvides(provide.service(), provide.providers());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1317
                    mv.visitInsn(AASTORE);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1318
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1319
                mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1320
                    "provides", PROVIDES_ARRAY_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1321
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1322
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1323
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1324
             * Invoke Builder.newProvides(String service, Set<String> providers)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1325
             *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1326
             * Set<String> providers = new HashSet<>();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1327
             * providers.add(impl);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1328
             * :
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1329
             * :
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1330
             * Builder.newProvides(service, providers);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1331
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1332
            void newProvides(String service, List<String> providers) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1333
                mv.visitLdcInsn(service);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1334
                pushInt(mv, providers.size());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1335
                mv.visitTypeInsn(ANEWARRAY, "java/lang/String");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1336
                int arrayIndex = 0;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1337
                for (String provider : providers) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1338
                    mv.visitInsn(DUP);    // arrayref
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1339
                    pushInt(mv, arrayIndex++);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1340
                    mv.visitLdcInsn(provider);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1341
                    mv.visitInsn(AASTORE);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1342
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1343
                mv.visitMethodInsn(INVOKESTATIC, "java/util/List",
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1344
                    "of", "([Ljava/lang/Object;)Ljava/util/List;", true);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1345
                mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1346
                    "newProvides", PROVIDES_STRING_LIST_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1347
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1348
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1349
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1350
             * Invoke Builder.packages(String pn)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1351
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1352
            void packages(Set<String> packages) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1353
                int varIndex = dedupSetBuilder.newStringSet(packages);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1354
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1355
                mv.visitVarInsn(ALOAD, varIndex);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1356
                mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1357
                    "packages", SET_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1358
                mv.visitInsn(POP);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1359
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1360
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1361
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1362
             * Invoke Builder.mainClass(String cn)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1363
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1364
            void mainClass(String cn) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1365
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1366
                mv.visitLdcInsn(cn);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1367
                mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1368
                    "mainClass", STRING_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1369
                mv.visitInsn(POP);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1370
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1371
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1372
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1373
             * Invoke Builder.version(Version v);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1374
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1375
            void version(Version v) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1376
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1377
                mv.visitLdcInsn(v.toString());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1378
                mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1379
                    "version", STRING_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1380
                mv.visitInsn(POP);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1381
            }
43336
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
  1382
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
  1383
            void invokeBuilderMethod(String methodName, String value) {
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
  1384
                mv.visitVarInsn(ALOAD, BUILDER_VAR);
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
  1385
                mv.visitLdcInsn(value);
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
  1386
                mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER,
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
  1387
                    methodName, STRING_SIG, false);
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
  1388
                mv.visitInsn(POP);
be9fca030f91 8173381: osName/osArch/osVersion is missing in ModuleDescriptor created by SystemModules
mchung
parents: 42770
diff changeset
  1389
            }
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1390
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1391
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1392
        class ModuleHashesBuilder {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1393
            private static final String MODULE_HASHES_BUILDER =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1394
                "jdk/internal/module/ModuleHashes$Builder";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1395
            private static final String MODULE_HASHES_BUILDER_TYPE =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1396
                "L" + MODULE_HASHES_BUILDER + ";";
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1397
            static final String STRING_BYTE_ARRAY_SIG =
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1398
                "(Ljava/lang/String;[B)" + MODULE_HASHES_BUILDER_TYPE;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1399
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1400
            final ModuleHashes recordedHashes;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1401
            final MethodVisitor hmv;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1402
            final int index;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1403
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1404
            ModuleHashesBuilder(ModuleHashes hashes, int index, MethodVisitor hmv) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1405
                this.recordedHashes = hashes;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1406
                this.hmv = hmv;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1407
                this.index = index;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1408
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1409
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1410
            /**
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1411
             * Build ModuleHashes
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1412
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1413
            void build() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1414
                if (recordedHashes == null)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1415
                    return;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1416
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1417
                // new jdk.internal.module.ModuleHashes.Builder
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1418
                newModuleHashesBuilder();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1419
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1420
                // Invoke ModuleHashes.Builder::hashForModule
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1421
                recordedHashes
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1422
                    .names()
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1423
                    .forEach(mn -> hashForModule(mn, recordedHashes.hashFor(mn)));
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1424
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1425
                // Put ModuleHashes into the hashes array
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1426
                pushModuleHashes();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1427
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1428
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1429
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1430
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1431
             * Create ModuleHashes.Builder instance
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1432
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1433
            void newModuleHashesBuilder() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1434
                hmv.visitTypeInsn(NEW, MODULE_HASHES_BUILDER);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1435
                hmv.visitInsn(DUP);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1436
                hmv.visitLdcInsn(recordedHashes.algorithm());
42752
844691c73832 8171373: Reduce copying during initialization of ModuleHashes
redestad
parents: 42703
diff changeset
  1437
                pushInt(hmv, ((4 * recordedHashes.names().size()) / 3) + 1);
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1438
                hmv.visitMethodInsn(INVOKESPECIAL, MODULE_HASHES_BUILDER,
42752
844691c73832 8171373: Reduce copying during initialization of ModuleHashes
redestad
parents: 42703
diff changeset
  1439
                    "<init>", "(Ljava/lang/String;I)V", false);
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1440
                hmv.visitVarInsn(ASTORE, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1441
                hmv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1442
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1443
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1444
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1445
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1446
             * Invoke ModuleHashes.Builder::build and put the returned
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1447
             * ModuleHashes to the hashes array
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1448
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1449
            void pushModuleHashes() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1450
                hmv.visitVarInsn(ALOAD, MH_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1451
                pushInt(hmv, index);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1452
                hmv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1453
                hmv.visitMethodInsn(INVOKEVIRTUAL, MODULE_HASHES_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1454
                    "build", "()Ljdk/internal/module/ModuleHashes;",
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1455
                    false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1456
                hmv.visitInsn(AASTORE);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1457
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1458
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1459
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1460
             * Invoke ModuleHashes.Builder.hashForModule(String name, byte[] hash);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1461
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1462
            void hashForModule(String name, byte[] hash) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1463
                hmv.visitVarInsn(ALOAD, BUILDER_VAR);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1464
                hmv.visitLdcInsn(name);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1465
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1466
                pushInt(hmv, hash.length);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1467
                hmv.visitIntInsn(NEWARRAY, T_BYTE);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1468
                for (int i = 0; i < hash.length; i++) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1469
                    hmv.visitInsn(DUP);              // arrayref
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1470
                    pushInt(hmv, i);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1471
                    hmv.visitIntInsn(BIPUSH, hash[i]);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1472
                    hmv.visitInsn(BASTORE);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1473
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1474
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1475
                hmv.visitMethodInsn(INVOKEVIRTUAL, MODULE_HASHES_BUILDER,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1476
                    "hashForModule", STRING_BYTE_ARRAY_SIG, false);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1477
                hmv.visitInsn(POP);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1478
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1479
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1480
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1481
        /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1482
         * Wraps set creation, ensuring identical sets are properly deduplicated.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1483
         */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1484
        class DedupSetBuilder {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1485
            // map Set<String> to a specialized builder to allow them to be
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1486
            // deduplicated as they are requested
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1487
            final Map<Set<String>, SetBuilder<String>> stringSets = new HashMap<>();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1488
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1489
            // map Set<Requires.Modifier> to a specialized builder to allow them to be
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1490
            // deduplicated as they are requested
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1491
            final Map<Set<Requires.Modifier>, EnumSetBuilder<Requires.Modifier>>
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1492
                requiresModifiersSets = new HashMap<>();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1493
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1494
            // map Set<Exports.Modifier> to a specialized builder to allow them to be
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1495
            // deduplicated as they are requested
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1496
            final Map<Set<Exports.Modifier>, EnumSetBuilder<Exports.Modifier>>
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1497
                exportsModifiersSets = new HashMap<>();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1498
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1499
            // map Set<Opens.Modifier> to a specialized builder to allow them to be
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1500
            // deduplicated as they are requested
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1501
            final Map<Set<Opens.Modifier>, EnumSetBuilder<Opens.Modifier>>
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1502
                opensModifiersSets = new HashMap<>();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1503
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1504
            private final int stringSetVar;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1505
            private final int enumSetVar;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1506
            private final IntSupplier localVarSupplier;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1507
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1508
            DedupSetBuilder(IntSupplier localVarSupplier) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1509
                this.stringSetVar = localVarSupplier.getAsInt();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1510
                this.enumSetVar = localVarSupplier.getAsInt();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1511
                this.localVarSupplier = localVarSupplier;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1512
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1513
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1514
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1515
             * Add the given set of strings to this builder.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1516
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1517
            void stringSet(Set<String> strings) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1518
                stringSets.computeIfAbsent(strings,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1519
                    s -> new SetBuilder<>(s, stringSetVar, localVarSupplier)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1520
                ).increment();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1521
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1522
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1523
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1524
             * Add the given set of Exports.Modifiers
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1525
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1526
            void exportsModifiers(Set<Exports.Modifier> mods) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1527
                exportsModifiersSets.computeIfAbsent(mods, s ->
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1528
                                new EnumSetBuilder<>(s, EXPORTS_MODIFIER_CLASSNAME,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1529
                                        enumSetVar, localVarSupplier)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1530
                ).increment();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1531
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1532
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1533
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1534
             * Add the given set of Opens.Modifiers
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1535
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1536
            void opensModifiers(Set<Opens.Modifier> mods) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1537
                opensModifiersSets.computeIfAbsent(mods, s ->
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1538
                                new EnumSetBuilder<>(s, OPENS_MODIFIER_CLASSNAME,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1539
                                        enumSetVar, localVarSupplier)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1540
                ).increment();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1541
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1542
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1543
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1544
             * Add the given set of Requires.Modifiers
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1545
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1546
            void requiresModifiers(Set<Requires.Modifier> mods) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1547
                requiresModifiersSets.computeIfAbsent(mods, s ->
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1548
                    new EnumSetBuilder<>(s, REQUIRES_MODIFIER_CLASSNAME,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1549
                                         enumSetVar, localVarSupplier)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1550
                ).increment();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1551
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1552
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1553
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1554
             * Retrieve the index to the given set of Strings. Emit code to
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1555
             * generate it when SetBuilder::build is called.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1556
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1557
            int indexOfStringSet(Set<String> names) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1558
                return stringSets.get(names).build();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1559
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1560
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1561
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1562
             * Retrieve the index to the given set of Exports.Modifier.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1563
             * Emit code to generate it when EnumSetBuilder::build is called.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1564
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1565
            int indexOfExportsModifiers(Set<Exports.Modifier> mods) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1566
                return exportsModifiersSets.get(mods).build();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1567
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1568
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1569
            /**
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1570
             * Retrieve the index to the given set of Opens.Modifier.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1571
             * Emit code to generate it when EnumSetBuilder::build is called.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1572
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1573
            int indexOfOpensModifiers(Set<Opens.Modifier> mods) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1574
                return opensModifiersSets.get(mods).build();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1575
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1576
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1577
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1578
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1579
             * Retrieve the index to the given set of Requires.Modifier.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1580
             * Emit code to generate it when EnumSetBuilder::build is called.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1581
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1582
            int indexOfRequiresModifiers(Set<Requires.Modifier> mods) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1583
                return requiresModifiersSets.get(mods).build();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1584
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1585
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1586
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1587
             * Build a new string set without any attempt to deduplicate it.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1588
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1589
            int newStringSet(Set<String> names) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1590
                int index = new SetBuilder<>(names, stringSetVar, localVarSupplier).build();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1591
                assert index == stringSetVar;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1592
                return index;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1593
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1594
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1595
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1596
        /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1597
         * SetBuilder generates bytecode to create one single instance of Set
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1598
         * for a given set of elements and assign to a local variable slot.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1599
         * When there is only one single reference to a Set<T>,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1600
         * it will reuse defaultVarIndex.  For a Set with multiple references,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1601
         * it will use a new local variable retrieved from the nextLocalVar
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1602
         */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1603
        class SetBuilder<T> {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1604
            private final Set<T> elements;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1605
            private final int defaultVarIndex;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1606
            private final IntSupplier nextLocalVar;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1607
            private int refCount;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1608
            private int localVarIndex;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1609
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1610
            SetBuilder(Set<T> elements,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1611
                       int defaultVarIndex,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1612
                       IntSupplier nextLocalVar) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1613
                this.elements = elements;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1614
                this.defaultVarIndex = defaultVarIndex;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1615
                this.nextLocalVar = nextLocalVar;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1616
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1617
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1618
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1619
             * Increments the number of references to this particular set.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1620
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1621
            final void increment() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1622
                refCount++;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1623
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1624
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1625
            /**
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1626
             * Generate the appropriate instructions to load an object reference
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1627
             * to the element onto the stack.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1628
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1629
            void visitElement(T element, MethodVisitor mv) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1630
                mv.visitLdcInsn(element);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1631
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1632
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1633
            /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1634
             * Build bytecode for the Set represented by this builder,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1635
             * or get the local variable index of a previously generated set
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1636
             * (in the local scope).
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1637
             *
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1638
             * @return local variable index of the generated set.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1639
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1640
            final int build() {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1641
                int index = localVarIndex;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1642
                if (localVarIndex == 0) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1643
                    // if non-empty and more than one set reference this builder,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1644
                    // emit to a unique local
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1645
                    index = refCount <= 1 ? defaultVarIndex
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1646
                                          : nextLocalVar.getAsInt();
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1647
                    if (index < MAX_LOCAL_VARS) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1648
                        localVarIndex = index;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1649
                    } else {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1650
                        // overflow: disable optimization by using localVarIndex = 0
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1651
                        index = defaultVarIndex;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1652
                    }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1653
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1654
                    generateSetOf(index);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1655
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1656
                return index;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1657
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1658
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1659
            private void generateSetOf(int index) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1660
                if (elements.size() <= 10) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1661
                    // call Set.of(e1, e2, ...)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1662
                    StringBuilder sb = new StringBuilder("(");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1663
                    for (T t : elements) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1664
                        sb.append("Ljava/lang/Object;");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1665
                        visitElement(t, mv);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1666
                    }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1667
                    sb.append(")Ljava/util/Set;");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1668
                    mv.visitMethodInsn(INVOKESTATIC, "java/util/Set",
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1669
                            "of", sb.toString(), true);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1670
                } else {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1671
                    // call Set.of(E... elements)
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1672
                    pushInt(mv, elements.size());
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1673
                    mv.visitTypeInsn(ANEWARRAY, "java/lang/String");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1674
                    int arrayIndex = 0;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1675
                    for (T t : elements) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1676
                        mv.visitInsn(DUP);    // arrayref
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1677
                        pushInt(mv, arrayIndex);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1678
                        visitElement(t, mv);  // value
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1679
                        mv.visitInsn(AASTORE);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1680
                        arrayIndex++;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1681
                    }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1682
                    mv.visitMethodInsn(INVOKESTATIC, "java/util/Set",
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1683
                            "of", "([Ljava/lang/Object;)Ljava/util/Set;", true);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1684
                }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1685
                mv.visitVarInsn(ASTORE, index);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1686
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1687
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1688
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1689
        /*
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1690
         * Generates bytecode to create one single instance of EnumSet
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1691
         * for a given set of modifiers and assign to a local variable slot.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1692
         */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1693
        class EnumSetBuilder<T> extends SetBuilder<T> {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1694
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1695
            private final String className;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1696
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1697
            EnumSetBuilder(Set<T> modifiers, String className,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1698
                           int defaultVarIndex,
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1699
                           IntSupplier nextLocalVar) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1700
                super(modifiers, defaultVarIndex, nextLocalVar);
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1701
                this.className = className;
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1702
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1704
            /**
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1705
             * Loads an Enum field.
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1706
             */
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1707
            void visitElement(T t, MethodVisitor mv) {
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1708
                mv.visitFieldInsn(GETSTATIC, className, t.toString(),
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1709
                                  "L" + className + ";");
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1710
            }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1711
        }
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1712
    }
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1713
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1714
    /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1715
     * Generate SystemModulesMap and add it as a resource.
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1716
     *
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1717
     * @return the name of the class resource added to the pool
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1718
     */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1719
    private String genSystemModulesMapClass(String allSystemModulesClassName,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1720
                                            String defaultSystemModulesClassName,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1721
                                            Map<String, String> map,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1722
                                            ResourcePoolBuilder out) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1723
        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1724
                                         + ClassWriter.COMPUTE_FRAMES);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1725
        cw.visit(Opcodes.V1_8,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1726
                 ACC_FINAL+ACC_SUPER,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1727
                 SYSTEM_MODULES_MAP_CLASS,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1728
                 null,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1729
                 "java/lang/Object",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1730
                 null);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1731
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1732
        // <init>
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1733
        MethodVisitor mv = cw.visitMethod(0, "<init>", "()V", null, null);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1734
        mv.visitVarInsn(ALOAD, 0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1735
        mv.visitMethodInsn(INVOKESPECIAL,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1736
                           "java/lang/Object",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1737
                           "<init>",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1738
                           "()V",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1739
                           false);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1740
        mv.visitInsn(RETURN);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1741
        mv.visitMaxs(0, 0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1742
        mv.visitEnd();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1743
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1744
        // allSystemModules()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1745
        mv = cw.visitMethod(ACC_STATIC,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1746
                            "allSystemModules",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1747
                            "()Ljdk/internal/module/SystemModules;",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1748
                            "()Ljdk/internal/module/SystemModules;",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1749
                            null);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1750
        mv.visitCode();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1751
        mv.visitTypeInsn(NEW, allSystemModulesClassName);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1752
        mv.visitInsn(DUP);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1753
        mv.visitMethodInsn(INVOKESPECIAL,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1754
                           allSystemModulesClassName,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1755
                           "<init>",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1756
                           "()V",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1757
                           false);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1758
        mv.visitInsn(ARETURN);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1759
        mv.visitMaxs(0, 0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1760
        mv.visitEnd();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1761
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1762
        // defaultSystemModules()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1763
        mv = cw.visitMethod(ACC_STATIC,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1764
                            "defaultSystemModules",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1765
                            "()Ljdk/internal/module/SystemModules;",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1766
                            "()Ljdk/internal/module/SystemModules;",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1767
                            null);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1768
        mv.visitCode();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1769
        mv.visitTypeInsn(NEW, defaultSystemModulesClassName);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1770
        mv.visitInsn(DUP);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1771
        mv.visitMethodInsn(INVOKESPECIAL,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1772
                           defaultSystemModulesClassName,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1773
                           "<init>",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1774
                           "()V",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1775
                           false);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1776
        mv.visitInsn(ARETURN);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1777
        mv.visitMaxs(0, 0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1778
        mv.visitEnd();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1779
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1780
        // moduleNames()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1781
        mv = cw.visitMethod(ACC_STATIC,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1782
                            "moduleNames",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1783
                            "()[Ljava/lang/String;",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1784
                            "()[Ljava/lang/String;",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1785
                            null);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1786
        mv.visitCode();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1787
        pushInt(mv, map.size());
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1788
        mv.visitTypeInsn(ANEWARRAY, "java/lang/String");
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1789
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1790
        int index = 0;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1791
        for (String moduleName : map.keySet()) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1792
            mv.visitInsn(DUP);                  // arrayref
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1793
            pushInt(mv, index);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1794
            mv.visitLdcInsn(moduleName);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1795
            mv.visitInsn(AASTORE);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1796
            index++;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1797
        }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1798
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1799
        mv.visitInsn(ARETURN);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1800
        mv.visitMaxs(0, 0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1801
        mv.visitEnd();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1802
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1803
        // classNames()
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1804
        mv = cw.visitMethod(ACC_STATIC,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1805
                            "classNames",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1806
                            "()[Ljava/lang/String;",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1807
                            "()[Ljava/lang/String;",
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1808
                            null);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1809
        mv.visitCode();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1810
        pushInt(mv, map.size());
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1811
        mv.visitTypeInsn(ANEWARRAY, "java/lang/String");
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1812
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1813
        index = 0;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1814
        for (String className : map.values()) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1815
            mv.visitInsn(DUP);                  // arrayref
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1816
            pushInt(mv, index);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1817
            mv.visitLdcInsn(className.replace('/', '.'));
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1818
            mv.visitInsn(AASTORE);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1819
            index++;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1820
        }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1821
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1822
        mv.visitInsn(ARETURN);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1823
        mv.visitMaxs(0, 0);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1824
        mv.visitEnd();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1825
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1826
        // write the class file to the pool as a resource
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1827
        String rn = "/java.base/" + SYSTEM_MODULES_MAP_CLASS + ".class";
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1828
        ResourcePoolEntry e = ResourcePoolEntry.create(rn, cw.toByteArray());
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1829
        out.add(e);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1830
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1831
        return rn;
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1832
    }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1833
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1834
    /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1835
     * Pushes an int constant
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1836
     */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1837
    private static void pushInt(MethodVisitor mv, int value) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1838
        if (value <= 5) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1839
            mv.visitInsn(ICONST_0 + value);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1840
        } else if (value < Byte.MAX_VALUE) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1841
            mv.visitIntInsn(BIPUSH, value);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1842
        } else if (value < Short.MAX_VALUE) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1843
            mv.visitIntInsn(SIPUSH, value);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1844
        } else {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1845
            throw new IllegalArgumentException("exceed limit: " + value);
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1846
        }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1847
    }
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1848
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1849
    /**
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1850
     * Returns a module finder that finds all modules in the given list
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1851
     */
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1852
    private static ModuleFinder finderOf(Collection<ModuleInfo> moduleInfos) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1853
        Supplier<ModuleReader> readerSupplier = () -> null;
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1854
        Map<String, ModuleReference> namesToReference = new HashMap<>();
46096
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1855
        for (ModuleInfo mi : moduleInfos) {
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1856
            String name = mi.moduleName();
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1857
            ModuleReference mref
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1858
                = new ModuleReferenceImpl(mi.descriptor(),
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1859
                                          URI.create("jrt:/" + name),
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1860
                                          readerSupplier,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1861
                                          null,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1862
                                          mi.target(),
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1863
                                          null,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1864
                                          null,
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1865
                                          mi.moduleResolution());
62c77b334012 8185853: Generate readability graph at link time and other startup improvements
alanb
parents: 45652
diff changeset
  1866
            namesToReference.put(name, mref);
45652
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1867
        }
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1868
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1869
        return new ModuleFinder() {
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1870
            @Override
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1871
            public Optional<ModuleReference> find(String name) {
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1872
                Objects.requireNonNull(name);
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1873
                return Optional.ofNullable(namesToReference.get(name));
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1874
            }
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1875
            @Override
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1876
            public Set<ModuleReference> findAll() {
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1877
                return new HashSet<>(namesToReference.values());
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1878
            }
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1879
        };
33342314ce89 8181087: Module system implementation refresh (6/2017)
alanb
parents: 45004
diff changeset
  1880
    }
42703
20c39ea4a507 8170987: Module system implementation refresh (12/2016)
alanb
parents:
diff changeset
  1881
}