Skip to content

Remove flag control for emitAllPrivateMemberClasses #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove flag control for emitAllPrivateMemberClasses #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions java/com/google/turbine/lower/Lower.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -117,7 +114,6 @@ public static Builder builder() {
return new AutoValue_Lower_LowerOptions.Builder()
.languageVersion(LanguageVersion.createDefault())
.emitPrivateFields(false)
.emitAllPrivateMemberClasses(false)
.methodParameters(true);
}

Expand All @@ -128,15 +124,11 @@ public abstract static class Builder {

public Builder javacOpts(ImmutableList<String> 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();
Expand Down
5 changes: 1 addition & 4 deletions java/com/google/turbine/lower/RemovePrivateMembers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ private static void process(
Map<ClassSymbol, SourceTypeBoundClass> unit,
Lower.LowerOptions options,
ImmutableMap.Builder<ClassSymbol, SourceTypeBoundClass> result) {
Set<ClassSymbol> reachableClasses =
options.emitAllPrivateMemberClasses()
? unit.keySet()
: reachableClasses(env, unit, options);
Set<ClassSymbol> reachableClasses = reachableClasses(env, unit, options);
for (Map.Entry<ClassSymbol, SourceTypeBoundClass> e : unit.entrySet()) {
ClassSymbol sym = e.getKey();
SourceTypeBoundClass info = e.getValue();
Expand Down
10 changes: 3 additions & 7 deletions javatests/com/google/turbine/lower/LowerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,10 +783,7 @@ private static class Inner {}
ImmutableMap<String, byte[]> lowered =
Lower.lowerAll(
newDirectExecutorService(),
Lower.LowerOptions.builder()
.emitPrivateFields(true)
.emitAllPrivateMemberClasses(false)
.build(),
Lower.LowerOptions.builder().emitPrivateFields(true).build(),
bound.units(),
bound.modules(),
bound.classPathEnv())
Expand All @@ -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");
}
Expand All @@ -826,7 +823,6 @@ private static class Inner {}
/* moduleVersion= */ Optional.empty());
ImmutableMap<String, byte[]> lowered =
Lower.lowerAll(
newDirectExecutorService(),
Lower.LowerOptions.builder().emitAllPrivateMemberClasses(true).build(),
bound.units(),
bound.modules(),
Expand Down
Loading