1.1 --- a/src/share/vm/code/vtableStubs.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/code/vtableStubs.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -111,7 +111,7 @@
1.11 }
1.12
1.13
1.14 -address VtableStubs::create_stub(bool is_vtable_stub, int vtable_index, methodOop method) {
1.15 +address VtableStubs::create_stub(bool is_vtable_stub, int vtable_index, Method* method) {
1.16 assert(vtable_index >= 0, "must be positive");
1.17
1.18 VtableStub* s = ShareVtableStubs ? lookup(is_vtable_stub, vtable_index) : NULL;
1.19 @@ -200,10 +200,10 @@
1.20 extern "C" void bad_compiled_vtable_index(JavaThread* thread, oop receiver, int index) {
1.21 ResourceMark rm;
1.22 HandleMark hm;
1.23 - klassOop klass = receiver->klass();
1.24 - instanceKlass* ik = instanceKlass::cast(klass);
1.25 + Klass* klass = receiver->klass();
1.26 + InstanceKlass* ik = InstanceKlass::cast(klass);
1.27 klassVtable* vt = ik->vtable();
1.28 - klass->print();
1.29 + ik->print();
1.30 fatal(err_msg("bad compiled vtable dispatch: receiver " INTPTR_FORMAT ", "
1.31 "index %d (vtable length %d)",
1.32 (address)receiver, index, vt->length()));
