1.1 --- a/src/share/vm/shark/sharkContext.cpp Mon Nov 26 17:25:11 2012 -0800
1.2 +++ b/src/share/vm/shark/sharkContext.cpp Tue Nov 27 12:48:52 2012 -0800
1.3 @@ -29,6 +29,7 @@
1.4 #include "shark/llvmHeaders.hpp"
1.5 #include "shark/sharkContext.hpp"
1.6 #include "utilities/globalDefinitions.hpp"
1.7 +#include "memory/allocation.hpp"
1.8
1.9 using namespace llvm;
1.10
1.11 @@ -52,6 +53,9 @@
1.12 _itableOffsetEntry_type = PointerType::getUnqual(
1.13 ArrayType::get(jbyte_type(), itableOffsetEntry::size() * wordSize));
1.14
1.15 + _Metadata_type = PointerType::getUnqual(
1.16 + ArrayType::get(jbyte_type(), sizeof(Metadata)));
1.17 +
1.18 _klass_type = PointerType::getUnqual(
1.19 ArrayType::get(jbyte_type(), sizeof(Klass)));
1.20
1.21 @@ -61,7 +65,7 @@
1.22 _jniHandleBlock_type = PointerType::getUnqual(
1.23 ArrayType::get(jbyte_type(), sizeof(JNIHandleBlock)));
1.24
1.25 - _Method*_type = PointerType::getUnqual(
1.26 + _Method_type = PointerType::getUnqual(
1.27 ArrayType::get(jbyte_type(), sizeof(Method)));
1.28
1.29 _monitor_type = ArrayType::get(
1.30 @@ -76,14 +80,14 @@
1.31 _zeroStack_type = PointerType::getUnqual(
1.32 ArrayType::get(jbyte_type(), sizeof(ZeroStack)));
1.33
1.34 - std::vector<const Type*> params;
1.35 - params.push_back(Method*_type());
1.36 + std::vector<Type*> params;
1.37 + params.push_back(Method_type());
1.38 params.push_back(intptr_type());
1.39 params.push_back(thread_type());
1.40 _entry_point_type = FunctionType::get(jint_type(), params, false);
1.41
1.42 params.clear();
1.43 - params.push_back(Method*_type());
1.44 + params.push_back(Method_type());
1.45 params.push_back(PointerType::getUnqual(jbyte_type()));
1.46 params.push_back(intptr_type());
1.47 params.push_back(thread_type());
1.48 @@ -150,7 +154,7 @@
1.49 }
1.50 }
1.51
1.52 -class SharkFreeQueueItem : public CHeapObj {
1.53 +class SharkFreeQueueItem : public CHeapObj<mtNone> {
1.54 public:
1.55 SharkFreeQueueItem(llvm::Function* function, SharkFreeQueueItem *next)
1.56 : _function(function), _next(next) {}
