diff -r c5b7455f846e -r 09241459a8b8 hotspot/src/share/vm/c1/c1_Compiler.cpp
--- a/hotspot/src/share/vm/c1/c1_Compiler.cpp	Mon Nov 02 12:34:27 2015 +0000
+++ b/hotspot/src/share/vm/c1/c1_Compiler.cpp	Tue Nov 03 09:41:03 2015 +0100
@@ -225,6 +225,8 @@
   case vmIntrinsics::_updateByteBufferCRC32:
   case vmIntrinsics::_compareAndSwapInt:
   case vmIntrinsics::_compareAndSwapObject:
+  case vmIntrinsics::_getCharStringU:
+  case vmIntrinsics::_putCharStringU:
 #ifdef TRACE_HAVE_INTRINSICS
   case vmIntrinsics::_classID:
   case vmIntrinsics::_threadID: