Mercurial > hg > graal-jvmci-8
diff src/share/vm/compiler/oopMap.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 | 18a5539bf19b d2a62e0f25eb |
children | e522a00b91aa 8c5333c80cfd |
line wrap: on
line diff
--- a/src/share/vm/compiler/oopMap.cpp Mon Aug 20 15:21:31 2012 +0200 +++ b/src/share/vm/compiler/oopMap.cpp Tue Aug 21 10:39:19 2012 +0200 @@ -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; }