1.1 --- a/src/share/vm/code/vtableStubs.cpp Mon Jan 08 08:32:04 2018 -0800
1.2 +++ b/src/share/vm/code/vtableStubs.cpp Fri Mar 30 20:09:45 2018 +0000
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2018, 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 @@ -60,7 +60,7 @@
1.11
1.12 // There is a dependency on the name of the blob in src/share/vm/prims/jvmtiCodeBlobEvents.cpp
1.13 // If changing the name, update the other file accordingly.
1.14 - BufferBlob* blob = BufferBlob::create("vtable chunks", bytes);
1.15 + VtableBlob* blob = VtableBlob::create("vtable chunks", bytes);
1.16 if (blob == NULL) {
1.17 return NULL;
1.18 }
1.19 @@ -167,17 +167,18 @@
1.20 _number_of_vtable_stubs++;
1.21 }
1.22
1.23 -
1.24 -bool VtableStubs::is_entry_point(address pc) {
1.25 +VtableStub* VtableStubs::entry_point(address pc) {
1.26 MutexLocker ml(VtableStubs_lock);
1.27 VtableStub* stub = (VtableStub*)(pc - VtableStub::entry_offset());
1.28 uint hash = VtableStubs::hash(stub->is_vtable_stub(), stub->index());
1.29 VtableStub* s;
1.30 for (s = _table[hash]; s != NULL && s != stub; s = s->next()) {}
1.31 - return s == stub;
1.32 + if (s == stub) {
1.33 + return s;
1.34 + }
1.35 + return NULL;
1.36 }
1.37
1.38 -
1.39 bool VtableStubs::contains(address pc) {
1.40 // simple solution for now - we may want to use
1.41 // a faster way if this function is called often
