comparison src/cpu/x86/vm/metaspaceShared_x86_64.cpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents cd3d6a6b95d9
children
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "assembler_x86.inline.hpp" 26 #include "asm/macroAssembler.hpp"
27 #include "asm/codeBuffer.hpp"
27 #include "memory/metaspaceShared.hpp" 28 #include "memory/metaspaceShared.hpp"
28 29
29 // Generate the self-patching vtable method: 30 // Generate the self-patching vtable method:
30 // 31 //
31 // This method will be called (as any other Klass virtual method) with 32 // This method will be called (as any other Klass virtual method) with