[Rollback] Serialize sourceFile.getNumLines() and sourceFile.getNumBytes() in TypedAST

This avoids the need to recompute these values, and in particular to reread the JS source from disk, for certain compilations.

PiperOrigin-RevId: 510264548

Author: lauraharker

src/com/google/javascript/jscomp/SourceFile.java

@@ -519,66 +519,9 @@ public static SourceFile fromCode(String fileName, String code) {
     return builder().withPath(fileName).withContent(code).build();
   }
 
-  /**
-   * Reconciles serialized state in a {@link SourceFileProto} with the existing state in this file.
-   *
-   * <p>This should be called whenever initializing a compilation based on TypedAST protos. For
-   * these compilations, the compiler initalization methods require creating SourceFiles before
-   * deserializing TypedAST protos, so we sometimes get two copies of the same SourceFile.)
-   */
-  public void restoreCachedStateFrom(SourceFileProto protoSourceFile) {
-    checkState(
-        protoSourceFile.getFilename().equals(this.getName()),
-        "Cannot restore state for %s from %s",
-        this.getName(),
-        protoSourceFile.getFilename());
-    // TypedAST proto information is expected to be more accurate for:
-    //  1) whether a SourceFile contains an @extern annotation or not. In non-TypedAST
-    //    builds, we allow passing @extern files under the --js flag.  For TypedAST builds, we
-    //    could support this, but it's an uncommon pattern and trickier to support than ban.
-    //  2) tracking some extra state that is lazily computed in a SourceFile, like the number of
-    //     lines and bytes in a file. SourceFile::restoreCachedStateFrom handles this case.
-    // Note: the state in the proto might be incorrect in other cases, since some state cannot be
-    // computed during library-level typechecking (e.g. what files are in the weak chunk)
-    if (protoSourceFile.getSourceKind() == SourceFileProto.SourceKind.EXTERN) {
-      checkState(
-          this.getKind() == SourceKind.EXTERN,
-          "TypedAST compilations must pass all extern files as externs, not js, but found %s",
-          this.getName());
-    }
-
-    // Restore the number of lines/bytes from the proto, unless we already have cached
-    // numLines and numBytes. Offset by 1. the proto "unset" value is 0, where as in SourceFile we
-    // use "-1"
-    int protoNumLines = protoSourceFile.getNumLinesPlusOne() - 1;
-    int protoNumBytes = protoSourceFile.getNumBytesPlusOne() - 1;
-    checkState(
-        this.numLines == -1 || protoNumLines == -1 || this.numLines == protoNumLines,
-        "Mismatch in numLines for %s. SourceFile: %s, SourceFileProto: %s",
-        this.getName(),
-        this.numLines,
-        protoNumLines);
-    checkState(
-        this.numBytes == -1 || protoNumBytes == -1 || this.numBytes == protoNumBytes,
-        "Mismatch in numBytes for %s. SourceFile: %s, SourceFileProto: %s",
-        this.getName(),
-        this.numBytes,
-        protoNumBytes);
-    this.numLines = this.numLines != -1 ? this.numLines : protoNumLines;
-    this.numBytes = this.numBytes != -1 ? this.numBytes : protoNumBytes;
-  }
-
   @GwtIncompatible("java.io.Reader")
   public static SourceFile fromProto(SourceFileProto protoSourceFile) {
     SourceKind sourceKind = getSourceKindFromProto(protoSourceFile);
-    SourceFile sourceFile = fromProto(protoSourceFile, sourceKind);
-    // Restore the number of lines/bytes, which are offset by 1 in the proto.
-    sourceFile.numLines = protoSourceFile.getNumLinesPlusOne() - 1;
-    sourceFile.numBytes = protoSourceFile.getNumBytesPlusOne() - 1;
-    return sourceFile;
-  }
-
-  private static SourceFile fromProto(SourceFileProto protoSourceFile, SourceKind sourceKind) {
     switch (protoSourceFile.getLoaderCase()) {
       case PRELOADED_CONTENTS:
         return SourceFile.fromCode(
@@ -996,8 +939,6 @@ public SourceFileProto getProto() {
         .toProtoLocationBuilder(this.getName())
         .setFilename(this.getName())
         .setSourceKind(sourceKindToProto(this.getKind()))
-        .setNumLinesPlusOne(this.numLines + 1)
-        .setNumBytesPlusOne(this.numBytes + 1)
         .build();
   }