comparison src/share/vm/runtime/vframe_hp.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 3dbcd1013cc8 d2a62e0f25eb
children e522a00b91aa
comparison
equal deleted inserted replaced
5891:fd8832ae511d 6275:957c266d8bc5
158 } 158 }
159 // No matching vframe must push a new vframe 159 // No matching vframe must push a new vframe
160 } else { 160 } else {
161 // No deferred updates pending for this thread. 161 // No deferred updates pending for this thread.
162 // allocate in C heap 162 // allocate in C heap
163 deferred = new(ResourceObj::C_HEAP) GrowableArray<jvmtiDeferredLocalVariableSet*> (1, true); 163 deferred = new(ResourceObj::C_HEAP, mtCompiler) GrowableArray<jvmtiDeferredLocalVariableSet*> (1, true);
164 thread()->set_deferred_locals(deferred); 164 thread()->set_deferred_locals(deferred);
165 } 165 }
166 deferred->push(new jvmtiDeferredLocalVariableSet(method(), bci(), fr().id())); 166 deferred->push(new jvmtiDeferredLocalVariableSet(method(), bci(), fr().id()));
167 assert(deferred->top()->id() == fr().id(), "Huh? Must match"); 167 assert(deferred->top()->id() == fr().id(), "Huh? Must match");
168 deferred->top()->set_local_at(index, type, value); 168 deferred->top()->set_local_at(index, type, value);
327 jvmtiDeferredLocalVariableSet::jvmtiDeferredLocalVariableSet(methodOop method, int bci, intptr_t* id) { 327 jvmtiDeferredLocalVariableSet::jvmtiDeferredLocalVariableSet(methodOop method, int bci, intptr_t* id) {
328 _method = method; 328 _method = method;
329 _bci = bci; 329 _bci = bci;
330 _id = id; 330 _id = id;
331 // Alway will need at least one, must be on C heap 331 // Alway will need at least one, must be on C heap
332 _locals = new(ResourceObj::C_HEAP) GrowableArray<jvmtiDeferredLocalVariable*> (1, true); 332 _locals = new(ResourceObj::C_HEAP, mtCompiler) GrowableArray<jvmtiDeferredLocalVariable*> (1, true);
333 } 333 }
334 334
335 jvmtiDeferredLocalVariableSet::~jvmtiDeferredLocalVariableSet() { 335 jvmtiDeferredLocalVariableSet::~jvmtiDeferredLocalVariableSet() {
336 for (int i = 0; i < _locals->length() ; i++ ) { 336 for (int i = 0; i < _locals->length() ; i++ ) {
337 delete _locals->at(i); 337 delete _locals->at(i);