Mercurial > hg > truffle

comparison src/share/vm/code/dependencies.cpp @ 13086:096c224171c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 20 Nov 2013 00:10:38 +0100
parents 6b0fd0964b87 ac9cb1d5a202
children d8041d695d19
comparison
equal deleted inserted replaced
12782:92b7ec34ddfa 13086:096c224171c4
1 /* 1 /*
2 * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
1022 // The override story is complex when packages get involved. 1022 // The override story is complex when packages get involved.
1023 return true; // Must punt the assertion to true. 1023 return true; // Must punt the assertion to true.
1024 Klass* k = ctxk; 1024 Klass* k = ctxk;
1025 Method* lm = k->lookup_method(m->name(), m->signature()); 1025 Method* lm = k->lookup_method(m->name(), m->signature());
1026 if (lm == NULL && k->oop_is_instance()) { 1026 if (lm == NULL && k->oop_is_instance()) {
1027 // It might be an abstract interface method, devoid of mirandas. 1027 // It might be an interface method
1028 lm = ((InstanceKlass*)k)->lookup_method_in_all_interfaces(m->name(), 1028 lm = ((InstanceKlass*)k)->lookup_method_in_ordered_interfaces(m->name(),
1029 m->signature()); 1029 m->signature());
1030 } 1030 }
1031 if (lm == m) 1031 if (lm == m)
1032 // Method m is inherited into ctxk. 1032 // Method m is inherited into ctxk.
1033 return true; 1033 return true;