Merge

Author: AlanBateman

make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java

@@ -132,6 +132,7 @@
 import com.sun.tools.classfile.Module_attribute.RequiresEntry;
 import com.sun.tools.classfile.NestHost_attribute;
 import com.sun.tools.classfile.NestMembers_attribute;
+import com.sun.tools.classfile.PermittedSubclasses_attribute;
 import com.sun.tools.classfile.Record_attribute;
 import com.sun.tools.classfile.Record_attribute.ComponentInfo;
 import com.sun.tools.classfile.RuntimeAnnotations_attribute;
@@ -978,6 +979,16 @@ private void addAttributes(ClassHeaderDescription header,
             attributes.put(Attribute.Record,
                            new Record_attribute(attributeString, recordComponents));
         }
+        if (header.isSealed) {
+            int attributeString = addString(constantPool, Attribute.PermittedSubclasses);
+            int[] subclasses = new int[header.permittedSubclasses.size()];
+            int i = 0;
+            for (String intf : header.permittedSubclasses) {
+                subclasses[i++] = addClass(constantPool, intf);
+            }
+            attributes.put(Attribute.PermittedSubclasses,
+                    new PermittedSubclasses_attribute(attributeString, subclasses));
+        }
         addInnerClassesAttribute(header, constantPool, attributes);
     }
 
@@ -2229,6 +2240,16 @@ private boolean readAttribute(ClassFile cf, FeatureDescription feature, Attribut
                 }
                 break;
             }
+            case Attribute.PermittedSubclasses: {
+                assert feature instanceof ClassHeaderDescription;
+                PermittedSubclasses_attribute permittedSubclasses = (PermittedSubclasses_attribute) attr;
+                ClassHeaderDescription chd = (ClassHeaderDescription) feature;
+                chd.permittedSubclasses = Arrays.stream(permittedSubclasses.subtypes)
+                        .mapToObj(i -> getClassName(cf, i))
+                        .collect(Collectors.toList());
+                chd.isSealed = true;
+                break;
+            }
             default:
                 throw new IllegalStateException("Unhandled attribute: " +
                                                 attrName);
@@ -3077,6 +3098,8 @@ static class ClassHeaderDescription extends HeaderDescription {
         List<String> nestMembers;
         boolean isRecord;
         List<RecordComponentDescription> recordComponents;
+        boolean isSealed;
+        List<String> permittedSubclasses;
 
         @Override
         public int hashCode() {
@@ -3087,6 +3110,8 @@ public int hashCode() {
             hash = 17 * hash + Objects.hashCode(this.nestMembers);
             hash = 17 * hash + Objects.hashCode(this.isRecord);
             hash = 17 * hash + Objects.hashCode(this.recordComponents);
+            hash = 17 * hash + Objects.hashCode(this.isSealed);
+            hash = 17 * hash + Objects.hashCode(this.permittedSubclasses);
             return hash;
         }
 
@@ -3117,6 +3142,12 @@ public boolean equals(Object obj) {
             if (!listEquals(this.recordComponents, other.recordComponents)) {
                 return false;
             }
+            if (this.isSealed != other.isSealed) {
+                return false;
+            }
+            if (!listEquals(this.permittedSubclasses, other.permittedSubclasses)) {
+                return false;
+            }
             return true;
         }
 
@@ -3137,6 +3168,9 @@ public void write(Appendable output, String baselineVersion, String version) thr
             if (isRecord) {
                 output.append(" record true");
             }
+            if (isSealed) {
+                output.append(" sealed true");
+            }
             writeAttributes(output);
             output.append("\n");
             writeRecordComponents(output, baselineVersion, version);
@@ -3163,6 +3197,11 @@ public boolean read(LineBasedReader reader) throws IOException {
                 readRecordComponents(reader);
             }
             readInnerClasses(reader);
+            isSealed = reader.attributes.containsKey("permittedSubclasses");
+            if (isSealed) {
+                String subclassesList = reader.attributes.get("permittedSubclasses");
+                permittedSubclasses = deserializeList(subclassesList);
+            }
 
             return true;
         }

make/modules/java.desktop/lib/Awt2dLibraries.gmk

@@ -447,19 +447,13 @@ else
    ifeq ($(call isTargetOs, linux macosx), true)
      HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
    endif
-   ifeq ($(call isTargetOs, macosx), true)
-     HARFBUZZ_CFLAGS += -DHAVE_CORETEXT
-   endif
 
    # Early re-canonizing has to be disabled to workaround an internal XlC compiler error
    # when building libharfbuzz
    ifeq ($(call isTargetOs, aix), true)
      HARFBUZZ_CFLAGS += -qdebug=necan
    endif
 
-   ifeq ($(call isTargetOs, macosx), false)
-     LIBFONTMANAGER_EXCLUDE_FILES += libharfbuzz/hb-coretext.cc
-   endif
    # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
    LIBFONTMANAGER_EXCLUDE_FILES += libharfbuzz/hb-ft.cc