1.1 --- a/src/share/vm/runtime/arguments.hpp Wed Jun 27 15:23:36 2012 +0200 1.2 +++ b/src/share/vm/runtime/arguments.hpp Thu Jun 28 17:03:16 2012 -0400 1.3 @@ -44,7 +44,7 @@ 1.4 1.5 // Element describing System and User (-Dkey=value flags) defined property. 1.6 1.7 -class SystemProperty: public CHeapObj { 1.8 +class SystemProperty: public CHeapObj<mtInternal> { 1.9 private: 1.10 char* _key; 1.11 char* _value; 1.12 @@ -63,7 +63,7 @@ 1.13 if (_value != NULL) { 1.14 FreeHeap(_value); 1.15 } 1.16 - _value = AllocateHeap(strlen(value)+1); 1.17 + _value = AllocateHeap(strlen(value)+1, mtInternal); 1.18 if (_value != NULL) { 1.19 strcpy(_value, value); 1.20 } 1.21 @@ -80,7 +80,7 @@ 1.22 if (_value != NULL) { 1.23 len += strlen(_value); 1.24 } 1.25 - sp = AllocateHeap(len+2); 1.26 + sp = AllocateHeap(len+2, mtInternal); 1.27 if (sp != NULL) { 1.28 if (_value != NULL) { 1.29 strcpy(sp, _value); 1.30 @@ -100,13 +100,13 @@ 1.31 if (key == NULL) { 1.32 _key = NULL; 1.33 } else { 1.34 - _key = AllocateHeap(strlen(key)+1); 1.35 + _key = AllocateHeap(strlen(key)+1, mtInternal); 1.36 strcpy(_key, key); 1.37 } 1.38 if (value == NULL) { 1.39 _value = NULL; 1.40 } else { 1.41 - _value = AllocateHeap(strlen(value)+1); 1.42 + _value = AllocateHeap(strlen(value)+1, mtInternal); 1.43 strcpy(_value, value); 1.44 } 1.45 _next = NULL; 1.46 @@ -116,7 +116,7 @@ 1.47 1.48 1.49 // For use by -agentlib, -agentpath and -Xrun 1.50 -class AgentLibrary : public CHeapObj { 1.51 +class AgentLibrary : public CHeapObj<mtInternal> { 1.52 friend class AgentLibraryList; 1.53 private: 1.54 char* _name; 1.55 @@ -136,12 +136,12 @@ 1.56 1.57 // Constructor 1.58 AgentLibrary(const char* name, const char* options, bool is_absolute_path, void* os_lib) { 1.59 - _name = AllocateHeap(strlen(name)+1); 1.60 + _name = AllocateHeap(strlen(name)+1, mtInternal); 1.61 strcpy(_name, name); 1.62 if (options == NULL) { 1.63 _options = NULL; 1.64 } else { 1.65 - _options = AllocateHeap(strlen(options)+1); 1.66 + _options = AllocateHeap(strlen(options)+1, mtInternal); 1.67 strcpy(_options, options); 1.68 } 1.69 _is_absolute_path = is_absolute_path;