Use fixed year for generated methods
Cherry-pick: Retain field access information for null valued fields
(Only the part related to the generation of methods)
Change-Id: Ia6ccf06e260453c285d4e5433e4bfb50588529e0
diff --git a/src/test/java/com/android/tools/r8/cfmethodgeneration/MethodGenerationBase.java b/src/test/java/com/android/tools/r8/cfmethodgeneration/MethodGenerationBase.java
index 87e0e89..821df7d 100644
--- a/src/test/java/com/android/tools/r8/cfmethodgeneration/MethodGenerationBase.java
+++ b/src/test/java/com/android/tools/r8/cfmethodgeneration/MethodGenerationBase.java
@@ -25,7 +25,6 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.Calendar;
import java.util.List;
import java.util.TreeSet;
@@ -46,11 +45,12 @@
protected abstract List<Class<?>> getMethodTemplateClasses();
- public static String getHeaderString(Class<?> generationClass, String generatedPackage) {
- int year = Calendar.getInstance().get(Calendar.YEAR);
- String simpleName = generationClass.getSimpleName();
+ protected abstract int getYear();
+
+ public String getHeaderString() {
+ String simpleName = getClass().getSimpleName();
return StringUtils.lines(
- "// Copyright (c) " + year + ", the R8 project authors. Please see the AUTHORS file",
+ "// Copyright (c) " + getYear() + ", the R8 project authors. Please see the AUTHORS file",
"// for details. All rights reserved. Use of this source code is governed by a",
"// BSD-style license that can be found in the LICENSE file.",
"",
@@ -58,7 +58,7 @@
"// GENERATED FILE. DO NOT EDIT! See " + simpleName + ".java.",
"// ***********************************************************************************",
"",
- "package " + generatedPackage + ";");
+ "package " + getGeneratedClassPackageName() + ";");
}
protected Path getGeneratedFile() {
@@ -114,7 +114,7 @@
private void generateRawOutput(CfCodePrinter codePrinter, Path tempFile) throws IOException {
try (PrintStream printer = new PrintStream(Files.newOutputStream(tempFile))) {
- printer.print(getHeaderString(this.getClass(), getGeneratedClassPackageName()));
+ printer.print(getHeaderString());
printer.println("import com.android.tools.r8.graph.DexItemFactory;");
codePrinter.getImports().forEach(i -> printer.println("import " + i + ";"));
printer.println("public final class " + getGeneratedClassName() + " {\n");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/GenerateEnumUnboxingMethods.java b/src/test/java/com/android/tools/r8/enumunboxing/GenerateEnumUnboxingMethods.java
index 54a405c..74bf88f 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/GenerateEnumUnboxingMethods.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/GenerateEnumUnboxingMethods.java
@@ -50,6 +50,10 @@
return METHOD_TEMPLATE_CLASSES;
}
+ @Override
+ protected int getYear() {
+ return 2020;
+ }
@Test
public void testEnumUtilityMethodsGenerated() throws Exception {
diff --git a/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java b/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java
index 05c11c4..d78a1c7 100644
--- a/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java
+++ b/src/test/java/com/android/tools/r8/ir/desugar/backports/GenerateBackportMethods.java
@@ -68,6 +68,11 @@
return METHOD_TEMPLATE_CLASSES;
}
+ @Override
+ protected int getYear() {
+ return 2020;
+ }
+
@Test
public void testBackportsGenerated() throws Exception {
ArrayList<Class<?>> sorted = new ArrayList<>(getMethodTemplateClasses());
