Skip to content

Commit

Permalink
Assume no skyframe deps are requested in the ConfigurationFragmentFun…
Browse files Browse the repository at this point in the history
…ction

#6072.

RELNOTES: None
PiperOrigin-RevId: 223312270
  • Loading branch information
hlopko authored and Copybara-Service committed Nov 29, 2018
1 parent bd40911 commit 9820369
Showing 1 changed file with 1 addition and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,8 @@ public SkyValue compute(SkyKey skyKey, Environment env)
BuildOptions buildOptions = configurationFragmentKey.getBuildOptions();
ConfigurationFragmentFactory factory = getFactory(configurationFragmentKey.getFragmentType());
try {
Fragment fragment = factory.create(buildOptions);

if (env.valuesMissing()) {
return null;
}
return new ConfigurationFragmentValue(fragment);
return new ConfigurationFragmentValue(factory.create(buildOptions));
} catch (InvalidConfigurationException e) {
// TODO(bazel-team): Rework the control-flow here so that we're not actually throwing this
// exception with missing Skyframe dependencies.
if (env.valuesMissing()) {
return null;
}
throw new ConfigurationFragmentFunctionException(e);
}
}
Expand Down

0 comments on commit 9820369

Please sign in to comment.