src/hotspot/share/jvmci/jvmciEnv.cpp

*** 118,128 ****
                                          Symbol* sym,
                                          bool require_local) {
    JVMCI_EXCEPTION_CONTEXT;
  
    // Now we need to check the SystemDictionary
!   if (sym->char_at(0) == 'L' &&
      sym->char_at(sym->utf8_length()-1) == ';') {
      // This is a name from a signature.  Strip off the trimmings.
      // Call recursive to keep scope of strippedsym.
      TempNewSymbol strippedsym = SymbolTable::new_symbol(sym->as_utf8()+1,
                      sym->utf8_length()-2,
--- 118,128 ----
                                          Symbol* sym,
                                          bool require_local) {
    JVMCI_EXCEPTION_CONTEXT;
  
    // Now we need to check the SystemDictionary
!   if ((sym->char_at(0) == 'L' || sym->char_at(0) == 'Q') &&
      sym->char_at(sym->utf8_length()-1) == ';') {
      // This is a name from a signature.  Strip off the trimmings.
      // Call recursive to keep scope of strippedsym.
      TempNewSymbol strippedsym = SymbolTable::new_symbol(sym->as_utf8()+1,
                      sym->utf8_length()-2,
*** 153,163 ****
    // In either case, if we can find the element type in the system dictionary,
    // we must build an array type around it.  The CI requires array klasses
    // to be loaded if their element klasses are loaded, except when memory
    // is exhausted.
    if (sym->char_at(0) == '[' &&
!       (sym->char_at(1) == '[' || sym->char_at(1) == 'L')) {
      // We have an unloaded array.
      // Build it on the fly if the element class exists.
      TempNewSymbol elem_sym = SymbolTable::new_symbol(sym->as_utf8()+1,
                                                   sym->utf8_length()-1,
                                                   CHECK_NULL);
--- 153,163 ----
    // In either case, if we can find the element type in the system dictionary,
    // we must build an array type around it.  The CI requires array klasses
    // to be loaded if their element klasses are loaded, except when memory
    // is exhausted.
    if (sym->char_at(0) == '[' &&
!       (sym->char_at(1) == '[' || sym->char_at(1) == 'L' || sym->char_at(1) == 'Q')) {
      // We have an unloaded array.
      // Build it on the fly if the element class exists.
      TempNewSymbol elem_sym = SymbolTable::new_symbol(sym->as_utf8()+1,
                                                   sym->utf8_length()-1,
                                                   CHECK_NULL);