1.1 --- a/src/share/vm/shark/sharkContext.cpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/share/vm/shark/sharkContext.cpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * Copyright 2009, 2010 Red Hat, Inc. 1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.9 * 1.10 @@ -61,8 +61,8 @@ 1.11 _jniHandleBlock_type = PointerType::getUnqual( 1.12 ArrayType::get(jbyte_type(), sizeof(JNIHandleBlock))); 1.13 1.14 - _methodOop_type = PointerType::getUnqual( 1.15 - ArrayType::get(jbyte_type(), sizeof(methodOopDesc))); 1.16 + _Method*_type = PointerType::getUnqual( 1.17 + ArrayType::get(jbyte_type(), sizeof(Method))); 1.18 1.19 _monitor_type = ArrayType::get( 1.20 jbyte_type(), frame::interpreter_frame_monitor_size() * wordSize); 1.21 @@ -77,13 +77,13 @@ 1.22 ArrayType::get(jbyte_type(), sizeof(ZeroStack))); 1.23 1.24 std::vector<const Type*> params; 1.25 - params.push_back(methodOop_type()); 1.26 + params.push_back(Method*_type()); 1.27 params.push_back(intptr_type()); 1.28 params.push_back(thread_type()); 1.29 _entry_point_type = FunctionType::get(jint_type(), params, false); 1.30 1.31 params.clear(); 1.32 - params.push_back(methodOop_type()); 1.33 + params.push_back(Method*_type()); 1.34 params.push_back(PointerType::getUnqual(jbyte_type())); 1.35 params.push_back(intptr_type()); 1.36 params.push_back(thread_type());