diff src/share/vm/runtime/deoptimization.hpp @ 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 b6d1ba51d163 d2a62e0f25eb
children e522a00b91aa
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.hpp	Mon Aug 20 15:21:31 2012 +0200
+++ b/src/share/vm/runtime/deoptimization.hpp	Tue Aug 21 10:39:19 2012 +0200
@@ -157,7 +157,7 @@
 
   // UnrollBlock is returned by fetch_unroll_info() to the deoptimization handler (blob).
   // This is only a CheapObj to ease debugging after a deopt failure
-  class UnrollBlock : public CHeapObj {
+  class UnrollBlock : public CHeapObj<mtCompiler> {
    private:
     int       _size_of_deoptimized_frame; // Size, in bytes, of current deoptimized frame
     int       _caller_adjustment;         // Adjustment, in bytes, to caller's SP by initial interpreted frame