Removes serialization class that introduced bug.
RELNOTES:none
PiperOrigin-RevId: 206767138
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java
deleted file mode 100644
index 2b983e4..0000000
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2017 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib.packages;
-
-import com.google.devtools.build.lib.skyframe.serialization.DeserializationContext;
-import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
-import com.google.devtools.build.lib.skyframe.serialization.SerializationContext;
-import com.google.devtools.build.lib.skyframe.serialization.SerializationException;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
-import com.google.protobuf.CodedInputStream;
-import com.google.protobuf.CodedOutputStream;
-import java.io.IOException;
-
-/**
- * Codec for a {@link SkylarkSemantics} object.
- *
- * <p>Since the core Skylark interpreter should not depend on the protobuf library, this codec
- * cannot be nested alongside the {@code SkylarkSemantics} class definition.
- *
- * <p>Tests for this codec are in {@link SkylarkSemanticsConsistencyTest}.
- */
-public final class SkylarkSemanticsCodec implements ObjectCodec<SkylarkSemantics> {
-
- @Override
- public Class<SkylarkSemantics> getEncodedClass() {
- return SkylarkSemantics.class;
- }
-
- @Override
- public void serialize(
- SerializationContext context, SkylarkSemantics semantics, CodedOutputStream codedOut)
- throws SerializationException, IOException {
- // <== Add new options here in alphabetic order ==>
- codedOut.writeBoolNoTag(semantics.experimentalEnableRepoMapping());
- codedOut.writeBoolNoTag(semantics.incompatibleBzlDisallowLoadAfterStatement());
- codedOut.writeBoolNoTag(semantics.incompatibleDepsetIsNotIterable());
- codedOut.writeBoolNoTag(semantics.incompatibleDepsetUnion());
- codedOut.writeBoolNoTag(semantics.incompatibleDisableDeprecatedAttrParams());
- codedOut.writeBoolNoTag(semantics.incompatibleDisableObjcProviderResources());
- codedOut.writeBoolNoTag(semantics.incompatibleDisallowDataTransition());
- codedOut.writeBoolNoTag(semantics.incompatibleDisallowDictPlus());
- codedOut.writeBoolNoTag(semantics.incompatibleDisallowFileType());
- codedOut.writeBoolNoTag(semantics.incompatibleDisallowLegacyJavaInfo());
- codedOut.writeBoolNoTag(semantics.incompatibleDisallowOldStyleArgsAdd());
- codedOut.writeBoolNoTag(semantics.incompatibleDisallowSlashOperator());
- codedOut.writeBoolNoTag(semantics.incompatibleGenerateJavaCommonSourceJar());
- codedOut.writeBoolNoTag(semantics.incompatibleNewActionsApi());
- codedOut.writeBoolNoTag(semantics.incompatibleNoSupportToolsInActionInputs());
- codedOut.writeBoolNoTag(semantics.incompatiblePackageNameIsAFunction());
- codedOut.writeBoolNoTag(semantics.incompatibleRangeType());
- codedOut.writeBoolNoTag(semantics.incompatibleRemoveNativeGitRepository());
- codedOut.writeBoolNoTag(semantics.incompatibleRemoveNativeHttpArchive());
- codedOut.writeBoolNoTag(semantics.incompatibleStringIsNotIterable());
- codedOut.writeBoolNoTag(semantics.internalSkylarkFlagTestCanary());
- }
-
- @Override
- public SkylarkSemantics deserialize(DeserializationContext context, CodedInputStream codedIn)
- throws SerializationException, IOException {
- SkylarkSemantics.Builder builder = SkylarkSemantics.builder();
-
- // <== Add new options here in alphabetic order ==>
- builder.experimentalEnableRepoMapping(codedIn.readBool());
- builder.incompatibleBzlDisallowLoadAfterStatement(codedIn.readBool());
- builder.incompatibleDepsetIsNotIterable(codedIn.readBool());
- builder.incompatibleDepsetUnion(codedIn.readBool());
- builder.incompatibleDisableDeprecatedAttrParams(codedIn.readBool());
- builder.incompatibleDisableObjcProviderResources(codedIn.readBool());
- builder.incompatibleDisallowDataTransition(codedIn.readBool());
- builder.incompatibleDisallowDictPlus(codedIn.readBool());
- builder.incompatibleDisallowFileType(codedIn.readBool());
- builder.incompatibleDisallowLegacyJavaInfo(codedIn.readBool());
- builder.incompatibleDisallowOldStyleArgsAdd(codedIn.readBool());
- builder.incompatibleDisallowSlashOperator(codedIn.readBool());
- builder.incompatibleGenerateJavaCommonSourceJar(codedIn.readBool());
- builder.incompatibleNewActionsApi(codedIn.readBool());
- builder.incompatibleNoSupportToolsInActionInputs(codedIn.readBool());
- builder.incompatiblePackageNameIsAFunction(codedIn.readBool());
- builder.incompatibleRangeType(codedIn.readBool());
- builder.incompatibleRemoveNativeGitRepository(codedIn.readBool());
- builder.incompatibleRemoveNativeHttpArchive(codedIn.readBool());
- builder.incompatibleStringIsNotIterable(codedIn.readBool());
- builder.internalSkylarkFlagTestCanary(codedIn.readBool());
-
- return builder.build();
- }
-}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
index 893d5d4..ed22d1e 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.skyframe.serialization.DeserializationContext;
+import com.google.devtools.build.lib.skyframe.serialization.DynamicCodec;
import com.google.devtools.build.lib.skyframe.serialization.SerializationContext;
import com.google.devtools.build.lib.skyframe.serialization.testutils.TestUtils;
import com.google.devtools.build.lib.syntax.SkylarkSemantics;
@@ -83,10 +84,11 @@
*/
@Test
public void serializationRoundTrip() throws Exception {
- SkylarkSemanticsCodec codec = new SkylarkSemanticsCodec();
+ DynamicCodec codec = new DynamicCodec(buildRandomSemantics(new Random(2)).getClass());
for (int i = 0; i < NUM_RANDOM_TRIALS; i++) {
SkylarkSemantics semantics = buildRandomSemantics(new Random(i));
SkylarkSemantics deserialized =
+ (SkylarkSemantics)
TestUtils.fromBytes(
new DeserializationContext(ImmutableMap.of()),
codec,
