Mercurial > hg > icedtea8-forest > hotspot
changeset 9900:07a1135a3273
8062808, PR3548: Turn on the -Wreturn-type warning
Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
| author | stefank |
|---|---|
| date | Fri, 04 May 2018 18:06:53 +0100 |
| parents | de79964656fc |
| children | bcbc64dfb629 |
| files | make/linux/makefiles/gcc.make src/cpu/x86/vm/x86_32.ad src/os_cpu/linux_x86/vm/os_linux_x86.cpp src/share/vm/classfile/defaultMethods.cpp src/share/vm/classfile/symbolTable.cpp src/share/vm/classfile/systemDictionary.cpp src/share/vm/memory/heapInspection.hpp src/share/vm/memory/metaspaceShared.hpp src/share/vm/oops/constantPool.hpp src/share/vm/prims/jvm.cpp src/share/vm/runtime/reflection.cpp src/share/vm/runtime/sharedRuntime.cpp src/share/vm/services/memTracker.hpp |
| diffstat | 13 files changed, 17 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/makefiles/gcc.make Thu May 03 04:16:52 2018 +0100 +++ b/make/linux/makefiles/gcc.make Fri May 04 18:06:53 2018 +0100 @@ -210,7 +210,7 @@ WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body -Qunused-arguments -Wno-uninitialized endif -WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value +WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type ifeq ($(USE_CLANG),) # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
--- a/src/cpu/x86/vm/x86_32.ad Thu May 03 04:16:52 2018 +0100 +++ b/src/cpu/x86/vm/x86_32.ad Fri May 04 18:06:53 2018 +0100 @@ -1250,6 +1250,7 @@ Unimplemented(); + return 0; // Mute compiler } #ifndef PRODUCT
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Thu May 03 04:16:52 2018 +0100 +++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Fri May 04 18:06:53 2018 +0100 @@ -541,6 +541,7 @@ err.report_and_die(); ShouldNotReachHere(); + return true; // Mute compiler } void os::Linux::init_thread_fpu_state(void) {
--- a/src/share/vm/classfile/defaultMethods.cpp Thu May 03 04:16:52 2018 +0100 +++ b/src/share/vm/classfile/defaultMethods.cpp Fri May 04 18:06:53 2018 +0100 @@ -506,7 +506,7 @@ ss.write((const char*)name->bytes(), name->utf8_length()); ss.write((const char*)signature->bytes(), signature->utf8_length()); ss.print(" is abstract"); - return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL); + return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD); } Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const { @@ -521,7 +521,7 @@ ss.print("."); ss.write((const char*)name->bytes(), name->utf8_length()); } - return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL); + return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD); }
--- a/src/share/vm/classfile/symbolTable.cpp Thu May 03 04:16:52 2018 +0100 +++ b/src/share/vm/classfile/symbolTable.cpp Fri May 04 18:06:53 2018 +0100 @@ -249,7 +249,7 @@ MutexLocker ml(SymbolTable_lock, THREAD); // Otherwise, add to symbol to table - return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL); + return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD); } Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) { @@ -288,7 +288,7 @@ // Grab SymbolTable_lock first. MutexLocker ml(SymbolTable_lock, THREAD); - return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL); + return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD); } Symbol* SymbolTable::lookup_only(const char* name, int len,
--- a/src/share/vm/classfile/systemDictionary.cpp Thu May 03 04:16:52 2018 +0100 +++ b/src/share/vm/classfile/systemDictionary.cpp Fri May 04 18:06:53 2018 +0100 @@ -229,15 +229,15 @@ class_name->as_C_string(), class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string())); if (FieldType::is_array(class_name)) { - return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL); + return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD); } else if (FieldType::is_obj(class_name)) { ResourceMark rm(THREAD); // Ignore wrapping L and ;. TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1, class_name->utf8_length() - 2, CHECK_NULL); - return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL); + return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD); } else { - return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL); + return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD); } }
--- a/src/share/vm/memory/heapInspection.hpp Thu May 03 04:16:52 2018 +0100 +++ b/src/share/vm/memory/heapInspection.hpp Fri May 04 18:06:53 2018 +0100 @@ -367,7 +367,7 @@ _csv_format(csv_format), _print_help(print_help), _print_class_stats(print_class_stats), _columns(columns) {} void heap_inspection(outputStream* st) NOT_SERVICES_RETURN; - size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN; + size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0); static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN; private: void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
--- a/src/share/vm/memory/metaspaceShared.hpp Thu May 03 04:16:52 2018 +0100 +++ b/src/share/vm/memory/metaspaceShared.hpp Fri May 04 18:06:53 2018 +0100 @@ -93,7 +93,7 @@ static void preload_and_dump(TRAPS) NOT_CDS_RETURN; static int preload_and_dump(const char * class_list_path, GrowableArray<Klass*>* class_promote_order, - TRAPS) NOT_CDS_RETURN; + TRAPS) NOT_CDS_RETURN_(0); static ReservedSpace* shared_rs() { CDS_ONLY(return _shared_rs);
--- a/src/share/vm/oops/constantPool.hpp Thu May 03 04:16:52 2018 +0100 +++ b/src/share/vm/oops/constantPool.hpp Fri May 04 18:06:53 2018 +0100 @@ -352,7 +352,7 @@ Klass* klass_at(int which, TRAPS) { constantPoolHandle h_this(THREAD, this); - return klass_at_impl(h_this, which, CHECK_NULL); + return klass_at_impl(h_this, which, THREAD); } Symbol* klass_name_at(int which); // Returns the name, w/o resolving.
--- a/src/share/vm/prims/jvm.cpp Thu May 03 04:16:52 2018 +0100 +++ b/src/share/vm/prims/jvm.cpp Fri May 04 18:06:53 2018 +0100 @@ -4244,7 +4244,7 @@ JVM_DTraceProvider* providers)) JVMWrapper("JVM_DTraceActivate"); return DTraceJSDT::activate( - version, module_name, providers_count, providers, CHECK_0); + version, module_name, providers_count, providers, THREAD); JVM_END JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
--- a/src/share/vm/runtime/reflection.cpp Thu May 03 04:16:52 2018 +0100 +++ b/src/share/vm/runtime/reflection.cpp Fri May 04 18:06:53 2018 +0100 @@ -1093,7 +1093,7 @@ } else { if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT) narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL); - return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL); + return box((jvalue*) result.get_value_addr(), rtype, THREAD); } }
--- a/src/share/vm/runtime/sharedRuntime.cpp Thu May 03 04:16:52 2018 +0100 +++ b/src/share/vm/runtime/sharedRuntime.cpp Fri May 04 18:06:53 2018 +0100 @@ -1046,7 +1046,7 @@ // last java frame on stack (which includes native call frames) vframeStream vfst(thread, true); // Do not skip and javaCalls - return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle())); + return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD); }
--- a/src/share/vm/services/memTracker.hpp Thu May 03 04:16:52 2018 +0100 +++ b/src/share/vm/services/memTracker.hpp Fri May 04 18:06:53 2018 +0100 @@ -64,7 +64,7 @@ const NativeCallStack& stack, MEMFLAGS flag = mtNone) { } static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { } static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); } - static inline Tracker get_virtual_memory_release_tracker() { } + static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); } static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { } static inline void record_thread_stack(void* addr, size_t size) { } static inline void release_thread_stack(void* addr, size_t size) { }