--- old/src/java.desktop/share/classes/sun/font/FontUtilities.java 2018-04-25 08:07:40.000000000 -0700 +++ new/src/java.desktop/share/classes/sun/font/FontUtilities.java 2018-04-25 08:07:39.000000000 -0700 @@ -236,7 +236,8 @@ return isComplexCharCode(ch) || (ch >= CharToGlyphMapper.HI_SURROGATE_START && - ch <= CharToGlyphMapper.LO_SURROGATE_END); + ch <= CharToGlyphMapper.LO_SURROGATE_END) || + CharToGlyphMapper.isVariationSelector(ch); } /* If the character code falls into any of a number of unicode ranges