comparison src/share/vm/runtime/reflectionUtils.cpp @ 6275:957c266d8bc5

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Aug 2012 10:39:19 +0200
parents 70f715dfbb41 d2a62e0f25eb
children e522a00b91aa
comparison
equal deleted inserted replaced
5891:fd8832ae511d 6275:957c266d8bc5
60 return eos(); 60 return eos();
61 } 61 }
62 62
63 63
64 GrowableArray<FilteredField*> *FilteredFieldsMap::_filtered_fields = 64 GrowableArray<FilteredField*> *FilteredFieldsMap::_filtered_fields =
65 new (ResourceObj::C_HEAP) GrowableArray<FilteredField*>(3,true); 65 new (ResourceObj::C_HEAP, mtInternal) GrowableArray<FilteredField*>(3,true);
66 66
67 67
68 void FilteredFieldsMap::initialize() { 68 void FilteredFieldsMap::initialize() {
69 int offset; 69 int offset;
70 offset = java_lang_Throwable::get_backtrace_offset(); 70 offset = java_lang_Throwable::get_backtrace_offset();