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

rev 2516 : [mq]: targetVersion.patch

*** 364,377 ****
                      try {
                          completer.complete(sym);
                      } catch (CompletionFailure e) {
                          sym.flags_field |= PUBLIC;
                          ((ClassType) sym.type).supertype_field = objectType;
-                         Name n = target.boxWithConstructors() ? names.init : names.valueOf;
                          MethodSymbol boxMethod =
!                             new MethodSymbol(PUBLIC | STATIC,
!                                 n,
                                  new MethodType(List.of(type), sym.type,
                                      List.<Type>nil(), methodClass),
                                  sym);
                          sym.members().enter(boxMethod);
                          MethodSymbol unboxMethod =
--- 364,375 ----
                      try {
                          completer.complete(sym);
                      } catch (CompletionFailure e) {
                          sym.flags_field |= PUBLIC;
                          ((ClassType) sym.type).supertype_field = objectType;
                          MethodSymbol boxMethod =
!                             new MethodSymbol(PUBLIC | STATIC, names.valueOf,
                                               new MethodType(List.of(type), sym.type,
                                      List.<Type>nil(), methodClass),
                                  sym);
                          sym.members().enter(boxMethod);
                          MethodSymbol unboxMethod =
*** 525,537 ****
          listType = enterClass("java.util.List");
          collectionsType = enterClass("java.util.Collections");
          comparableType = enterClass("java.lang.Comparable");
          comparatorType = enterClass("java.util.Comparator");
          arraysType = enterClass("java.util.Arrays");
!         iterableType = target.hasIterable()
!             ? enterClass("java.lang.Iterable")
!             : enterClass("java.util.Collection");
          iteratorType = enterClass("java.util.Iterator");
          annotationTargetType = enterClass("java.lang.annotation.Target");
          overrideType = enterClass("java.lang.Override");
          retentionType = enterClass("java.lang.annotation.Retention");
          deprecatedType = enterClass("java.lang.Deprecated");
--- 523,533 ----
          listType = enterClass("java.util.List");
          collectionsType = enterClass("java.util.Collections");
          comparableType = enterClass("java.lang.Comparable");
          comparatorType = enterClass("java.util.Comparator");
          arraysType = enterClass("java.util.Arrays");
!         iterableType = enterClass("java.lang.Iterable");
          iteratorType = enterClass("java.util.Iterator");
          annotationTargetType = enterClass("java.lang.annotation.Target");
          overrideType = enterClass("java.lang.Override");
          retentionType = enterClass("java.lang.annotation.Retention");
          deprecatedType = enterClass("java.lang.Deprecated");