1.1 --- a/src/share/vm/shark/sharkTopLevelBlock.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/shark/sharkTopLevelBlock.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 2008, 2009, 2010 Red Hat, Inc.
1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 *
1.10 @@ -1103,7 +1103,7 @@
1.11 Value *SharkTopLevelBlock::get_direct_callee(ciMethod* method) {
1.12 return builder()->CreateBitCast(
1.13 builder()->CreateInlineOop(method),
1.14 - SharkType::methodOop_type(),
1.15 + SharkType::Method*_type(),
1.16 "callee");
1.17 }
1.18
1.19 @@ -1118,9 +1118,9 @@
1.20 return builder()->CreateLoad(
1.21 builder()->CreateArrayAddress(
1.22 klass,
1.23 - SharkType::methodOop_type(),
1.24 + SharkType::Method*_type(),
1.25 vtableEntry::size() * wordSize,
1.26 - in_ByteSize(instanceKlass::vtable_start_offset() * wordSize),
1.27 + in_ByteSize(InstanceKlass::vtable_start_offset() * wordSize),
1.28 LLVMValue::intptr_constant(vtable_index)),
1.29 "callee");
1.30 }
1.31 @@ -1142,12 +1142,12 @@
1.32 Value *vtable_start = builder()->CreateAdd(
1.33 builder()->CreatePtrToInt(object_klass, SharkType::intptr_type()),
1.34 LLVMValue::intptr_constant(
1.35 - instanceKlass::vtable_start_offset() * HeapWordSize),
1.36 + InstanceKlass::vtable_start_offset() * HeapWordSize),
1.37 "vtable_start");
1.38
1.39 Value *vtable_length = builder()->CreateValueOfStructEntry(
1.40 object_klass,
1.41 - in_ByteSize(instanceKlass::vtable_length_offset() * HeapWordSize),
1.42 + in_ByteSize(InstanceKlass::vtable_length_offset() * HeapWordSize),
1.43 SharkType::jint_type(),
1.44 "vtable_length");
1.45 vtable_length =
1.46 @@ -1231,7 +1231,7 @@
1.47 method->itable_index() * itableMethodEntry::size() * wordSize)),
1.48 LLVMValue::intptr_constant(
1.49 itableMethodEntry::method_offset_in_bytes())),
1.50 - PointerType::getUnqual(SharkType::methodOop_type())),
1.51 + PointerType::getUnqual(SharkType::Method*_type())),
1.52 "callee");
1.53 }
1.54
1.55 @@ -1312,7 +1312,7 @@
1.56
1.57 // Load the SharkEntry from the callee
1.58 Value *base_pc = builder()->CreateValueOfStructEntry(
1.59 - callee, methodOopDesc::from_interpreted_offset(),
1.60 + callee, Method::from_interpreted_offset(),
1.61 SharkType::intptr_type(),
1.62 "base_pc");
1.63
