diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java index e4ccd1ed23..467b7a73f8 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java @@ -86,7 +86,7 @@ public class PackageFunction implements SkyFunction { private final PackageFactory packageFactory; private final CachingPackageLocator packageLocator; - private final Cache<PackageIdentifier, CacheEntryWithGlobDeps<Package.LegacyBuilder>> + private final Cache<PackageIdentifier, CacheEntryWithGlobDeps<Package.Builder>> packageFunctionCache; private final Cache<PackageIdentifier, CacheEntryWithGlobDeps<AstAfterPreprocessing>> astCache; private final AtomicBoolean showLoadingProgress; @@ -103,7 +103,7 @@ public class PackageFunction implements SkyFunction { PackageFactory packageFactory, CachingPackageLocator pkgLocator, AtomicBoolean showLoadingProgress, - Cache<PackageIdentifier, CacheEntryWithGlobDeps<Package.LegacyBuilder>> packageFunctionCache, + Cache<PackageIdentifier, CacheEntryWithGlobDeps<Package.Builder>> packageFunctionCache, Cache<PackageIdentifier, CacheEntryWithGlobDeps<AstAfterPreprocessing>> astCache, AtomicInteger numPackagesLoaded, @Nullable SkylarkImportLookupFunction skylarkImportLookupFunctionForInlining) { @@ -459,7 +459,7 @@ public class PackageFunction implements SkyFunction { List<Statement> preludeStatements = astLookupValue.lookupSuccessful() ? astLookupValue.getAST().getStatements() : ImmutableList.<Statement>of(); - CacheEntryWithGlobDeps<Package.LegacyBuilder> packageBuilderAndGlobDeps = + CacheEntryWithGlobDeps<Package.Builder> packageBuilderAndGlobDeps = loadPackage( externalPkg, replacementContents, @@ -473,8 +473,8 @@ public class PackageFunction implements SkyFunction { if (packageBuilderAndGlobDeps == null) { return null; } - Package.LegacyBuilder legacyPkgBuilder = packageBuilderAndGlobDeps.value; - legacyPkgBuilder.buildPartial(); + Package.Builder pkgBuilder = packageBuilderAndGlobDeps.value; + pkgBuilder.buildPartial(); try { // Since the Skyframe dependencies we request below in // markDependenciesAndPropagateInconsistentFilesystemExceptions are requested independently of @@ -483,7 +483,7 @@ public class PackageFunction implements SkyFunction { // bother checking for missing values and instead piggyback on the env.missingValues() call // for the former. This avoids a Skyframe restart. handleLabelsCrossingSubpackagesAndPropagateInconsistentFilesystemExceptions( - packageLookupValue.getRoot(), packageId, legacyPkgBuilder, env); + packageLookupValue.getRoot(), packageId, pkgBuilder, env); } catch (InternalInconsistentFilesystemException e) { packageFunctionCache.invalidate(packageId); throw new PackageFunctionException( @@ -491,12 +491,12 @@ public class PackageFunction implements SkyFunction { e.isTransient() ? Transience.TRANSIENT : Transience.PERSISTENT); } Set<SkyKey> globKeys = packageBuilderAndGlobDeps.globDepKeys; - Map<Label, Path> subincludes = legacyPkgBuilder.getSubincludes(); + Map<Label, Path> subincludes = pkgBuilder.getSubincludes(); boolean packageShouldBeConsideredInError; try { packageShouldBeConsideredInError = markDependenciesAndPropagateInconsistentFilesystemExceptions( - env, globKeys, subincludes, packageId, legacyPkgBuilder.containsErrors()); + env, globKeys, subincludes, packageId, pkgBuilder.containsErrors()); } catch (InternalInconsistentFilesystemException e) { packageFunctionCache.invalidate(packageId); throw new PackageFunctionException( @@ -507,12 +507,12 @@ public class PackageFunction implements SkyFunction { return null; } - Event.replayEventsOn(env.getListener(), legacyPkgBuilder.getEvents()); + Event.replayEventsOn(env.getListener(), pkgBuilder.getEvents()); if (packageShouldBeConsideredInError) { - legacyPkgBuilder.setContainsErrors(); + pkgBuilder.setContainsErrors(); } - Package pkg = legacyPkgBuilder.finishBuild(); + Package pkg = pkgBuilder.finishBuild(); // We know this SkyFunction will not be called again, so we can remove the cache entry. packageFunctionCache.invalidate(packageId); @@ -699,7 +699,7 @@ public class PackageFunction implements SkyFunction { } private static void handleLabelsCrossingSubpackagesAndPropagateInconsistentFilesystemExceptions( - Path pkgRoot, PackageIdentifier pkgId, Package.LegacyBuilder pkgBuilder, Environment env) + Path pkgRoot, PackageIdentifier pkgId, Package.Builder pkgBuilder, Environment env) throws InternalInconsistentFilesystemException { Set<SkyKey> containingPkgLookupKeys = Sets.newHashSet(); Map<Target, SkyKey> targetToKey = new HashMap<>(); @@ -778,7 +778,7 @@ public class PackageFunction implements SkyFunction { } private static boolean maybeAddEventAboutLabelCrossingSubpackage( - Package.LegacyBuilder pkgBuilder, Path pkgRoot, Label label, @Nullable Location location, + Package.Builder pkgBuilder, Path pkgRoot, Label label, @Nullable Location location, @Nullable ContainingPackageLookupValue containingPkgLookupValue) { if (containingPkgLookupValue == null) { return true; @@ -1081,7 +1081,7 @@ public class PackageFunction implements SkyFunction { * preprocessing. */ @Nullable - private CacheEntryWithGlobDeps<Package.LegacyBuilder> loadPackage( + private CacheEntryWithGlobDeps<Package.Builder> loadPackage( Package externalPkg, @Nullable String replacementContents, PackageIdentifier packageId, @@ -1092,7 +1092,7 @@ public class PackageFunction implements SkyFunction { Path packageRoot, Environment env) throws InterruptedException, PackageFunctionException { - CacheEntryWithGlobDeps<Package.LegacyBuilder> packageFunctionCacheEntry = + CacheEntryWithGlobDeps<Package.Builder> packageFunctionCacheEntry = packageFunctionCache.getIfPresent(packageId); if (packageFunctionCacheEntry == null) { profiler.startTask(ProfilerTask.CREATE_PACKAGE, packageId.toString()); @@ -1173,7 +1173,7 @@ public class PackageFunction implements SkyFunction { buildFilePath.getParentDirectory(), packageId, packageLocator); SkyframeHybridGlobber skyframeGlobber = new SkyframeHybridGlobber(packageId, packageRoot, env, legacyGlobber); - Package.LegacyBuilder pkgBuilder = packageFactory.createPackageFromPreprocessingAst( + Package.Builder pkgBuilder = packageFactory.createPackageFromPreprocessingAst( externalPkg, packageId, buildFilePath, astAfterPreprocessing, importResult.importMap, importResult.fileDependencies, defaultVisibility, skyframeGlobber); Set<SkyKey> globDepsRequested = ImmutableSet.<SkyKey>builder() |