Hi, On Thu, 2020-08-06 at 16:01 +0100, Maurizio Cimadamore wrote: > The basic fix looks good, I'm wondering, however, if we would only want > to enable sources which match the current configuration? E.g. not add > the sources for aarch64 if building on linux? But if we build all these > modules regardless, then it's ok to add them all.
Looks like on an x86_64 Linux build aarch64 classes get compiled into the module(s) as well: $ find build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci | grep aarch64 build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/aarch64 build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/aarch64/AArch64$Flag.class build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/aarch64/AArch64Kind$1.class build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/aarch64/AArch64.class build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/aarch64/AArch64$CPUFeature.class build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/aarch64/AArch64$1.class build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/aarch64/AArch64Kind.class build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/hotspot/aarch64 build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.class build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig$1.class build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.class build/linux-x86_64-server-release/jdk/modules/jdk.internal.vm.ci/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.class Thanks, Severin > Maurizio > > On 06/08/2020 15:28, Galder Zamarreno wrote: > > Hi, > > > > `bin/idea.sh` is not generating the right source folders for > > jdk.internal.vm.ci and jdk.internal.vm.compiler modules. > > > > These modules have different directory structures to the rest and so should > > be handled exceptionally so that the IDE has the right source folder > > definitions. > > > > The fix takes these two modules, inspects all the subdirectories within > > each module root and generates a source folder definition for each. As > > example, for jdk.internal.vm.ci, there should be a source folder for: > > > > * src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src > > * src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src > > * ... > > > > I've tested this in the patch on IDEA 2020.2. > > > > Bug: https://bugs.openjdk.java.net/browse/JDK-8251193 > > WebRev: > > http://cr.openjdk.java.net/~sgehwolf/webrevs/galder/JDK-8251193/01/webrev/ > > > > Galder
