diff --git a/java/com/google/turbine/lower/Lower.java b/java/com/google/turbine/lower/Lower.java index 735f4ce8..2a8fcc94 100644 --- a/java/com/google/turbine/lower/Lower.java +++ b/java/com/google/turbine/lower/Lower.java @@ -104,9 +104,6 @@ public abstract static class LowerOptions { public abstract boolean emitPrivateFields(); - // TODO: b/496858305 - consider removing this after rolling out the feature - public abstract boolean emitAllPrivateMemberClasses(); - public abstract boolean methodParameters(); public static LowerOptions createDefault() { @@ -117,7 +114,6 @@ public static Builder builder() { return new AutoValue_Lower_LowerOptions.Builder() .languageVersion(LanguageVersion.createDefault()) .emitPrivateFields(false) - .emitAllPrivateMemberClasses(false) .methodParameters(true); } @@ -128,15 +124,11 @@ public abstract static class Builder { public Builder javacOpts(ImmutableList javacOpts) { return emitPrivateFields(javacOpts.contains("-XDturbine.emitPrivateFields")) - .emitAllPrivateMemberClasses( - javacOpts.contains("-XDturbine.emitAllPrivateMemberClasses")) .methodParameters(!javacOpts.contains("-XDturbine.noMethodParameters")); } public abstract Builder emitPrivateFields(boolean emitPrivateFields); - public abstract Builder emitAllPrivateMemberClasses(boolean emitAllPrivateMemberClasses); - public abstract Builder methodParameters(boolean methodParameters); public abstract LowerOptions build(); diff --git a/java/com/google/turbine/lower/RemovePrivateMembers.java b/java/com/google/turbine/lower/RemovePrivateMembers.java index 66f31c09..78c59483 100644 --- a/java/com/google/turbine/lower/RemovePrivateMembers.java +++ b/java/com/google/turbine/lower/RemovePrivateMembers.java @@ -75,10 +75,7 @@ private static void process( Map unit, Lower.LowerOptions options, ImmutableMap.Builder result) { - Set reachableClasses = - options.emitAllPrivateMemberClasses() - ? unit.keySet() - : reachableClasses(env, unit, options); + Set reachableClasses = reachableClasses(env, unit, options); for (Map.Entry e : unit.entrySet()) { ClassSymbol sym = e.getKey(); SourceTypeBoundClass info = e.getValue(); diff --git a/javatests/com/google/turbine/lower/LowerTest.java b/javatests/com/google/turbine/lower/LowerTest.java index 0fc05d8b..3aa139a8 100644 --- a/javatests/com/google/turbine/lower/LowerTest.java +++ b/javatests/com/google/turbine/lower/LowerTest.java @@ -783,10 +783,7 @@ private static class Inner {} ImmutableMap lowered = Lower.lowerAll( newDirectExecutorService(), - Lower.LowerOptions.builder() - .emitPrivateFields(true) - .emitAllPrivateMemberClasses(false) - .build(), + Lower.LowerOptions.builder().emitPrivateFields(true).build(), bound.units(), bound.modules(), bound.classPathEnv()) @@ -804,8 +801,8 @@ public FieldVisitor visitField( }, 0); assertThat(fields).containsExactly("x"); - // We would normally omit Test$Inner because it is a private member class and we have - // emitAllPrivateMemberClasses(false). But it is referenced as the type of a private field, and + // We would normally omit Test$Inner because it is a private member class. + // But it is referenced as the type of a private field, and // we have emitPrivateFields(true), so it should be included. assertThat(lowered.keySet()).containsExactly("Test", "Test$Inner"); } @@ -826,7 +823,6 @@ private static class Inner {} /* moduleVersion= */ Optional.empty()); ImmutableMap lowered = Lower.lowerAll( - newDirectExecutorService(), Lower.LowerOptions.builder().emitAllPrivateMemberClasses(true).build(), bound.units(), bound.modules(),