src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java

rev 3494 : Remove the use of voidClassType.

*** 24,58 ****
   */
  
  package com.sun.tools.javac.code;
  
  import java.util.HashMap;
- import java.util.HashSet;
  import java.util.Map;
- import java.util.Set;
  
  import javax.lang.model.element.ElementVisitor;
  import javax.tools.JavaFileObject;
  
  
  import com.sun.tools.javac.code.Scope.WriteableScope;
  import com.sun.tools.javac.code.Symbol.ClassSymbol;
  import com.sun.tools.javac.code.Symbol.Completer;
  import com.sun.tools.javac.code.Symbol.CompletionFailure;
  import com.sun.tools.javac.code.Symbol.MethodSymbol;
- import com.sun.tools.javac.code.Symbol.OperatorSymbol;
  import com.sun.tools.javac.code.Symbol.PackageSymbol;
  import com.sun.tools.javac.code.Symbol.TypeSymbol;
  import com.sun.tools.javac.code.Symbol.VarSymbol;
  import com.sun.tools.javac.code.Type.BottomType;
  import com.sun.tools.javac.code.Type.ClassType;
  import com.sun.tools.javac.code.Type.ErrorType;
  import com.sun.tools.javac.code.Type.JCPrimitiveType;
  import com.sun.tools.javac.code.Type.JCVoidType;
  import com.sun.tools.javac.code.Type.MethodType;
  import com.sun.tools.javac.code.Type.UnknownType;
- import com.sun.tools.javac.jvm.ByteCodes;
  import com.sun.tools.javac.jvm.Target;
  import com.sun.tools.javac.util.Assert;
  import com.sun.tools.javac.util.Context;
  import com.sun.tools.javac.util.Convert;
  import com.sun.tools.javac.util.DefinedBy;
--- 24,54 ----
*** 63,73 ****
  import com.sun.tools.javac.util.Name;
  import com.sun.tools.javac.util.Names;
  
  import static com.sun.tools.javac.code.Flags.*;
  import static com.sun.tools.javac.code.Kinds.Kind.*;
- import static com.sun.tools.javac.jvm.ByteCodes.*;
  import static com.sun.tools.javac.code.TypeTag.*;
  
  /** A class that defines all predefined constants and operators
   *  as well as special classes such as java.lang.Object, which need
   *  to be known to the compiler. All symbols are held in instance
--- 59,68 ----
*** 191,200 ****
--- 186,196 ----
      public final Type proprietaryType;
      public final Type systemType;
      public final Type autoCloseableType;
      public final Type trustMeType;
      public final Type lambdaMetafactory;
+     public final Type stringConcatFactory;
      public final Type repeatableType;
      public final Type documentedType;
      public final Type elementTypeType;
      public final Type functionalInterfaceType;
  
*** 470,486 ****
--- 466,484 ----
                                              List.of(exceptionType), methodClass),
                               autoCloseableType.tsym);
          trustMeType = enterClass("java.lang.SafeVarargs");
          nativeHeaderType = enterClass("java.lang.annotation.Native");
          lambdaMetafactory = enterClass("java.lang.invoke.LambdaMetafactory");
+         stringConcatFactory = enterClass("java.lang.invoke.StringConcatFactory");
          functionalInterfaceType = enterClass("java.lang.FunctionalInterface");
  
          synthesizeEmptyInterfaceIfMissing(autoCloseableType);
          synthesizeEmptyInterfaceIfMissing(cloneableType);
          synthesizeEmptyInterfaceIfMissing(serializableType);
          synthesizeEmptyInterfaceIfMissing(lambdaMetafactory);
          synthesizeEmptyInterfaceIfMissing(serializedLambdaType);
+         synthesizeEmptyInterfaceIfMissing(stringConcatFactory);
          synthesizeBoxTypeIfMissing(doubleType);
          synthesizeBoxTypeIfMissing(floatType);
          synthesizeBoxTypeIfMissing(voidType);
  
          // Enter a synthetic class that is used to mark internal