diff options
Diffstat (limited to 'src')
6 files changed, 9 insertions, 28 deletions
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 index 29b3b5d0c2..fe7e4d9a38 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java +++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java @@ -55,7 +55,6 @@ public final class SkylarkSemanticsCodec implements ObjectCodec<SkylarkSemantics codedOut.writeBoolNoTag(semantics.incompatibleNewActionsApi()); codedOut.writeBoolNoTag(semantics.incompatibleShowAllPrintMessages()); codedOut.writeBoolNoTag(semantics.incompatibleStringIsNotIterable()); - codedOut.writeBoolNoTag(semantics.internalDoNotExportBuiltins()); codedOut.writeBoolNoTag(semantics.internalSkylarkFlagTestCanary()); } @@ -80,7 +79,6 @@ public final class SkylarkSemanticsCodec implements ObjectCodec<SkylarkSemantics builder.incompatibleNewActionsApi(codedIn.readBool()); builder.incompatibleShowAllPrintMessages(codedIn.readBool()); builder.incompatibleStringIsNotIterable(codedIn.readBool()); - builder.internalDoNotExportBuiltins(codedIn.readBool()); builder.internalSkylarkFlagTestCanary(codedIn.readBool()); return builder.build(); diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java index d588118588..afbdcd71b0 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java +++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java @@ -245,20 +245,6 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable ) public boolean incompatibleStringIsNotIterable; - /** - * Used in testing to produce a truly minimalistic Extension object for certain evaluation - * contexts. This flag is Bazel-specific. - */ - // TODO(bazel-team): A pending incompatible change will make it so that load()ed and built-in - // symbols do not get re-exported, making this flag obsolete. - @Option( - name = "internal_do_not_export_builtins", - defaultValue = "false", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = {OptionEffectTag.UNKNOWN} - ) - public boolean internalDoNotExportBuiltins; - /** Used in an integration test to confirm that flags are visible to the interpreter. */ @Option( name = "internal_skylark_flag_test_canary", @@ -287,7 +273,6 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable .incompatibleNewActionsApi(incompatibleNewActionsApi) .incompatibleShowAllPrintMessages(incompatibleShowAllPrintMessages) .incompatibleStringIsNotIterable(incompatibleStringIsNotIterable) - .internalDoNotExportBuiltins(internalDoNotExportBuiltins) .internalSkylarkFlagTestCanary(internalSkylarkFlagTestCanary) .build(); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index 5924481a85..6bca56719a 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java @@ -1862,6 +1862,11 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { } @VisibleForTesting + public PackageFactory getPackageFactoryForTesting() { + return pkgFactory; + } + + @VisibleForTesting public Package.Builder.Helper getPackageBuilderHelperForTesting() { return pkgFactory.getPackageBuilderHelperForTesting(); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java index 41cc8b19b9..ad4c5a9d74 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java @@ -385,9 +385,7 @@ public class SkylarkImportLookupFunction implements SkyFunction { .createSkylarkRuleClassEnvironment( extensionLabel, mutability, skylarkSemantics, eventHandler, ast.getContentHashCode(), importMap); - if (!skylarkSemantics.internalDoNotExportBuiltins()) { - extensionEnv.setupOverride("native", packageFactory.getNativeModule(inWorkspace)); - } + extensionEnv.setupOverride("native", packageFactory.getNativeModule(inWorkspace)); execAndExport(ast, extensionLabel, eventHandler, extensionEnv); Event.replayEventsOn(env.getListener(), eventHandler.getEvents()); diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java index 9a6f9159bf..c816cd6e34 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java @@ -58,7 +58,6 @@ public abstract class SkylarkSemantics { public abstract boolean incompatibleNewActionsApi(); public abstract boolean incompatibleShowAllPrintMessages(); public abstract boolean incompatibleStringIsNotIterable(); - public abstract boolean internalDoNotExportBuiltins(); public abstract boolean internalSkylarkFlagTestCanary(); /** Returns a {@link Builder} initialized with the values of this instance. */ @@ -90,10 +89,9 @@ public abstract class SkylarkSemantics { .incompatibleLoadArgumentIsLabel(true) .incompatibleNewActionsApi(false) .incompatibleShowAllPrintMessages(true) - .incompatibleStringIsNotIterable(false) - .internalDoNotExportBuiltins(false) - .internalSkylarkFlagTestCanary(false) - .build(); + .incompatibleStringIsNotIterable(false) + .internalSkylarkFlagTestCanary(false) + .build(); /** Builder for {@link SkylarkSemantics}. All fields are mandatory. */ @AutoValue.Builder @@ -119,7 +117,6 @@ public abstract class SkylarkSemantics { public abstract Builder incompatibleNewActionsApi(boolean value); public abstract Builder incompatibleShowAllPrintMessages(boolean value); public abstract Builder incompatibleStringIsNotIterable(boolean value); - public abstract Builder internalDoNotExportBuiltins(boolean value); public abstract Builder internalSkylarkFlagTestCanary(boolean value); public abstract SkylarkSemantics 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 beb1ffcbba..56d8039642 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 @@ -128,7 +128,6 @@ public class SkylarkSemanticsConsistencyTest { "--incompatible_new_actions_api=" + rand.nextBoolean(), "--incompatible_show_all_print_messages=" + rand.nextBoolean(), "--incompatible_string_is_not_iterable=" + rand.nextBoolean(), - "--internal_do_not_export_builtins=" + rand.nextBoolean(), "--internal_skylark_flag_test_canary=" + rand.nextBoolean()); } @@ -154,7 +153,6 @@ public class SkylarkSemanticsConsistencyTest { .incompatibleNewActionsApi(rand.nextBoolean()) .incompatibleShowAllPrintMessages(rand.nextBoolean()) .incompatibleStringIsNotIterable(rand.nextBoolean()) - .internalDoNotExportBuiltins(rand.nextBoolean()) .internalSkylarkFlagTestCanary(rand.nextBoolean()) .build(); } |