1.1 --- a/src/share/vm/prims/methodComparator.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/prims/methodComparator.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2000, 2012, 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 @@ -26,8 +26,8 @@
1.11 #define SHARE_VM_PRIMS_METHODCOMPARATOR_HPP
1.12
1.13 #include "interpreter/bytecodeStream.hpp"
1.14 -#include "oops/constantPoolOop.hpp"
1.15 -#include "oops/methodOop.hpp"
1.16 +#include "oops/constantPool.hpp"
1.17 +#include "oops/method.hpp"
1.18
1.19 class BciMap;
1.20
1.21 @@ -37,14 +37,15 @@
1.22 class MethodComparator {
1.23 private:
1.24 static BytecodeStream *_s_old, *_s_new;
1.25 - static constantPoolOop _old_cp, _new_cp;
1.26 + static ConstantPool* _old_cp;
1.27 + static ConstantPool* _new_cp;
1.28 static BciMap *_bci_map;
1.29 static bool _switchable_test;
1.30 static GrowableArray<int> *_fwd_jmps;
1.31
1.32 static bool args_same(Bytecodes::Code c_old, Bytecodes::Code c_new);
1.33 static bool pool_constants_same(int cpi_old, int cpi_new);
1.34 - static int check_stack_and_locals_size(methodOop old_method, methodOop new_method);
1.35 + static int check_stack_and_locals_size(Method* old_method, Method* new_method);
1.36
1.37 public:
1.38 // Check if the new method is equivalent to the old one modulo constant pool (EMCP).
1.39 @@ -52,9 +53,9 @@
1.40 // on the source code level. Practically, we check whether the only difference between
1.41 // method versions is some constantpool indices embedded into the bytecodes, and whether
1.42 // these indices eventually point to the same constants for both method versions.
1.43 - static bool methods_EMCP(methodOop old_method, methodOop new_method);
1.44 + static bool methods_EMCP(Method* old_method, Method* new_method);
1.45
1.46 - static bool methods_switchable(methodOop old_method, methodOop new_method, BciMap &bci_map);
1.47 + static bool methods_switchable(Method* old_method, Method* new_method, BciMap &bci_map);
1.48 };
1.49
1.50
