Mercurial > hg > truffle
diff src/share/vm/compiler/oopMap.cpp @ 6204:90d5a592ea8f
Merge
author | coleenp |
---|---|
date | Thu, 12 Jul 2012 14:26:25 -0400 |
parents | d2a62e0f25eb |
children | 957c266d8bc5 b9a9ed0f8eeb |
line wrap: on
line diff
--- a/src/share/vm/compiler/oopMap.cpp Mon Jul 02 10:54:17 2012 -0400 +++ b/src/share/vm/compiler/oopMap.cpp Thu Jul 12 14:26:25 2012 -0400 @@ -599,7 +599,7 @@ #ifdef COMPILER2 -class DerivedPointerEntry : public CHeapObj { +class DerivedPointerEntry : public CHeapObj<mtCompiler> { private: oop* _location; // Location of derived pointer (also pointing to the base) intptr_t _offset; // Offset from base pointer @@ -621,7 +621,7 @@ assert (!_active, "should not be active"); assert(_list == NULL || _list->length() == 0, "table not empty"); if (_list == NULL) { - _list = new (ResourceObj::C_HEAP) GrowableArray<DerivedPointerEntry*>(10, true); // Allocated on C heap + _list = new (ResourceObj::C_HEAP, mtCompiler) GrowableArray<DerivedPointerEntry*>(10, true); // Allocated on C heap } _active = true; }