diff options
author | 2016-01-19 11:03:22 +0000 | |
---|---|---|
committer | 2016-01-19 13:28:10 +0000 | |
commit | d55d7afc7532f6e0cb56cde4b05487c784842395 (patch) | |
tree | e96f0f488a896c8bd68a90846828aa2ad367d86c /src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java | |
parent | 8e2adfbf3c0eb5db6a591cc56a228fee986ccb6a (diff) |
General cleanup for the configured target / aspect creation code.
- update some comments
- add some comments to make it easier to follow
- delete some dead code, in particular the SkyframeDependencyResolver can
never be null; remove an non-applicable @Nullable annotation
I'm trying to figure out how the error handling code works, in order to add
support for interleaved loading+analysis, which requires handling loading
errors in this code path.
--
MOS_MIGRATED_REVID=112456674
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java index a109dab801..c5a54dcdd5 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java @@ -75,8 +75,6 @@ public class PostConfiguredTargetFunction implements SkyFunction { ImmutableMap<Action, ConflictException> badActions = PrecomputedValue.BAD_ACTIONS.get(env); ConfiguredTargetValue ctValue = (ConfiguredTargetValue) env.getValue(ConfiguredTargetValue.key((ConfiguredTargetKey) skyKey.argument())); - SkyframeDependencyResolver resolver = - buildViewProvider.getSkyframeBuildView().createDependencyResolver(env); if (env.valuesMissing()) { return null; } @@ -101,6 +99,8 @@ public class PostConfiguredTargetFunction implements SkyFunction { try { BuildConfiguration hostConfiguration = buildViewProvider.getSkyframeBuildView().getHostConfiguration(ct.getConfiguration()); + SkyframeDependencyResolver resolver = + buildViewProvider.getSkyframeBuildView().createDependencyResolver(env); deps = resolver.dependentNodeMap( ctgValue, hostConfiguration, /*aspect=*/ null, configConditions); |