1.1 --- a/src/share/vm/oops/method.hpp Mon Feb 29 10:30:03 2016 -0800
1.2 +++ b/src/share/vm/oops/method.hpp Wed Mar 02 19:16:30 2016 +0000
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2016, 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 @@ -105,9 +105,6 @@
1.11 AccessFlags _access_flags; // Access flags
1.12 int _vtable_index; // vtable index of this method (see VtableIndexFlag)
1.13 // note: can have vtables with >2**16 elements (because of inheritance)
1.14 -#ifdef CC_INTERP
1.15 - int _result_index; // C++ interpreter needs for converting results to/from stack
1.16 -#endif
1.17 u2 _method_size; // size of this object
1.18 u1 _intrinsic_id; // vmSymbols::intrinsic_id (0 == _none)
1.19 u1 _jfr_towrite : 1, // Flags
1.20 @@ -202,11 +199,6 @@
1.21 return constMethod()->type_annotations();
1.22 }
1.23
1.24 -#ifdef CC_INTERP
1.25 - void set_result_index(BasicType type);
1.26 - int result_index() { return _result_index; }
1.27 -#endif
1.28 -
1.29 // Helper routine: get klass name + "." + method name + signature as
1.30 // C string, for the purpose of providing more useful NoSuchMethodErrors
1.31 // and fatal error handling. The string is allocated in resource
1.32 @@ -559,7 +551,6 @@
1.33 void compute_size_of_parameters(Thread *thread); // word size of parameters (receiver if any + arguments)
1.34 Symbol* klass_name() const; // returns the name of the method holder
1.35 BasicType result_type() const; // type of the method result
1.36 - int result_type_index() const; // type index of the method result
1.37 bool is_returning_oop() const { BasicType r = result_type(); return (r == T_OBJECT || r == T_ARRAY); }
1.38 bool is_returning_fp() const { BasicType r = result_type(); return (r == T_FLOAT || r == T_DOUBLE); }
1.39
1.40 @@ -652,9 +643,6 @@
1.41 // interpreter support
1.42 static ByteSize const_offset() { return byte_offset_of(Method, _constMethod ); }
1.43 static ByteSize access_flags_offset() { return byte_offset_of(Method, _access_flags ); }
1.44 -#ifdef CC_INTERP
1.45 - static ByteSize result_index_offset() { return byte_offset_of(Method, _result_index ); }
1.46 -#endif /* CC_INTERP */
1.47 static ByteSize from_compiled_offset() { return byte_offset_of(Method, _from_compiled_entry); }
1.48 static ByteSize code_offset() { return byte_offset_of(Method, _code); }
1.49 static ByteSize method_data_offset() {
