1.1 --- a/src/share/vm/oops/cpCache.cpp Tue Mar 17 02:15:01 2015 -0400
1.2 +++ b/src/share/vm/oops/cpCache.cpp Tue Mar 17 01:56:32 2015 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 2015, 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 @@ -498,9 +498,10 @@
1.11 // _f1 == NULL || !_f1->is_method() are OK here
1.12 return true;
1.13 }
1.14 - // return false if _f1 refers to an old or an obsolete method
1.15 + // return false if _f1 refers to a non-deleted old or obsolete method
1.16 return (NOT_PRODUCT(_f1->is_valid() &&) _f1->is_method() &&
1.17 - !((Method*)_f1)->is_old() && !((Method*)_f1)->is_obsolete());
1.18 + (f1_as_method()->is_deleted() ||
1.19 + (!f1_as_method()->is_old() && !f1_as_method()->is_obsolete())));
1.20 }
1.21
1.22 bool ConstantPoolCacheEntry::is_interesting_method_entry(Klass* k) {
