--- old/src/java.base/share/classes/java/lang/StringConcatHelper.java	2017-03-15 17:02:01.786322880 -0400
+++ new/src/java.base/share/classes/java/lang/StringConcatHelper.java	2017-03-15 17:02:00.286236142 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -217,16 +217,16 @@
             }
         } else {
             if (value) {
-                StringUTF16.putChar(buf, --index, 'e');
-                StringUTF16.putChar(buf, --index, 'u');
-                StringUTF16.putChar(buf, --index, 'r');
-                StringUTF16.putChar(buf, --index, 't');
+                StringUTF16.Trusted.putChar(buf, --index, 'e');
+                StringUTF16.Trusted.putChar(buf, --index, 'u');
+                StringUTF16.Trusted.putChar(buf, --index, 'r');
+                StringUTF16.Trusted.putChar(buf, --index, 't');
             } else {
-                StringUTF16.putChar(buf, --index, 'e');
-                StringUTF16.putChar(buf, --index, 's');
-                StringUTF16.putChar(buf, --index, 'l');
-                StringUTF16.putChar(buf, --index, 'a');
-                StringUTF16.putChar(buf, --index, 'f');
+                StringUTF16.Trusted.putChar(buf, --index, 'e');
+                StringUTF16.Trusted.putChar(buf, --index, 's');
+                StringUTF16.Trusted.putChar(buf, --index, 'l');
+                StringUTF16.Trusted.putChar(buf, --index, 'a');
+                StringUTF16.Trusted.putChar(buf, --index, 'f');
             }
         }
         return index;
@@ -260,7 +260,7 @@
         if (coder == String.LATIN1) {
             buf[--index] = (byte) (value & 0xFF);
         } else {
-            StringUTF16.putChar(buf, --index, value);
+            StringUTF16.Trusted.putChar(buf, --index, value);
         }
         return index;
     }
@@ -293,7 +293,7 @@
         if (coder == String.LATIN1) {
             return Integer.getChars(value, index, buf);
         } else {
-            return Integer.getCharsUTF16(value, index, buf);
+            return StringUTF16.Trusted.getChars(value, index, buf);
         }
     }
 
@@ -311,7 +311,7 @@
         if (coder == String.LATIN1) {
             return Long.getChars(value, index, buf);
         } else {
-            return Long.getCharsUTF16(value, index, buf);
+            return StringUTF16.Trusted.getChars(value, index, buf);
         }
     }