1.1 --- a/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp Thu Sep 04 16:53:27 2014 -0700 1.2 +++ b/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp Fri Sep 05 09:49:19 2014 +0200 1.3 @@ -25,6 +25,7 @@ 1.4 #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_VM_OPERATIONS_G1_HPP 1.5 #define SHARE_VM_GC_IMPLEMENTATION_G1_VM_OPERATIONS_G1_HPP 1.6 1.7 +#include "gc_implementation/g1/g1AllocationContext.hpp" 1.8 #include "gc_implementation/shared/vmGCOperations.hpp" 1.9 1.10 // VM_operations for the G1 collector. 1.11 @@ -40,6 +41,7 @@ 1.12 size_t _word_size; 1.13 HeapWord* _result; 1.14 bool _pause_succeeded; 1.15 + AllocationContext_t _allocation_context; 1.16 1.17 public: 1.18 VM_G1OperationWithAllocRequest(unsigned int gc_count_before, 1.19 @@ -49,6 +51,8 @@ 1.20 _word_size(word_size), _result(NULL), _pause_succeeded(false) { } 1.21 HeapWord* result() { return _result; } 1.22 bool pause_succeeded() { return _pause_succeeded; } 1.23 + void set_allocation_context(AllocationContext_t context) { _allocation_context = context; } 1.24 + AllocationContext_t allocation_context() { return _allocation_context; } 1.25 }; 1.26 1.27 class VM_G1CollectFull: public VM_GC_Operation {