src/hotspot/share/jvmci/compilerRuntime.cpp

@@ -70,17 +70,15 @@
 
   // 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 ;
-  if (name[0] == JVM_SIGNATURE_CLASS) {
-    assert(len > 2, "small name %s", name);
-    name++;
-    len -= 2;
+    sym = Signature::strip_envelope(sym);
   }
-  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);