--- a/src/share/vm/runtime/vmStructs.cpp	Sat Apr 20 19:02:11 2013 +0200
+++ b/src/share/vm/runtime/vmStructs.cpp	Sun Apr 21 21:05:02 2013 -0700
@@ -3118,15 +3118,15 @@
   // Search for the base type by peeling off const and *
   size_t len = strlen(typeName);
   if (typeName[len-1] == '*') {
-    char * s = NEW_C_HEAP_ARRAY(char, len, mtInternal);
+    char * s = new char[len];
     strncpy(s, typeName, len - 1);
     s[len-1] = '\0';
     // tty->print_cr("checking \"%s\" for \"%s\"", s, typeName);
     if (recursiveFindType(origtypes, s, true) == 1) {
-      FREE_C_HEAP_ARRAY(char, s, mtInternal);
+      delete [] s;
       return 1;
     }
-    FREE_C_HEAP_ARRAY(char, s, mtInternal);
+    delete [] s;
   }
   const char* start = NULL;
   if (strstr(typeName, "GrowableArray<") == typeName) {
@@ -3137,15 +3137,15 @@
   if (start != NULL) {
     const char * end = strrchr(typeName, '>');
     int len = end - start + 1;
-    char * s = NEW_C_HEAP_ARRAY(char, len, mtInternal);
+    char * s = new char[len];
     strncpy(s, start, len - 1);
     s[len-1] = '\0';
     // tty->print_cr("checking \"%s\" for \"%s\"", s, typeName);
     if (recursiveFindType(origtypes, s, true) == 1) {
-      FREE_C_HEAP_ARRAY(char, s, mtInternal);
+      delete [] s;
       return 1;
     }
-    FREE_C_HEAP_ARRAY(char, s, mtInternal);
+    delete [] s;
   }
   if (strstr(typeName, "const ") == typeName) {
     const char * s = typeName + strlen("const ");