src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java

*** 212,222 ****
              }
  
              if (code < FontUtilities.MIN_LAYOUT_CHARCODE) {
                  continue;
              }
!             else if (FontUtilities.isComplexCharCode(code)) {
                  return true;
              }
              else if (code >= 0x10000) {
                  i += 1; // Empty glyph slot after surrogate
                  continue;
--- 212,223 ----
              }
  
              if (code < FontUtilities.MIN_LAYOUT_CHARCODE) {
                  continue;
              }
!             else if (FontUtilities.isComplexCharCode(code) ||
!                      CharToGlyphMapper.isVariationSelector(code)) {
                  return true;
              }
              else if (code >= 0x10000) {
                  i += 1; // Empty glyph slot after surrogate
                  continue;