make/CompileJavaModules.gmk

*** 450,460 ****
  
  jdk.jvmstat_COPY := aliasmap
  
  ################################################################################
  
! jdk.vm.ci_ADD_JAVAC_FLAGS := -Xlint:-exports
  
  ################################################################################
  
  jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
  jdk.xml.bind_CLEAN := .properties
--- 450,498 ----
  
  jdk.jvmstat_COPY := aliasmap
  
  ################################################################################
  
! # -parameters provides method's parameters information in class file,
! # JVMCI compilers make use of that information for various sanity checks.
! # Don't use Indy strings concatenation to have good JVMCI startup performance.
! 
! jdk.vm.ci_ADD_JAVAC_FLAGS := -parameters -Xlint:-exports -XDstringConcat=inline
! 
! ################################################################################
! 
! jdk.vm.compiler_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline
! 
! jdk.vm.compiler_EXCLUDES += \
!     org.graalvm.compiler.core.match.processor \
!     org.graalvm.compiler.nodeinfo.processor \
!     org.graalvm.compiler.options.processor \
!     org.graalvm.compiler.serviceprovider.processor \
!     org.graalvm.compiler.replacements.verifier \
!     org.graalvm.compiler.api.directives.test \
!     org.graalvm.compiler.api.test \
!     org.graalvm.compiler.asm.aarch64.test \
!     org.graalvm.compiler.asm.amd64.test \
!     org.graalvm.compiler.asm.sparc.test \
!     org.graalvm.compiler.asm.test \
!     org.graalvm.compiler.core.amd64.test \
!     org.graalvm.compiler.core.sparc.test \
!     org.graalvm.compiler.core.test \
!     org.graalvm.compiler.debug.test \
!     org.graalvm.compiler.graph.test \
!     org.graalvm.compiler.hotspot.amd64.test \
!     org.graalvm.compiler.hotspot.lir.test \
!     org.graalvm.compiler.hotspot.test \
!     org.graalvm.compiler.jtt \
!     org.graalvm.compiler.lir.jtt \
!     org.graalvm.compiler.lir.test \
!     org.graalvm.compiler.nodes.test \
!     org.graalvm.compiler.options.test \
!     org.graalvm.compiler.phases.common.test \
!     org.graalvm.compiler.replacements.test \
!     org.graalvm.compiler.test \
!     #
  
  ################################################################################
  
  jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
  jdk.xml.bind_CLEAN := .properties
*** 513,522 ****
--- 551,568 ----
        $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
            $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src)))
    MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
  endif
  
+ ifeq ($(MODULE), jdk.vm.compiler)
+   ## WORKAROUND jdk.vm.compiler source structure issue
+   VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+       $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src, \
+           $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+   MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
+ endif
+ 
  $(eval $(call SetupJavaCompilation, $(MODULE), \
      SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
      MODULE := $(MODULE), \
      SRC := $(wildcard $(MODULE_SRC_DIRS)), \
      INCLUDES := $(JDK_USER_DEFINED_FILTER), \