src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java

rev 2819 : imported patch my-classpath-deps-00

*** 24,39 ****
   */
  
  package com.sun.tools.sjavac;
  
  import java.io.File;
  import java.util.HashMap;
- import java.util.HashSet;
  import java.util.Map;
  import java.util.Set;
  
  import com.sun.tools.javac.util.Assert;
  
  /**
   * The build state class captures the source code and generated artifacts
   * from a build. There are usually two build states, the previous one (prev),
   * loaded from the javac_state file, and the current one (now).
--- 24,40 ----
   */
  
  package com.sun.tools.sjavac;
  
  import java.io.File;
+ import java.util.Collections;
  import java.util.HashMap;
  import java.util.Map;
  import java.util.Set;
  
  import com.sun.tools.javac.util.Assert;
+ import com.sun.tools.sjavac.pubapi.PubApi;
  
  /**
   * The build state class captures the source code and generated artifacts
   * from a build. There are usually two build states, the previous one (prev),
   * loaded from the javac_state file, and the current one (now).
*** 75,85 ****
       * The package name "base:java.lang" will fetch the module named "base".
       * The package name ":java.net" will fetch the default module.
       */
      Module findModuleFromPackageName(String pkg) {
          int cp = pkg.indexOf(':');
!         Assert.check(cp != -1);
          String mod = pkg.substring(0, cp);
          return lookupModule(mod);
      }
  
      /**
--- 76,86 ----
       * The package name "base:java.lang" will fetch the module named "base".
       * The package name ":java.net" will fetch the default module.
       */
      Module findModuleFromPackageName(String pkg) {
          int cp = pkg.indexOf(':');
!         Assert.check(cp != -1, "Could not find package name");
          String mod = pkg.substring(0, cp);
          return lookupModule(mod);
      }
  
      /**
*** 152,176 ****
      /**
       * Calculate the package dependents (ie the reverse of the dependencies).
       */
      public void calculateDependents() {
          dependents = new HashMap<>();
          for (String s : packages.keySet()) {
              Package p = packages.get(s);
!             for (String d : p.dependencies()) {
!                 Set<String> ss = dependents.get(d);
!                 if (ss == null) {
!                     ss = new HashSet<>();
!                     dependents.put(d, ss);
!                 }
                  // Add the dependent information to the global dependent map.
!                 ss.add(s);
!                 Package dp = packages.get(d);
                  // Also add the dependent information to the package specific map.
                  // Normally, you do not compile java.lang et al. Therefore
                  // there are several packages that p depends upon that you
                  // do not have in your state database. This is perfectly fine.
                  if (dp != null) {
                      // But this package did exist in the state database.
                      dp.addDependent(p.name());
                  }
              }
--- 153,184 ----
      /**
       * Calculate the package dependents (ie the reverse of the dependencies).
       */
      public void calculateDependents() {
          dependents = new HashMap<>();
+ 
          for (String s : packages.keySet()) {
              Package p = packages.get(s);
! 
!             // Collect all dependencies of the classes in this package
!             Set<String> deps = p.typeDependencies()  // maps fqName -> set of dependencies
!                                 .values()
!                                 .stream()
!                                 .reduce(Collections.emptySet(), Util::union);
! 
!             // Now reverse the direction
! 
!             for (String dep : deps) {
                  // Add the dependent information to the global dependent map.
!                 String depPkgStr = ":" + dep.substring(0, dep.lastIndexOf('.'));
!                 dependents.merge(depPkgStr, Collections.singleton(s), Util::union);
! 
                  // Also add the dependent information to the package specific map.
                  // Normally, you do not compile java.lang et al. Therefore
                  // there are several packages that p depends upon that you
                  // do not have in your state database. This is perfectly fine.
+                 Package dp = packages.get(depPkgStr);
                  if (dp != null) {
                      // But this package did exist in the state database.
                      dp.addDependent(p.name());
                  }
              }
*** 268,281 ****
       * information about packages that were not recompiled.
       */
      public void copyPackagesExcept(BuildState prev, Set<String> recompiled, Set<String> removed) {
          for (String pkg : prev.packages().keySet()) {
              // Do not copy recompiled or removed packages.
!             if (recompiled.contains(pkg) || removed.contains(pkg)) continue;
              Module mnew = findModuleFromPackageName(pkg);
              Package pprev = prev.packages().get(pkg);
              mnew.addPackage(pprev);
!             // Do not forget to update the flattened data.
              packages.put(pkg, pprev);
          }
      }
  }
--- 276,299 ----
       * information about packages that were not recompiled.
       */
      public void copyPackagesExcept(BuildState prev, Set<String> recompiled, Set<String> removed) {
          for (String pkg : prev.packages().keySet()) {
              // Do not copy recompiled or removed packages.
!             if (recompiled.contains(pkg) || removed.contains(pkg))
!                 continue;
! 
              Module mnew = findModuleFromPackageName(pkg);
              Package pprev = prev.packages().get(pkg);
+ 
+             // Even though we haven't recompiled this package, we may have
+             // information about its public API: It may be a classpath dependency
+             if (packages.containsKey(pkg)) {
+                 pprev.setPubapi(PubApi.mergeTypes(pprev.getPubApi(),
+                                                   packages.get(pkg).getPubApi()));
+             }
+ 
              mnew.addPackage(pprev);
!             // Do not forget to update the flattened data. (See JDK-8071904)
              packages.put(pkg, pprev);
          }
      }
  }