Translator improvements: remove experimental flag: -Xrename-package-p…

…rivate-class-constructors. PiperOrigin-RevId: 281085854
google · Nov 18, 2019 · 106f186 · 106f186
1 parent bf21aa2
commit 106f186
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 21 deletions.
diff --git a/jre_emul/Makefile b/jre_emul/Makefile
@@ -39,8 +39,7 @@ TRANSLATE_JAVA_RELATIVE = $(JAVA_TO_TRANSLATE)
 TRANSLATE_ARGS = -sourcepath $(JRE_SRC) \
   $(J2OBJC_DEBUGFLAGS) -encoding UTF-8 --doc-comments -Xtranslate-bootclasspath \
   --nullability -external-annotation-file $(ANDROID_ANNOTATIONS) \
-  -external-annotation-file $(J2OBJC_ANNOTATIONS) \
-  -Xrename-package-private-class-constructors
+  -external-annotation-file $(J2OBJC_ANNOTATIONS)
 ifndef JAVA_8
 TRANSLATE_ARGS += --patch-module java.base=$(JRE_SRC)
 endif

diff --git a/translator/src/main/java/com/google/devtools/j2objc/Options.java b/translator/src/main/java/com/google/devtools/j2objc/Options.java
@@ -506,8 +506,6 @@ private void processArg(Iterator<String> args) throws IOException {
         emitKytheMappings = true;
       } else if (arg.equals("-Xno-source-headers")) {
         emitSourceHeaders = false;
-      } else if (arg.equals("-Xrename-package-private-class-constructors")) {
-        renamePackagePrivateClassConstructors = true;
       } else if (arg.equals("-external-annotation-file")) {
         addExternalAnnotationFile(getArgValue(args, arg));
       } else if (arg.equals("--reserved-names")) {
@@ -1046,16 +1044,4 @@ public void addPlatformModuleSystemOptions(String... flags) {
   public List<String> getPlatformModuleSystemOptions() {
     return platformModuleSystemOptions;
   }
-
-  // TODO(b/36097300): remove experimental flag once the change is rolled out or promote to
-  //  supported flag if rolling out the change is too disruptive.
-  private static boolean renamePackagePrivateClassConstructors = true;
-
-  public static boolean renamePackagePrivateClassConstructors() {
-    return renamePackagePrivateClassConstructors;
-  }
-
-  public static void setRenamePackagePrivateClassConstructors(boolean b) {
-    renamePackagePrivateClassConstructors = b;
-  }
 }
diff --git a/translator/src/main/java/com/google/devtools/j2objc/util/NameTable.java b/translator/src/main/java/com/google/devtools/j2objc/util/NameTable.java
@@ -349,8 +349,7 @@ private static String getMethodName(ExecutableElement method) {
           && !ElementUtil.isEnum(clazz)
           // Do not apply this change to classes in the default package
           // because it affects/breaks several translator tests.
-          && !ElementUtil.getPackage(clazz).isUnnamed()
-          && Options.renamePackagePrivateClassConstructors();
+          && !ElementUtil.getPackage(clazz).isUnnamed();
       return needsPackagePrivateSuffix ? "initPackagePrivate" : "init";
     }
     String name = ElementUtil.getName(method);

diff --git a/translator/src/test/java/com/google/devtools/j2objc/util/NameTableTest.java b/translator/src/test/java/com/google/devtools/j2objc/util/NameTableTest.java
@@ -17,7 +17,6 @@
 package com.google.devtools.j2objc.util;
 
 import com.google.devtools.j2objc.GenerationTest;
-import com.google.devtools.j2objc.Options;
 import com.google.devtools.j2objc.ast.AbstractTypeDeclaration;
 import com.google.devtools.j2objc.ast.CompilationUnit;
 import com.google.devtools.j2objc.ast.MethodDeclaration;
@@ -218,11 +217,9 @@ public void testRenameConstructorAnnotation() throws IOException {
   }
 
   public void testRenamePackagePrivateClassConstructor() throws IOException {
-    Options.setRenamePackagePrivateClassConstructors(true);
     String translation = translateSourceFile("package foo.bar; class Test { Test(int unused) {} }",
         "foo.bar.Test", "foo/bar/Test.h");
     assertTranslation(translation, "initPackagePrivateWithInt_");
-    Options.setRenamePackagePrivateClassConstructors(false);
   }
 
   public void testSuperMethodNotNamedWarning() throws IOException {