< prev index next >

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

Print this page
*** 103,13 ***
  
      // Because the following access flags are overloaded with other
      // bit positions, we translate them when reading and writing class
      // files into unique bits positions: ACC_SYNTHETIC <-> SYNTHETIC,
      // for example.
!     public static final int ACC_SUPER    = 0x0020;
      public static final int ACC_BRIDGE   = 0x0040;
      public static final int ACC_VARARGS  = 0x0080;
      public static final int ACC_MODULE   = 0x8000;
  
      /* ***************************************
       * Internal compiler flags (no bits in the lower 16).
       *****************************************/
--- 103,14 ---
  
      // Because the following access flags are overloaded with other
      // bit positions, we translate them when reading and writing class
      // files into unique bits positions: ACC_SYNTHETIC <-> SYNTHETIC,
      // for example.
!     public static final int ACC_IDENTITY = 0x0020;
      public static final int ACC_BRIDGE   = 0x0040;
      public static final int ACC_VARARGS  = 0x0080;
+     public static final int ACC_STRICT   = 0x0800;
      public static final int ACC_MODULE   = 0x8000;
  
      /* ***************************************
       * Internal compiler flags (no bits in the lower 16).
       *****************************************/

*** 121,19 ***
      /** Flag is set for a variable symbol if the variable's definition
       *  has an initializer part.
       */
      public static final int HASINIT          = 1<<18;
  
      /** Class is an implicitly declared top level class.
       */
!     public static final int IMPLICIT_CLASS    = 1<<19;
  
      /** Flag is set for compiler-generated anonymous method symbols
       *  that `own' an initializer block.
       */
      public static final int BLOCK            = 1<<20;
  
      /** Flag is set for ClassSymbols that are being compiled from source.
       */
      public static final int FROM_SOURCE      = 1<<21; //ClassSymbols
  
      /** Flag is set for nested classes that do not access instance members
--- 122,29 ---
      /** Flag is set for a variable symbol if the variable's definition
       *  has an initializer part.
       */
      public static final int HASINIT          = 1<<18;
  
+     /** Flag is set for a class or interface whose instances have identity
+      * i.e. any concrete class not declared with the modifier `value'
+      * (a) abstract class not declared `value'
+      * (b) older class files with ACC_SUPER bit set
+      */
+     public static final int IDENTITY_TYPE            = 1<<19;
+ 
      /** Class is an implicitly declared top level class.
       */
!     public static final int IMPLICIT_CLASS    = 1<<23;
  
      /** Flag is set for compiler-generated anonymous method symbols
       *  that `own' an initializer block.
       */
      public static final int BLOCK            = 1<<20;
  
+     /** Marks a type as a value class */
+     public static final int VALUE_CLASS      = 1<<20;
+ 
      /** Flag is set for ClassSymbols that are being compiled from source.
       */
      public static final int FROM_SOURCE      = 1<<21; //ClassSymbols
  
      /** Flag is set for nested classes that do not access instance members

*** 320,10 ***
--- 331,15 ---
      /**
       * Flag to indicate the given ClassSymbol is a value based.
       */
      public static final long VALUE_BASED = 1L<<53; //ClassSymbols only
  
+     /**
+      * Flag to indicate the given ClassSymbol is a value based.
+      */
+     public static final long MIGRATED_VALUE_CLASS = 1L<<57; //ClassSymbols only
+ 
      /**
       * Flag to indicate the given symbol has a @Deprecated annotation.
       */
      public static final long DEPRECATED_ANNOTATION = 1L<<54;
  

*** 397,10 ***
--- 413,15 ---
      /**
       * Flag to indicate that the class/interface was declared with the non-sealed modifier.
       */
      public static final long NON_SEALED = 1L<<63; // ClassSymbols
  
+     /**
+      * Flag to indicate that a field is strict
+      */
+     public static final long STRICT = 1L<<53; // VarSymbols
+ 
      /**
       * Describe modifier flags as they might appear in source code, i.e.,
       * separated by spaces and in the order suggested by JLS 8.1.1.
       */
      public static String toSource(long flags) {

*** 411,12 ***
  
      /** Modifier masks.
       */
      public static final int
          AccessFlags                       = PUBLIC | PROTECTED | PRIVATE,
!         LocalClassFlags                   = FINAL | ABSTRACT | STRICTFP | ENUM | SYNTHETIC,
!         StaticLocalFlags                  = LocalClassFlags | STATIC | INTERFACE,
          MemberClassFlags                  = LocalClassFlags | INTERFACE | AccessFlags,
          MemberStaticClassFlags            = MemberClassFlags | STATIC,
          ClassFlags                        = LocalClassFlags | INTERFACE | PUBLIC | ANNOTATION,
          InterfaceVarFlags                 = FINAL | STATIC | PUBLIC,
          VarFlags                          = AccessFlags | FINAL | STATIC |
--- 432,12 ---
  
      /** Modifier masks.
       */
      public static final int
          AccessFlags                       = PUBLIC | PROTECTED | PRIVATE,
!         LocalClassFlags                   = FINAL | ABSTRACT | STRICTFP | ENUM | SYNTHETIC | IDENTITY_TYPE,
!         StaticLocalClassFlags             = LocalClassFlags | STATIC | INTERFACE,
          MemberClassFlags                  = LocalClassFlags | INTERFACE | AccessFlags,
          MemberStaticClassFlags            = MemberClassFlags | STATIC,
          ClassFlags                        = LocalClassFlags | INTERFACE | PUBLIC | ANNOTATION,
          InterfaceVarFlags                 = FINAL | STATIC | PUBLIC,
          VarFlags                          = AccessFlags | FINAL | STATIC |

*** 426,15 ***
          MethodFlags                       = AccessFlags | ABSTRACT | STATIC | NATIVE |
                                              SYNCHRONIZED | FINAL | STRICTFP,
          RecordMethodFlags                 = AccessFlags | ABSTRACT | STATIC |
                                              SYNCHRONIZED | FINAL | STRICTFP;
      public static final long
!         ExtendedStandardFlags             = (long)StandardFlags | DEFAULT | SEALED | NON_SEALED,
!         ExtendedMemberClassFlags          = (long)MemberClassFlags | SEALED | NON_SEALED,
!         ExtendedMemberStaticClassFlags    = (long) MemberStaticClassFlags | SEALED | NON_SEALED,
!         ExtendedClassFlags                = (long)ClassFlags | SEALED | NON_SEALED,
!         ModifierFlags                     = ((long)StandardFlags & ~INTERFACE) | DEFAULT | SEALED | NON_SEALED,
          InterfaceMethodMask               = ABSTRACT | PRIVATE | STATIC | PUBLIC | STRICTFP | DEFAULT,
          AnnotationTypeElementMask         = ABSTRACT | PUBLIC,
          LocalVarFlags                     = FINAL | PARAMETER,
          ReceiverParamFlags                = PARAMETER;
  
--- 447,18 ---
          MethodFlags                       = AccessFlags | ABSTRACT | STATIC | NATIVE |
                                              SYNCHRONIZED | FINAL | STRICTFP,
          RecordMethodFlags                 = AccessFlags | ABSTRACT | STATIC |
                                              SYNCHRONIZED | FINAL | STRICTFP;
      public static final long
!         ExtendedStandardFlags             = (long)StandardFlags | DEFAULT | SEALED | NON_SEALED | VALUE_CLASS,
!         ExtendedMemberClassFlags          = (long)MemberClassFlags | SEALED | NON_SEALED | VALUE_CLASS,
!         ExtendedMemberStaticClassFlags    = (long) MemberStaticClassFlags | SEALED | NON_SEALED | VALUE_CLASS,
!         ExtendedClassFlags                = (long)ClassFlags | SEALED | NON_SEALED | VALUE_CLASS,
!         ExtendedLocalClassFlags           = (long) LocalClassFlags | VALUE_CLASS,
+         ExtendedStaticLocalClassFlags     = (long) StaticLocalClassFlags | VALUE_CLASS,
+         ExtendedVarFlags                  = (long) VarFlags | STRICT,
+         ModifierFlags                     = ((long)StandardFlags & ~INTERFACE) | DEFAULT | SEALED | NON_SEALED | VALUE_CLASS,
          InterfaceMethodMask               = ABSTRACT | PRIVATE | STATIC | PUBLIC | STRICTFP | DEFAULT,
          AnnotationTypeElementMask         = ABSTRACT | PUBLIC,
          LocalVarFlags                     = FINAL | PARAMETER,
          ReceiverParamFlags                = PARAMETER;
  

*** 456,10 ***
--- 480,11 ---
              if (0 != (flags & SYNCHRONIZED))
                                            modifiers.add(Modifier.SYNCHRONIZED);
              if (0 != (flags & NATIVE))    modifiers.add(Modifier.NATIVE);
              if (0 != (flags & STRICTFP))  modifiers.add(Modifier.STRICTFP);
              if (0 != (flags & DEFAULT))   modifiers.add(Modifier.DEFAULT);
+             if (0 != (flags & VALUE_CLASS))     modifiers.add(Modifier.VALUE);
              modifiers = Collections.unmodifiableSet(modifiers);
              modifierSets.put(flags, modifiers);
          }
          return modifiers;
      }

*** 477,11 ***
  
      public static boolean isConstant(Symbol.VarSymbol symbol) {
          return symbol.getConstValue() != null;
      }
  
- 
      public enum Flag {
          PUBLIC(Flags.PUBLIC),
          PRIVATE(Flags.PRIVATE),
          PROTECTED(Flags.PROTECTED),
          STATIC(Flags.STATIC),
--- 502,10 ---

*** 497,10 ***
--- 521,17 ---
          BRIDGE(Flags.BRIDGE),
          SYNTHETIC(Flags.SYNTHETIC),
          ANNOTATION(Flags.ANNOTATION),
          DEPRECATED(Flags.DEPRECATED),
          HASINIT(Flags.HASINIT),
+         IDENTITY_TYPE(Flags.IDENTITY_TYPE) {
+             @Override
+             public String toString() {
+                 return "identity";
+             }
+         },
+         VALUE(Flags.VALUE_CLASS),
          IMPLICIT_CLASS(Flags.IMPLICIT_CLASS),
          BLOCK(Flags.BLOCK),
          FROM_SOURCE(Flags.FROM_SOURCE),
          ENUM(Flags.ENUM),
          MANDATED(Flags.MANDATED),

*** 548,11 ***
          NON_SEALED(Flags.NON_SEALED) {
              @Override
              public String toString() {
                  return "non-sealed";
              }
!         };
  
          Flag(long flag) {
              this.value = flag;
              this.lowercaseName = StringUtils.toLowerCase(name());
          }
--- 579,12 ---
          NON_SEALED(Flags.NON_SEALED) {
              @Override
              public String toString() {
                  return "non-sealed";
              }
!         },
+         STRICT(Flags.STRICT);
  
          Flag(long flag) {
              this.value = flag;
              this.lowercaseName = StringUtils.toLowerCase(name());
          }
< prev index next >