src/hotspot/share/jvmci/compilerRuntime.cpp

*** 70,86 ****
  
    // Use class loader of aot method.
    Handle loader(THREAD, caller->method_holder()->class_loader());
    Handle protection_domain(THREAD, caller->method_holder()->protection_domain());
  
    // Ignore wrapping L and ;
!   if (name[0] == JVM_SIGNATURE_CLASS) {
!     assert(len > 2, "small name %s", name);
!     name++;
!     len -= 2;
    }
-   TempNewSymbol sym = SymbolTable::new_symbol(name, len);
    if (sym == NULL) {
      return NULL;
    }
    Klass* k = SystemDictionary::resolve_or_fail(sym, loader, protection_domain, true, CHECK_NULL);
  
--- 70,84 ----
  
    // Use class loader of aot method.
    Handle loader(THREAD, caller->method_holder()->class_loader());
    Handle protection_domain(THREAD, caller->method_holder()->protection_domain());
  
+   TempNewSymbol sym = SymbolTable::new_symbol(name, len);
+   if (sym != NULL && Signature::has_envelope(sym)) {
      // Ignore wrapping L and ;
!     sym = Signature::strip_envelope(sym);
    }
    if (sym == NULL) {
      return NULL;
    }
    Klass* k = SystemDictionary::resolve_or_fail(sym, loader, protection_domain, true, CHECK_NULL);