--- a/jdk/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java	Thu Aug 17 13:51:01 2017 -0700
+++ b/jdk/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java	Thu Aug 17 19:24:58 2017 -0700
@@ -282,7 +282,7 @@
                 if (code >= HI_SURROGATE_START &&
                     code <= HI_SURROGATE_END && m < missed - 1)
                 {
-                    char low = indicies[m + 1];
+                    char low = unmappedChars[m + 1];
                     if (low >= LO_SURROGATE_START && low <= LO_SURROGATE_END) {
                         code = (code - HI_SURROGATE_START) * 0x400 +
                             low - LO_SURROGATE_START + 0x10000;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/FontClass/SurrogateTest/SuppCharDrawTest.java	Thu Aug 17 19:24:58 2017 -0700
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2017 JetBrains s.r.o.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8174744
+ * @summary Wrong rendering of string containing surrogate pairs on macOS
+ */
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+
+public class SuppCharDrawTest {
+    private static final Font FONT = new Font(Font.MONOSPACED, Font.PLAIN, 12);
+    private static final int IMAGE_WIDTH = 20;
+    private static final int IMAGE_HEIGHT = 20;
+
+
+    public static void main(String[] args) {
+        BufferedImage base = renderFirstChar("A");
+        BufferedImage basePlusSurrogate = renderFirstChar("A \uD835\uDC00");
+
+        if (!imagesAreEqual(base, basePlusSurrogate)) {
+            throw new RuntimeException("Unexpected rendering change");
+        }
+    }
+
+    private static BufferedImage renderFirstChar(String s) {
+        BufferedImage image = new BufferedImage(IMAGE_WIDTH, IMAGE_HEIGHT, BufferedImage.TYPE_INT_RGB);
+        Graphics g = image.createGraphics();
+        g.setColor(Color.white);
+        g.fillRect(0, 0, IMAGE_WIDTH, IMAGE_HEIGHT);
+        g.setColor(Color.black);
+        g.setFont(FONT);
+        FontMetrics metrics = g.getFontMetrics();
+        g.clipRect(0, 0, metrics.charWidth(s.charAt(0)), IMAGE_HEIGHT);
+        g.drawString(s, 0, metrics.getAscent());
+        g.dispose();
+        return image;
+    }
+
+    private static boolean imagesAreEqual(BufferedImage i1, BufferedImage i2) {
+        if (i1.getWidth() != i2.getWidth() || i1.getHeight() != i2.getHeight()) return false;
+        for (int i = 0; i < i1.getWidth(); i++) {
+            for (int j = 0; j < i1.getHeight(); j++) {
+                if (i1.getRGB(i, j) != i2.getRGB(i, j)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}