1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Target.java Mon Mar 18 18:33:13 2013 -0700
1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Target.java Tue Mar 19 13:10:40 2013 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -48,17 +48,6 @@
1.11 /** J2SE1.4 = Merlin. */
1.12 JDK1_4("1.4", 48, 0),
1.13
1.14 - /** Support for the JSR14 prototype compiler (targeting 1.4 VMs
1.15 - * augmented with a few support classes). This is a transitional
1.16 - * option that will not be supported in the product. */
1.17 - JSR14("jsr14", 48, 0),
1.18 -
1.19 - /** The following are undocumented transitional targets that we
1.20 - * had used to test VM fixes in update releases. We do not
1.21 - * promise to retain support for them. */
1.22 - JDK1_4_1("1.4.1", 48, 0),
1.23 - JDK1_4_2("1.4.2", 48, 0),
1.24 -
1.25 /** Tiger. */
1.26 JDK1_5("1.5", 49, 0),
1.27
1.28 @@ -175,23 +164,23 @@
1.29 return compareTo(JDK1_5) >= 0;
1.30 }
1.31
1.32 - /** Beginning in -target 1.4.2, we make synthetic variables
1.33 + /** Beginning in -target 1.5, we make synthetic variables
1.34 * package-private instead of private. This is to prevent the
1.35 * necessity of access methods, which effectively relax the
1.36 * protection of the field but bloat the class files and affect
1.37 * execution.
1.38 */
1.39 public boolean usePrivateSyntheticFields() {
1.40 - return compareTo(JDK1_4_2) < 0;
1.41 + return compareTo(JDK1_5) < 0;
1.42 }
1.43
1.44 /** Sometimes we need to create a field to cache a value like a
1.45 - * class literal of the assertions flag. In -target 1.4.2 and
1.46 + * class literal of the assertions flag. In -target 1.5 and
1.47 * later we create a new synthetic class for this instead of
1.48 * using the outermost class. See 4401576.
1.49 */
1.50 public boolean useInnerCacheClass() {
1.51 - return compareTo(JDK1_4_2) >= 0;
1.52 + return compareTo(JDK1_5) >= 0;
1.53 }
1.54
1.55 /** Return true if cldc-style stack maps need to be generated. */
1.56 @@ -276,7 +265,7 @@
1.57 * See 4468823
1.58 */
1.59 public boolean classLiteralsNoInit() {
1.60 - return compareTo(JDK1_4_2) >= 0;
1.61 + return compareTo(JDK1_5) >= 0;
1.62 }
1.63
1.64 /** Although we may not have support for class literals, when we
1.65 @@ -300,22 +289,10 @@
1.66 return compareTo(JDK1_5) >= 0;
1.67 }
1.68
1.69 - /** For bootstrapping javac only, we do without java.lang.Enum if
1.70 - * necessary.
1.71 - */
1.72 - public boolean compilerBootstrap(Symbol c) {
1.73 - return
1.74 - this == JSR14 &&
1.75 - (c.flags() & Flags.ENUM) != 0 &&
1.76 - c.flatName().toString().startsWith("com.sun.tools.")
1.77 - // && !Target.class.getSuperclass().getName().equals("java.lang.Enum")
1.78 - ;
1.79 - }
1.80 -
1.81 /** In J2SE1.5.0, we introduced the "EnclosingMethod" attribute
1.82 * for improved reflection support.
1.83 */
1.84 public boolean hasEnclosingMethodAttribute() {
1.85 - return compareTo(JDK1_5) >= 0 || this == JSR14;
1.86 + return compareTo(JDK1_5) >= 0;
1.87 }
1.88 }
