--- old/src/share/vm/ci/ciEnv.cpp	2016-11-16 09:06:09.002498493 +0100
+++ new/src/share/vm/ci/ciEnv.cpp	2016-11-16 09:06:08.930498491 +0100
@@ -388,7 +388,7 @@
 
   // Now we need to check the SystemDictionary
   Symbol* sym = name->get_symbol();
-  if (sym->byte_at(0) == 'L' &&
+  if ((sym->byte_at(0) == 'L' || sym->byte_at(0) == 'Q') &&
     sym->byte_at(sym->utf8_length()-1) == ';') {
     // This is a name from a signature.  Strip off the trimmings.
     // Call recursive to keep scope of strippedsym.