Mercurial > hg > truffle

comparison src/share/vm/prims/nativeLookup.cpp @ 18041:52b4284cb496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c 386dd1c71858
children c307546c7b0a
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
1 /* 1 /*
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2014, 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.
48 # include "os_solaris.inline.hpp" 48 # include "os_solaris.inline.hpp"
49 #endif 49 #endif
50 #ifdef TARGET_OS_FAMILY_windows 50 #ifdef TARGET_OS_FAMILY_windows
51 # include "os_windows.inline.hpp" 51 # include "os_windows.inline.hpp"
52 #endif 52 #endif
53 #ifdef TARGET_OS_FAMILY_aix
54 # include "os_aix.inline.hpp"
55 #endif
53 #ifdef TARGET_OS_FAMILY_bsd 56 #ifdef TARGET_OS_FAMILY_bsd
54 # include "os_bsd.inline.hpp" 57 # include "os_bsd.inline.hpp"
55 #endif 58 #endif
56 59
57 60
422 Klass* k = SystemDictionary::resolve_or_fail(c_name, true, CATCH); 425 Klass* k = SystemDictionary::resolve_or_fail(c_name, true, CATCH);
423 instanceKlassHandle klass (THREAD, k); 426 instanceKlassHandle klass (THREAD, k);
424 427
425 // Find method and invoke standard lookup 428 // Find method and invoke standard lookup
426 methodHandle method (THREAD, 429 methodHandle method (THREAD,
427 klass->uncached_lookup_method(m_name, s_name)); 430 klass->uncached_lookup_method(m_name, s_name, Klass::normal));
428 address result = lookup(method, in_base_library, CATCH); 431 address result = lookup(method, in_base_library, CATCH);
429 assert(in_base_library, "must be in basic library"); 432 assert(in_base_library, "must be in basic library");
430 guarantee(result != NULL, "must be non NULL"); 433 guarantee(result != NULL, "must be non NULL");
431 return result; 434 return result;
432 } 435 }