Merge remote-tracking branch 'aosp/upstream-main' into aosp/master am: 1317f29ad0 am: 8742e9d19f am: 210c7d0174android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341810000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341811030aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseaml_rkp_341810000aml_hef_341811030

Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/2327873

Change-Id: I6dec4d2861f797e01e4f2fa71e0b001740c03849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

12 files changed, 54 insertions, 86 deletions

diff --git a/java/com/google/turbine/binder/FileManagerClassBinder.java b/java/com/google/turbine/binder/FileManagerClassBinder.java
index d36d2d8..a807dd7 100644
--- a/java/com/google/turbine/binder/FileManagerClassBinder.java
+++ b/java/com/google/turbine/binder/FileManagerClassBinder.java
@@ -19,7 +19,6 @@ package com.google.turbine.binder;
 import com.google.common.base.Joiner;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.io.ByteStreams;
 import com.google.turbine.binder.bound.ModuleInfo;
 import com.google.turbine.binder.bytecode.BytecodeBoundClass;
 import com.google.turbine.binder.env.Env;
@@ -113,7 +112,7 @@ public final class FileManagerClassBinder {
                   @Override
                   public byte[] get() {
                     try {
-                      return ByteStreams.toByteArray(jfo.openInputStream());
+                      return jfo.openInputStream().readAllBytes();
                     } catch (IOException e) {
                       throw new UncheckedIOException(e);
                     }
@@ -162,7 +161,7 @@ public final class FileManagerClassBinder {
         @Override
         public byte[] get() {
           try {
-            return ByteStreams.toByteArray(fileObject.openInputStream());
+            return fileObject.openInputStream().readAllBytes();
           } catch (IOException e) {
             throw new UncheckedIOException(e);
           }
diff --git a/java/com/google/turbine/bytecode/ByteReader.java b/java/com/google/turbine/bytecode/ByteReader.java
index a9deff2..5458b49 100644
--- a/java/com/google/turbine/bytecode/ByteReader.java
+++ b/java/com/google/turbine/bytecode/ByteReader.java
@@ -20,11 +20,9 @@ import static com.google.common.base.Verify.verify;
 
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.ByteArrayInputStream;
 
 /** A {@link ByteArrayDataInput} wrapper that tracks the current byte array index. */
-@CanIgnoreReturnValue
 public class ByteReader {
 
   private final byte[] bytes;
diff --git a/java/com/google/turbine/bytecode/ClassReader.java b/java/com/google/turbine/bytecode/ClassReader.java
index 740026a..da35196 100644
--- a/java/com/google/turbine/bytecode/ClassReader.java
+++ b/java/com/google/turbine/bytecode/ClassReader.java
@@ -159,7 +159,7 @@ public class ClassReader {
   /** Reads a JVMS 4.7.9 Signature attribute. */
   private String readSignature(ConstantPoolReader constantPool) {
     String signature;
-    reader.u4(); // length
+    int unusedLength = reader.u4();
     signature = constantPool.utf8(reader.u2());
     return signature;
   }
@@ -167,7 +167,7 @@ public class ClassReader {
   /** Reads JVMS 4.7.6 InnerClasses attributes. */
   private List<ClassFile.InnerClass> readInnerClasses(
       ConstantPoolReader constantPool, String thisClass) {
-    reader.u4(); // length
+    int unusedLength = reader.u4();
     int numberOfClasses = reader.u2();
     List<ClassFile.InnerClass> innerclasses = new ArrayList<>();
     for (int i = 0; i < numberOfClasses; i++) {
@@ -197,7 +197,7 @@ public class ClassReader {
   private void readAnnotations(
       ImmutableList.Builder<ClassFile.AnnotationInfo> annotations,
       ConstantPoolReader constantPool) {
-    reader.u4(); // length
+    int unusedLength = reader.u4();
     int numAnnotations = reader.u2();
     for (int n = 0; n < numAnnotations; n++) {
       annotations.add(readAnnotation(constantPool));
@@ -207,7 +207,7 @@ public class ClassReader {
   /** Processes a JVMS 4.7.18 RuntimeVisibleParameterAnnotations attribute */
   public void readParameterAnnotations(
       List<ImmutableList.Builder<AnnotationInfo>> annotations, ConstantPoolReader constantPool) {
-    reader.u4(); // length
+    int unusedLength = reader.u4();
     int numParameters = reader.u1();
     while (annotations.size() < numParameters) {
       annotations.add(ImmutableList.builder());
@@ -223,7 +223,7 @@ public class ClassReader {
   /** Processes a JVMS 4.7.24 MethodParameters attribute. */
   private void readMethodParameters(
       ImmutableList.Builder<ParameterInfo> parameters, ConstantPoolReader constantPool) {
-    reader.u4(); // length
+    int unusedLength = reader.u4();
     int numParameters = reader.u1();
     for (int i = 0; i < numParameters; i++) {
       String name = constantPool.utf8(reader.u2());
@@ -239,7 +239,7 @@ public class ClassReader {
 
   /** Processes a JVMS 4.7.25 Module attribute. */
   private ModuleInfo readModule(ConstantPoolReader constantPool) {
-    reader.u4(); // length
+    int unusedLength = reader.u4();
     String name = constantPool.moduleInfo(reader.u2());
     int flags = reader.u2();
     int versionIndex = reader.u2();
@@ -423,7 +423,7 @@ public class ClassReader {
             signature = readSignature(constantPool);
             break;
           case "AnnotationDefault":
-            reader.u4(); // length
+            int unusedLength = reader.u4();
             defaultValue = readElementValue(constantPool);
             break;
           case "RuntimeInvisibleAnnotations":
@@ -470,7 +470,7 @@ public class ClassReader {
   /** Reads an Exceptions attribute. */
   private ImmutableList<String> readExceptions(ConstantPoolReader constantPool) {
     ImmutableList.Builder<String> exceptions = ImmutableList.builder();
-    reader.u4(); // length
+    int unusedLength = reader.u4();
     int numberOfExceptions = reader.u2();
     for (int exceptionIndex = 0; exceptionIndex < numberOfExceptions; exceptionIndex++) {
       exceptions.add(constantPool.classInfo(reader.u2()));
@@ -496,7 +496,7 @@ public class ClassReader {
         String attributeName = constantPool.utf8(reader.u2());
         switch (attributeName) {
           case "ConstantValue":
-            reader.u4(); // length
+            int unusedLength = reader.u4();
             value = constantPool.constant(reader.u2());
             break;
           case "RuntimeInvisibleAnnotations":
@@ -525,7 +525,7 @@ public class ClassReader {
   }
 
   private String readTurbineTransitiveJar(ConstantPoolReader constantPool) {
-    reader.u4(); // length
+    int unusedLength = reader.u4();
     return constantPool.utf8(reader.u2());
   }
 }
diff --git a/java/com/google/turbine/main/Main.java b/java/com/google/turbine/main/Main.java
index da97bcd..34984a8 100644
--- a/java/com/google/turbine/main/Main.java
+++ b/java/com/google/turbine/main/Main.java
@@ -58,7 +58,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
@@ -433,16 +432,11 @@ public final class Main {
   }
 
   /** Normalize timestamps. */
-  static final long DEFAULT_TIMESTAMP =
-      LocalDateTime.of(2010, 1, 1, 0, 0, 0)
-          .atZone(ZoneId.systemDefault())
-          .toInstant()
-          .toEpochMilli();
+  static final LocalDateTime DEFAULT_TIMESTAMP = LocalDateTime.of(2010, 1, 1, 0, 0, 0);
 
   private static void addEntry(JarOutputStream jos, String name, byte[] bytes) throws IOException {
     JarEntry je = new JarEntry(name);
-    // TODO(cushon): switch to setLocalTime after we migrate to JDK 9
-    je.setTime(DEFAULT_TIMESTAMP);
+    je.setTimeLocal(DEFAULT_TIMESTAMP);
     je.setMethod(ZipEntry.STORED);
     je.setSize(bytes.length);
     je.setCrc(Hashing.crc32().hashBytes(bytes).padToLong());
diff --git a/java/com/google/turbine/options/LanguageVersion.java b/java/com/google/turbine/options/LanguageVersion.java
index e2b0ea7..d8641b4 100644
--- a/java/com/google/turbine/options/LanguageVersion.java
+++ b/java/com/google/turbine/options/LanguageVersion.java
@@ -53,7 +53,7 @@ public abstract class LanguageVersion {
     try {
       return SourceVersion.valueOf("RELEASE_" + source());
     } catch (IllegalArgumentException unused) {
-      throw new IllegalArgumentException("invalid -source version: " + source());
+      return SourceVersion.latestSupported();
     }
   }
 
diff --git a/java/com/google/turbine/parse/ConstExpressionParser.java b/java/com/google/turbine/parse/ConstExpressionParser.java
index 8b7466f..e4aad6b 100644
--- a/java/com/google/turbine/parse/ConstExpressionParser.java
+++ b/java/com/google/turbine/parse/ConstExpressionParser.java
@@ -588,11 +588,11 @@ public class ConstExpressionParser {
     }
     eat();
     int pos = position;
-    Tree.ConstVarName constVarName = (Tree.ConstVarName) qualIdent();
-    if (constVarName == null) {
+    Expression constVarName = qualIdent();
+    if (!(constVarName instanceof Tree.ConstVarName)) {
       return null;
     }
-    ImmutableList<Ident> name = constVarName.name();
+    ImmutableList<Ident> name = ((Tree.ConstVarName) constVarName).name();
     ImmutableList.Builder<Tree.Expression> args = ImmutableList.builder();
     if (token == Token.LPAREN) {
       eat();
diff --git a/java/com/google/turbine/parse/Parser.java b/java/com/google/turbine/parse/Parser.java
index 9417801..acf84d7 100644
--- a/java/com/google/turbine/parse/Parser.java
+++ b/java/com/google/turbine/parse/Parser.java
@@ -547,6 +547,7 @@ public class Parser {
       switch (token) {
         case IDENT:
           {
+            String javadoc = lexer.javadoc();
             Ident name = eatIdent();
             if (token == Token.LPAREN) {
               dropParens();
@@ -569,7 +570,7 @@ public class Parser {
                         ImmutableList.of()),
                     name,
                     Optional.<Expression>empty(),
-                    null));
+                    javadoc));
             annos = ImmutableList.builder();
             break;
           }
diff --git a/java/com/google/turbine/processing/TurbineElements.java b/java/com/google/turbine/processing/TurbineElements.java
index b5fd7f4..9b3ea26 100644
--- a/java/com/google/turbine/processing/TurbineElements.java
+++ b/java/com/google/turbine/processing/TurbineElements.java
@@ -384,7 +384,7 @@ public class TurbineElements implements Elements {
       return false;
     }
     TypeMirror a = overrider.asType();
-    TypeMirror b = types.asMemberOf((DeclaredType) type.asType(), overridden);
+    TypeMirror b = types.asMemberOfInternal((DeclaredType) type.asType(), overridden);
     if (b == null) {
       return false;
     }
diff --git a/java/com/google/turbine/processing/TurbineFiler.java b/java/com/google/turbine/processing/TurbineFiler.java
index f440ada..8c522ba 100644
--- a/java/com/google/turbine/processing/TurbineFiler.java
+++ b/java/com/google/turbine/processing/TurbineFiler.java
@@ -24,7 +24,6 @@ import com.google.common.base.Function;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.io.ByteStreams;
 import com.google.turbine.diag.SourceFile;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -380,7 +379,7 @@ public class TurbineFiler implements Filer {
 
     @Override
     public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
-      return new String(ByteStreams.toByteArray(openInputStream()), UTF_8);
+      return new String(openInputStream().readAllBytes(), UTF_8);
     }
   }
 
diff --git a/java/com/google/turbine/processing/TurbineTypes.java b/java/com/google/turbine/processing/TurbineTypes.java
index d2068dd..467059c 100644
--- a/java/com/google/turbine/processing/TurbineTypes.java
+++ b/java/com/google/turbine/processing/TurbineTypes.java
@@ -26,18 +26,11 @@ import com.google.common.collect.ImmutableMap;
 import com.google.turbine.binder.bound.TypeBoundClass;
 import com.google.turbine.binder.bound.TypeBoundClass.TyVarInfo;
 import com.google.turbine.binder.sym.ClassSymbol;
-import com.google.turbine.binder.sym.FieldSymbol;
-import com.google.turbine.binder.sym.MethodSymbol;
-import com.google.turbine.binder.sym.ParamSymbol;
-import com.google.turbine.binder.sym.RecordComponentSymbol;
 import com.google.turbine.binder.sym.Symbol;
 import com.google.turbine.binder.sym.TyVarSymbol;
 import com.google.turbine.model.TurbineConstantTypeKind;
 import com.google.turbine.model.TurbineTyKind;
-import com.google.turbine.processing.TurbineElement.TurbineExecutableElement;
-import com.google.turbine.processing.TurbineElement.TurbineFieldElement;
 import com.google.turbine.processing.TurbineElement.TurbineTypeElement;
-import com.google.turbine.processing.TurbineElement.TurbineTypeParameterElement;
 import com.google.turbine.processing.TurbineTypeMirror.TurbineDeclaredType;
 import com.google.turbine.processing.TurbineTypeMirror.TurbineErrorType;
 import com.google.turbine.processing.TurbineTypeMirror.TurbineTypeVariable;
@@ -1127,41 +1120,6 @@ public class TurbineTypes implements Types {
                     .build()));
   }
 
-  private static ClassSymbol enclosingClass(Symbol symbol) {
-    switch (symbol.symKind()) {
-      case CLASS:
-        return (ClassSymbol) symbol;
-      case TY_PARAM:
-        return enclosingClass(((TyVarSymbol) symbol).owner());
-      case METHOD:
-        return ((MethodSymbol) symbol).owner();
-      case FIELD:
-        return ((FieldSymbol) symbol).owner();
-      case PARAMETER:
-        return ((ParamSymbol) symbol).owner().owner();
-      case RECORD_COMPONENT:
-        return ((RecordComponentSymbol) symbol).owner();
-      case MODULE:
-      case PACKAGE:
-        throw new IllegalArgumentException(symbol.symKind().toString());
-    }
-    throw new AssertionError(symbol.symKind());
-  }
-
-  private static Type type(Element element) {
-    switch (element.getKind()) {
-      case TYPE_PARAMETER:
-        return TyVar.create(((TurbineTypeParameterElement) element).sym(), ImmutableList.of());
-      case FIELD:
-        return ((TurbineFieldElement) element).info().type();
-      case METHOD:
-      case CONSTRUCTOR:
-        return ((TurbineExecutableElement) element).info().asType();
-      default:
-        throw new UnsupportedOperationException(element.toString());
-    }
-  }
-
   /**
    * Returns the {@link TypeMirror} of the given {@code element} as a member of {@code containing},
    * or else {@code null} if it is not a member.
@@ -1171,13 +1129,24 @@ public class TurbineTypes implements Types {
    */
   @Override
   public TypeMirror asMemberOf(DeclaredType containing, Element element) {
+    TypeMirror result = asMemberOfInternal(containing, element);
+    if (result == null) {
+      throw new IllegalArgumentException(String.format("asMemberOf(%s, %s)", containing, element));
+    }
+    return result;
+  }
+
+  public @Nullable TypeMirror asMemberOfInternal(DeclaredType containing, Element element) {
     ClassTy c = ((TurbineDeclaredType) containing).asTurbineType();
-    ClassSymbol symbol = enclosingClass(((TurbineElement) element).sym());
-    ImmutableList<ClassTy> path = factory.cha().search(c, enclosingClass(symbol));
+    Symbol enclosing = ((TurbineElement) element.getEnclosingElement()).sym();
+    if (!enclosing.symKind().equals(Symbol.Kind.CLASS)) {
+      return null;
+    }
+    ImmutableList<ClassTy> path = factory.cha().search(c, (ClassSymbol) enclosing);
     if (path.isEmpty()) {
       return null;
     }
-    Type type = type(element);
+    Type type = asTurbineType(element.asType());
     for (ClassTy ty : path) {
       ImmutableMap<TyVarSymbol, Type> mapping = getMapping(ty);
       if (mapping == null) {
diff --git a/java/com/google/turbine/type/Type.java b/java/com/google/turbine/type/Type.java
index 085346a..5fbf1b1 100644
--- a/java/com/google/turbine/type/Type.java
+++ b/java/com/google/turbine/type/Type.java
@@ -17,6 +17,7 @@
 package com.google.turbine.type;
 
 import static com.google.common.collect.Iterables.getLast;
+import static java.lang.Math.max;
 import static java.util.Objects.requireNonNull;
 
 import com.google.auto.value.AutoValue;
@@ -144,15 +145,23 @@ public interface Type {
       StringBuilder sb = new StringBuilder();
       boolean first = true;
       for (SimpleClassTy c : classes()) {
-        for (AnnoInfo anno : c.annos()) {
-          sb.append(anno);
-          sb.append(' ');
-        }
+        String binaryName = c.sym().binaryName();
         if (!first) {
+          for (AnnoInfo anno : c.annos()) {
+            sb.append(anno);
+            sb.append(' ');
+          }
           sb.append('.');
-          sb.append(c.sym().binaryName().substring(c.sym().binaryName().lastIndexOf('$') + 1));
+          sb.append(binaryName, binaryName.lastIndexOf('$') + 1, binaryName.length());
         } else {
-          sb.append(c.sym().binaryName().replace('/', '.').replace('$', '.'));
+          int idx = max(binaryName.lastIndexOf('/'), binaryName.lastIndexOf('$')) + 1;
+          String name = binaryName.replace('/', '.').replace('$', '.');
+          sb.append(name, 0, idx);
+          for (AnnoInfo anno : c.annos()) {
+            sb.append(anno);
+            sb.append(' ');
+          }
+          sb.append(name, idx, name.length());
         }
         if (!c.targs().isEmpty()) {
           sb.append('<');
diff --git a/java/com/google/turbine/zip/Zip.java b/java/com/google/turbine/zip/Zip.java
index d732b35..c08999b 100644
--- a/java/com/google/turbine/zip/Zip.java
+++ b/java/com/google/turbine/zip/Zip.java
@@ -18,7 +18,6 @@ package com.google.turbine.zip;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.google.common.io.ByteStreams;
 import com.google.common.primitives.UnsignedInts;
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
@@ -332,9 +331,9 @@ public final class Zip {
         fc.get(bytes);
         if (deflate) {
           bytes =
-              ByteStreams.toByteArray(
-                  new InflaterInputStream(
-                      new ByteArrayInputStream(bytes), new Inflater(/*nowrap=*/ true)));
+              new InflaterInputStream(
+                      new ByteArrayInputStream(bytes), new Inflater(/*nowrap=*/ true))
+                  .readAllBytes();
         }
         return bytes;
       } catch (IOException e) {