diff options
| author |  brandjon <brandjon@google.com> | 2017-10-06 06:07:13 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-10-06 19:48:49 +0200 |
| commit | 617f8ff0f502e911bba61d0c33390413bef9250c (patch) | |
| tree | fbb7e2481dc85609f13ca8be207d01e6fa7a38fd /src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java | |
| parent | b4d87b54ec6d4aa95d3b77f23aed2ad75619e968 (diff) | |
Pass SkylarkSemantics through Skyframe instead of the options class
Also remove the use of the @UsesOnlyCoreTypes annotation on SkylarkSemanticsOptions. It was only there to help mark that the options class was safe to put in Skyframe.
RELNOTES: None
PiperOrigin-RevId: 171248504
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java index 1b7ccc9472..a506485491 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java @@ -24,7 +24,7 @@ import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory.BuildIn import com.google.devtools.build.lib.packages.RuleVisibility; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.skyframe.SkyframeActionExecutor.ConflictException; -import com.google.devtools.build.lib.syntax.SkylarkSemanticsOptions; +import com.google.devtools.build.lib.syntax.SkylarkSemantics; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.skyframe.Injectable; @@ -85,7 +85,7 @@ public final class PrecomputedValue implements SkyValue { public static final Precomputed<RuleVisibility> DEFAULT_VISIBILITY = new Precomputed<>(LegacySkyKey.create(SkyFunctions.PRECOMPUTED, "default_visibility")); - public static final Precomputed<SkylarkSemanticsOptions> SKYLARK_SEMANTICS = + public static final Precomputed<SkylarkSemantics> SKYLARK_SEMANTICS = new Precomputed<>(LegacySkyKey.create(SkyFunctions.PRECOMPUTED, "skylark_semantics")); static final Precomputed<UUID> BUILD_ID = |