Mercurial > hg > graal-jvmci-8
diff src/share/vm/prims/methodComparator.hpp @ 6725:da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>
| author | coleenp |
|---|---|
| date | Sat, 01 Sep 2012 13:25:18 -0400 |
| parents | f95d63e2154a |
| children |
line wrap: on
line diff
--- a/src/share/vm/prims/methodComparator.hpp Fri Aug 31 16:39:35 2012 -0700 +++ b/src/share/vm/prims/methodComparator.hpp Sat Sep 01 13:25:18 2012 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,8 @@ #define SHARE_VM_PRIMS_METHODCOMPARATOR_HPP #include "interpreter/bytecodeStream.hpp" -#include "oops/constantPoolOop.hpp" -#include "oops/methodOop.hpp" +#include "oops/constantPool.hpp" +#include "oops/method.hpp" class BciMap; @@ -37,14 +37,15 @@ class MethodComparator { private: static BytecodeStream *_s_old, *_s_new; - static constantPoolOop _old_cp, _new_cp; + static ConstantPool* _old_cp; + static ConstantPool* _new_cp; static BciMap *_bci_map; static bool _switchable_test; static GrowableArray<int> *_fwd_jmps; static bool args_same(Bytecodes::Code c_old, Bytecodes::Code c_new); static bool pool_constants_same(int cpi_old, int cpi_new); - static int check_stack_and_locals_size(methodOop old_method, methodOop new_method); + static int check_stack_and_locals_size(Method* old_method, Method* new_method); public: // Check if the new method is equivalent to the old one modulo constant pool (EMCP). @@ -52,9 +53,9 @@ // on the source code level. Practically, we check whether the only difference between // method versions is some constantpool indices embedded into the bytecodes, and whether // these indices eventually point to the same constants for both method versions. - static bool methods_EMCP(methodOop old_method, methodOop new_method); + static bool methods_EMCP(Method* old_method, Method* new_method); - static bool methods_switchable(methodOop old_method, methodOop new_method, BciMap &bci_map); + static bool methods_switchable(Method* old_method, Method* new_method, BciMap &bci_map); };