Mon, 13 May 2013 18:08:13 +0000
Merge
src/share/vm/oops/method.hpp | file | annotate | diff | comparison | revisions |
1.1 --- a/src/share/vm/c1/c1_Runtime1.cpp Mon May 13 07:53:45 2013 +0200 1.2 +++ b/src/share/vm/c1/c1_Runtime1.cpp Mon May 13 18:08:13 2013 +0000 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1999, 2013, 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 @@ -1261,7 +1261,7 @@ 1.11 1.12 if (length == 0) return ac_ok; 1.13 if (src->is_typeArray()) { 1.14 - Klass* const klass_oop = src->klass(); 1.15 + Klass* klass_oop = src->klass(); 1.16 if (klass_oop != dst->klass()) return ac_failed; 1.17 TypeArrayKlass* klass = TypeArrayKlass::cast(klass_oop); 1.18 const int l2es = klass->log2_element_size();
2.1 --- a/src/share/vm/classfile/verifier.cpp Mon May 13 07:53:45 2013 +0200 2.2 +++ b/src/share/vm/classfile/verifier.cpp Mon May 13 18:08:13 2013 +0000 2.3 @@ -362,7 +362,7 @@ 2.4 } 2.5 #endif 2.6 2.7 -void ErrorContext::details(outputStream* ss, Method* method) const { 2.8 +void ErrorContext::details(outputStream* ss, const Method* method) const { 2.9 if (is_valid()) { 2.10 ss->print_cr(""); 2.11 ss->print_cr("Exception Details:"); 2.12 @@ -435,7 +435,7 @@ 2.13 ss->print_cr(""); 2.14 } 2.15 2.16 -void ErrorContext::location_details(outputStream* ss, Method* method) const { 2.17 +void ErrorContext::location_details(outputStream* ss, const Method* method) const { 2.18 if (_bci != -1 && method != NULL) { 2.19 streamIndentor si(ss); 2.20 const char* bytecode_name = "<invalid>"; 2.21 @@ -470,7 +470,7 @@ 2.22 } 2.23 } 2.24 2.25 -void ErrorContext::bytecode_details(outputStream* ss, Method* method) const { 2.26 +void ErrorContext::bytecode_details(outputStream* ss, const Method* method) const { 2.27 if (method != NULL) { 2.28 streamIndentor si(ss); 2.29 ss->indent().print_cr("Bytecode:"); 2.30 @@ -479,7 +479,7 @@ 2.31 } 2.32 } 2.33 2.34 -void ErrorContext::handler_details(outputStream* ss, Method* method) const { 2.35 +void ErrorContext::handler_details(outputStream* ss, const Method* method) const { 2.36 if (method != NULL) { 2.37 streamIndentor si(ss); 2.38 ExceptionTable table(method); 2.39 @@ -494,7 +494,7 @@ 2.40 } 2.41 } 2.42 2.43 -void ErrorContext::stackmap_details(outputStream* ss, Method* method) const { 2.44 +void ErrorContext::stackmap_details(outputStream* ss, const Method* method) const { 2.45 if (method != NULL && method->has_stackmap_table()) { 2.46 streamIndentor si(ss); 2.47 ss->indent().print_cr("Stackmap Table:");
3.1 --- a/src/share/vm/classfile/verifier.hpp Mon May 13 07:53:45 2013 +0200 3.2 +++ b/src/share/vm/classfile/verifier.hpp Mon May 13 18:08:13 2013 +0000 3.3 @@ -1,5 +1,5 @@ 3.4 /* 3.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 3.6 + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 3.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 * 3.9 * This code is free software; you can redistribute it and/or modify it 3.10 @@ -224,7 +224,7 @@ 3.11 _expected.reset_frame(); 3.12 } 3.13 3.14 - void details(outputStream* ss, Method* method) const; 3.15 + void details(outputStream* ss, const Method* method) const; 3.16 3.17 #ifdef ASSERT 3.18 void print_on(outputStream* str) const { 3.19 @@ -237,12 +237,12 @@ 3.20 #endif 3.21 3.22 private: 3.23 - void location_details(outputStream* ss, Method* method) const; 3.24 + void location_details(outputStream* ss, const Method* method) const; 3.25 void reason_details(outputStream* ss) const; 3.26 void frame_details(outputStream* ss) const; 3.27 - void bytecode_details(outputStream* ss, Method* method) const; 3.28 - void handler_details(outputStream* ss, Method* method) const; 3.29 - void stackmap_details(outputStream* ss, Method* method) const; 3.30 + void bytecode_details(outputStream* ss, const Method* method) const; 3.31 + void handler_details(outputStream* ss, const Method* method) const; 3.32 + void stackmap_details(outputStream* ss, const Method* method) const; 3.33 }; 3.34 3.35 // A new instance of this class is created for each class being verified
4.1 --- a/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp Mon May 13 07:53:45 2013 +0200 4.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp Mon May 13 18:08:13 2013 +0000 4.3 @@ -1,5 +1,5 @@ 4.4 /* 4.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. 4.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 4.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.8 * 4.9 * This code is free software; you can redistribute it and/or modify it 4.10 @@ -213,7 +213,7 @@ 4.11 int random_seed = 17; 4.12 do { 4.13 while (ParCompactionManager::steal_objarray(which, &random_seed, task)) { 4.14 - ObjArrayKlass* const k = (ObjArrayKlass*)task.obj()->klass(); 4.15 + ObjArrayKlass* k = (ObjArrayKlass*)task.obj()->klass(); 4.16 k->oop_follow_contents(cm, task.obj(), task.index()); 4.17 cm->follow_marking_stacks(); 4.18 }
5.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp Mon May 13 07:53:45 2013 +0200 5.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp Mon May 13 18:08:13 2013 +0000 5.3 @@ -1,5 +1,5 @@ 5.4 /* 5.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. 5.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 5.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.8 * 5.9 * This code is free software; you can redistribute it and/or modify it 5.10 @@ -187,11 +187,8 @@ 5.11 5.12 // Process ObjArrays one at a time to avoid marking stack bloat. 5.13 ObjArrayTask task; 5.14 - if (_objarray_stack.pop_overflow(task)) { 5.15 - ObjArrayKlass* const k = (ObjArrayKlass*)task.obj()->klass(); 5.16 - k->oop_follow_contents(this, task.obj(), task.index()); 5.17 - } else if (_objarray_stack.pop_local(task)) { 5.18 - ObjArrayKlass* const k = (ObjArrayKlass*)task.obj()->klass(); 5.19 + if (_objarray_stack.pop_overflow(task) || _objarray_stack.pop_local(task)) { 5.20 + ObjArrayKlass* k = (ObjArrayKlass*)task.obj()->klass(); 5.21 k->oop_follow_contents(this, task.obj(), task.index()); 5.22 } 5.23 } while (!marking_stacks_empty());
6.1 --- a/src/share/vm/gc_implementation/shared/markSweep.cpp Mon May 13 07:53:45 2013 +0200 6.2 +++ b/src/share/vm/gc_implementation/shared/markSweep.cpp Mon May 13 18:08:13 2013 +0000 6.3 @@ -1,5 +1,5 @@ 6.4 /* 6.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 6.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 6.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.8 * 6.9 * This code is free software; you can redistribute it and/or modify it 6.10 @@ -95,7 +95,7 @@ 6.11 // Process ObjArrays one at a time to avoid marking stack bloat. 6.12 if (!_objarray_stack.is_empty()) { 6.13 ObjArrayTask task = _objarray_stack.pop(); 6.14 - ObjArrayKlass* const k = (ObjArrayKlass*)task.obj()->klass(); 6.15 + ObjArrayKlass* k = (ObjArrayKlass*)task.obj()->klass(); 6.16 k->oop_follow_contents(task.obj(), task.index()); 6.17 } 6.18 } while (!_marking_stack.is_empty() || !_objarray_stack.is_empty());
7.1 --- a/src/share/vm/memory/heapInspection.cpp Mon May 13 07:53:45 2013 +0200 7.2 +++ b/src/share/vm/memory/heapInspection.cpp Mon May 13 18:08:13 2013 +0000 7.3 @@ -154,12 +154,12 @@ 7.4 } 7.5 } 7.6 7.7 -uint KlassInfoTable::hash(Klass* p) { 7.8 +uint KlassInfoTable::hash(const Klass* p) { 7.9 assert(p->is_metadata(), "all klasses are metadata"); 7.10 return (uint)(((uintptr_t)p - (uintptr_t)_ref) >> 2); 7.11 } 7.12 7.13 -KlassInfoEntry* KlassInfoTable::lookup(Klass* const k) { 7.14 +KlassInfoEntry* KlassInfoTable::lookup(Klass* k) { 7.15 uint idx = hash(k) % _size; 7.16 assert(_buckets != NULL, "Allocation failure should have been caught"); 7.17 KlassInfoEntry* e = _buckets[idx].lookup(k);
8.1 --- a/src/share/vm/memory/heapInspection.hpp Mon May 13 07:53:45 2013 +0200 8.2 +++ b/src/share/vm/memory/heapInspection.hpp Mon May 13 18:08:13 2013 +0000 8.3 @@ -189,15 +189,15 @@ 8.4 KlassInfoEntry(Klass* k, KlassInfoEntry* next) : 8.5 _klass(k), _instance_count(0), _instance_words(0), _next(next), _index(-1) 8.6 {} 8.7 - KlassInfoEntry* next() { return _next; } 8.8 - bool is_equal(Klass* k) { return k == _klass; } 8.9 - Klass* klass() { return _klass; } 8.10 - long count() { return _instance_count; } 8.11 + KlassInfoEntry* next() const { return _next; } 8.12 + bool is_equal(const Klass* k) { return k == _klass; } 8.13 + Klass* klass() const { return _klass; } 8.14 + long count() const { return _instance_count; } 8.15 void set_count(long ct) { _instance_count = ct; } 8.16 - size_t words() { return _instance_words; } 8.17 + size_t words() const { return _instance_words; } 8.18 void set_words(size_t wds) { _instance_words = wds; } 8.19 void set_index(long index) { _index = index; } 8.20 - long index() { return _index; } 8.21 + long index() const { return _index; } 8.22 int compare(KlassInfoEntry* e1, KlassInfoEntry* e2); 8.23 void print_on(outputStream* st) const; 8.24 const char* name() const; 8.25 @@ -215,7 +215,7 @@ 8.26 KlassInfoEntry* list() { return _list; } 8.27 void set_list(KlassInfoEntry* l) { _list = l; } 8.28 public: 8.29 - KlassInfoEntry* lookup(Klass* const k); 8.30 + KlassInfoEntry* lookup(Klass* k); 8.31 void initialize() { _list = NULL; } 8.32 void empty(); 8.33 void iterate(KlassInfoClosure* cic); 8.34 @@ -231,8 +231,8 @@ 8.35 HeapWord* _ref; 8.36 8.37 KlassInfoBucket* _buckets; 8.38 - uint hash(Klass* p); 8.39 - KlassInfoEntry* lookup(Klass* const k); // allocates if not found! 8.40 + uint hash(const Klass* p); 8.41 + KlassInfoEntry* lookup(Klass* k); // allocates if not found! 8.42 8.43 class AllClassesFinder : public KlassClosure { 8.44 KlassInfoTable *_table;
9.1 --- a/src/share/vm/memory/universe.cpp Mon May 13 07:53:45 2013 +0200 9.2 +++ b/src/share/vm/memory/universe.cpp Mon May 13 18:08:13 2013 +0000 9.3 @@ -1425,25 +1425,25 @@ 9.4 } 9.5 9.6 9.7 -void ActiveMethodOopsCache::add_previous_version(Method* const method) { 9.8 +void ActiveMethodOopsCache::add_previous_version(Method* method) { 9.9 assert(Thread::current()->is_VM_thread(), 9.10 "only VMThread can add previous versions"); 9.11 9.12 // Only append the previous method if it is executing on the stack. 9.13 if (method->on_stack()) { 9.14 9.15 - if (_prev_methods == NULL) { 9.16 - // This is the first previous version so make some space. 9.17 - // Start with 2 elements under the assumption that the class 9.18 - // won't be redefined much. 9.19 + if (_prev_methods == NULL) { 9.20 + // This is the first previous version so make some space. 9.21 + // Start with 2 elements under the assumption that the class 9.22 + // won't be redefined much. 9.23 _prev_methods = new (ResourceObj::C_HEAP, mtClass) GrowableArray<Method*>(2, true); 9.24 - } 9.25 + } 9.26 9.27 - // RC_TRACE macro has an embedded ResourceMark 9.28 - RC_TRACE(0x00000100, 9.29 - ("add: %s(%s): adding prev version ref for cached method @%d", 9.30 - method->name()->as_C_string(), method->signature()->as_C_string(), 9.31 - _prev_methods->length())); 9.32 + // RC_TRACE macro has an embedded ResourceMark 9.33 + RC_TRACE(0x00000100, 9.34 + ("add: %s(%s): adding prev version ref for cached method @%d", 9.35 + method->name()->as_C_string(), method->signature()->as_C_string(), 9.36 + _prev_methods->length())); 9.37 9.38 _prev_methods->append(method); 9.39 } 9.40 @@ -1464,16 +1464,17 @@ 9.41 MetadataFactory::free_metadata(method->method_holder()->class_loader_data(), method); 9.42 } else { 9.43 // RC_TRACE macro has an embedded ResourceMark 9.44 - RC_TRACE(0x00000400, ("add: %s(%s): previous cached method @%d is alive", 9.45 - method->name()->as_C_string(), method->signature()->as_C_string(), i)); 9.46 + RC_TRACE(0x00000400, 9.47 + ("add: %s(%s): previous cached method @%d is alive", 9.48 + method->name()->as_C_string(), method->signature()->as_C_string(), i)); 9.49 } 9.50 } 9.51 } // end add_previous_version() 9.52 9.53 9.54 -bool ActiveMethodOopsCache::is_same_method(Method* const method) const { 9.55 +bool ActiveMethodOopsCache::is_same_method(const Method* method) const { 9.56 InstanceKlass* ik = InstanceKlass::cast(klass()); 9.57 - Method* check_method = ik->method_with_idnum(method_idnum()); 9.58 + const Method* check_method = ik->method_with_idnum(method_idnum()); 9.59 assert(check_method != NULL, "sanity check"); 9.60 if (check_method == method) { 9.61 // done with the easy case
10.1 --- a/src/share/vm/memory/universe.hpp Mon May 13 07:53:45 2013 +0200 10.2 +++ b/src/share/vm/memory/universe.hpp Mon May 13 18:08:13 2013 +0000 10.3 @@ -90,8 +90,8 @@ 10.4 ActiveMethodOopsCache() { _prev_methods = NULL; } 10.5 ~ActiveMethodOopsCache(); 10.6 10.7 - void add_previous_version(Method* const method); 10.8 - bool is_same_method(Method* const method) const; 10.9 + void add_previous_version(Method* method); 10.10 + bool is_same_method(const Method* method) const; 10.11 }; 10.12 10.13
11.1 --- a/src/share/vm/oops/constantPool.hpp Mon May 13 07:53:45 2013 +0200 11.2 +++ b/src/share/vm/oops/constantPool.hpp Mon May 13 18:08:13 2013 +0000 11.3 @@ -354,7 +354,7 @@ 11.4 11.5 Symbol* klass_name_at(int which); // Returns the name, w/o resolving. 11.6 11.7 - Klass* resolved_klass_at(int which) { // Used by Compiler 11.8 + Klass* resolved_klass_at(int which) const { // Used by Compiler 11.9 guarantee(tag_at(which).is_klass(), "Corrupted constant pool"); 11.10 // Must do an acquire here in case another thread resolved the klass 11.11 // behind our back, lest we later load stale values thru the oop.
12.1 --- a/src/share/vm/oops/instanceKlass.cpp Mon May 13 07:53:45 2013 +0200 12.2 +++ b/src/share/vm/oops/instanceKlass.cpp Mon May 13 18:08:13 2013 +0000 12.3 @@ -2724,7 +2724,7 @@ 12.4 OsrList_lock->unlock(); 12.5 } 12.6 12.7 -nmethod* InstanceKlass::lookup_osr_nmethod(Method* const m, int bci, int comp_level, bool match_level) const { 12.8 +nmethod* InstanceKlass::lookup_osr_nmethod(const Method* m, int bci, int comp_level, bool match_level) const { 12.9 // This is a short non-blocking critical region, so the no safepoint check is ok. 12.10 OsrList_lock->lock_without_safepoint_check(); 12.11 nmethod* osr = osr_nmethods_head();
13.1 --- a/src/share/vm/oops/instanceKlass.hpp Mon May 13 07:53:45 2013 +0200 13.2 +++ b/src/share/vm/oops/instanceKlass.hpp Mon May 13 18:08:13 2013 +0000 13.3 @@ -739,7 +739,7 @@ 13.4 void set_osr_nmethods_head(nmethod* h) { _osr_nmethods_head = h; }; 13.5 void add_osr_nmethod(nmethod* n); 13.6 void remove_osr_nmethod(nmethod* n); 13.7 - nmethod* lookup_osr_nmethod(Method* const m, int bci, int level, bool match_level) const; 13.8 + nmethod* lookup_osr_nmethod(const Method* m, int bci, int level, bool match_level) const; 13.9 13.10 // Breakpoint support (see methods on Method* for details) 13.11 BreakpointInfo* breakpoints() const { return _breakpoints; };
14.1 --- a/src/share/vm/oops/klass.cpp Mon May 13 07:53:45 2013 +0200 14.2 +++ b/src/share/vm/oops/klass.cpp Mon May 13 18:08:13 2013 +0000 14.3 @@ -50,7 +50,7 @@ 14.4 if (_name != NULL) _name->increment_refcount(); 14.5 } 14.6 14.7 -bool Klass::is_subclass_of(Klass* k) const { 14.8 +bool Klass::is_subclass_of(const Klass* k) const { 14.9 // Run up the super chain and check 14.10 if (this == k) return true; 14.11
15.1 --- a/src/share/vm/oops/klass.hpp Mon May 13 07:53:45 2013 +0200 15.2 +++ b/src/share/vm/oops/klass.hpp Mon May 13 18:08:13 2013 +0000 15.3 @@ -395,7 +395,7 @@ 15.4 virtual klassVtable* vtable() const { return NULL; } 15.5 15.6 // subclass check 15.7 - bool is_subclass_of(Klass* k) const; 15.8 + bool is_subclass_of(const Klass* k) const; 15.9 // subtype check: true if is_subclass_of, or if k is interface and receiver implements it 15.10 bool is_subtype_of(Klass* k) const { 15.11 juint off = k->super_check_offset();
16.1 --- a/src/share/vm/oops/method.cpp Mon May 13 07:53:45 2013 +0200 16.2 +++ b/src/share/vm/oops/method.cpp Mon May 13 18:08:13 2013 +0000 16.3 @@ -1581,7 +1581,7 @@ 16.4 } 16.5 16.6 int Method::highest_comp_level() const { 16.7 - MethodData* mdo = method_data(); 16.8 + const MethodData* mdo = method_data(); 16.9 if (mdo != NULL) { 16.10 return mdo->highest_comp_level(); 16.11 } else { 16.12 @@ -1590,7 +1590,7 @@ 16.13 } 16.14 16.15 int Method::highest_osr_comp_level() const { 16.16 - MethodData* mdo = method_data(); 16.17 + const MethodData* mdo = method_data(); 16.18 if (mdo != NULL) { 16.19 return mdo->highest_osr_comp_level(); 16.20 } else {
17.1 --- a/src/share/vm/oops/method.hpp Mon May 13 07:53:45 2013 +0200 17.2 +++ b/src/share/vm/oops/method.hpp Mon May 13 18:08:13 2013 +0000 17.3 @@ -986,7 +986,7 @@ 17.4 u2 _length; 17.5 17.6 public: 17.7 - ExceptionTable(Method* m) { 17.8 + ExceptionTable(const Method* m) { 17.9 if (m->has_exception_handler()) { 17.10 _table = m->exception_table_start(); 17.11 _length = m->exception_table_length();
18.1 --- a/src/share/vm/oops/methodData.hpp Mon May 13 07:53:45 2013 +0200 18.2 +++ b/src/share/vm/oops/methodData.hpp Mon May 13 18:08:13 2013 +0000 18.3 @@ -1338,9 +1338,9 @@ 18.4 void set_would_profile(bool p) { _would_profile = p; } 18.5 bool would_profile() const { return _would_profile; } 18.6 18.7 - int highest_comp_level() { return _highest_comp_level; } 18.8 + int highest_comp_level() const { return _highest_comp_level; } 18.9 void set_highest_comp_level(int level) { _highest_comp_level = level; } 18.10 - int highest_osr_comp_level() { return _highest_osr_comp_level; } 18.11 + int highest_osr_comp_level() const { return _highest_osr_comp_level; } 18.12 void set_highest_osr_comp_level(int level) { _highest_osr_comp_level = level; } 18.13 18.14 int num_loops() const { return _num_loops; }
19.1 --- a/src/share/vm/prims/jvm.cpp Mon May 13 07:53:45 2013 +0200 19.2 +++ b/src/share/vm/prims/jvm.cpp Mon May 13 18:08:13 2013 +0000 19.3 @@ -1710,7 +1710,7 @@ 19.4 for (int i = 0; i < num_params; i++) { 19.5 MethodParametersElement* params = mh->method_parameters_start(); 19.6 // For a 0 index, give a NULL symbol 19.7 - Symbol* const sym = 0 != params[i].name_cp_index ? 19.8 + Symbol* sym = 0 != params[i].name_cp_index ? 19.9 mh->constants()->symbol_at(params[i].name_cp_index) : NULL; 19.10 int flags = params[i].flags; 19.11 oop param = Reflection::new_parameter(reflected_method, i, sym,
20.1 --- a/src/share/vm/prims/jvmtiTagMap.cpp Mon May 13 07:53:45 2013 +0200 20.2 +++ b/src/share/vm/prims/jvmtiTagMap.cpp Mon May 13 18:08:13 2013 +0000 20.3 @@ -1,5 +1,5 @@ 20.4 /* 20.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 20.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 20.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 20.8 * 20.9 * This code is free software; you can redistribute it and/or modify it 20.10 @@ -2857,7 +2857,7 @@ 20.11 20.12 // references from the constant pool 20.13 { 20.14 - ConstantPool* const pool = ik->constants(); 20.15 + ConstantPool* pool = ik->constants(); 20.16 for (int i = 1; i < pool->length(); i++) { 20.17 constantTag tag = pool->tag_at(i).value(); 20.18 if (tag.is_string() || tag.is_klass()) {