diff -r ea6212ea3397 -r 0048f025c993 jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c
--- a/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c	Thu Aug 24 11:30:13 2017 -0700
+++ b/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c	Mon Aug 28 11:53:44 2017 -0700
@@ -203,6 +203,7 @@
                        jfloat ptSize,
                        jlong pScaler,
                        jlong pNativeFont,
+                       jlong layoutTables,
                        jfloatArray matrix,
                        jboolean aat) {
 
@@ -215,6 +216,7 @@
     fi->font2D = font2D;
     fi->fontStrike = fontStrike;
     fi->nativeFont = pNativeFont;
+    fi->layoutTables = (TTLayoutTableCache*)layoutTables;
     fi->aat = aat;
     (*env)->GetFloatArrayRegion(env, matrix, 0, 4, fi->matrix);
     fi->ptSize = ptSize;
@@ -241,6 +243,7 @@
      jfloatArray matrix,
      jlong pScaler,
      jlong pNativeFont,
+     jlong layoutTables,
      jboolean aat,
      jcharArray text,
      jobject gvdata,
@@ -269,7 +272,7 @@
 
      JDKFontInfo *jdkFontInfo =
          createJDKFontInfo(env, font2D, fontStrike, ptSize,
-                           pScaler, pNativeFont, matrix, aat);
+                           pScaler, pNativeFont, layoutTables, matrix, aat);
      if (!jdkFontInfo) {
         return JNI_FALSE;
      }