Mercurial > hg > openjdk > jdk7u > hotspot
changeset 5817:220e4791ba8f
8062808: Turn on the -Wreturn-type warning
Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
| author | stefank |
|---|---|
| date | Tue, 13 Feb 2018 05:26:21 +0000 |
| parents | 5d4f299f934c |
| children | 2b8e71792895 |
| 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/symbolTable.cpp src/share/vm/classfile/systemDictionary.cpp src/share/vm/prims/jvm.cpp src/share/vm/runtime/reflection.cpp src/share/vm/runtime/sharedRuntime.cpp |
| diffstat | 8 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/makefiles/gcc.make Tue Feb 13 04:45:41 2018 +0000 +++ b/make/linux/makefiles/gcc.make Tue Feb 13 05:26:21 2018 +0000 @@ -145,9 +145,9 @@ # conversions which might affect the values. To avoid that, we need to turn # it off explicitly. ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" -ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare +ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare -Wreturn-type else -ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare +ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare -Wreturn-type endif CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
--- a/src/cpu/x86/vm/x86_32.ad Tue Feb 13 04:45:41 2018 +0000 +++ b/src/cpu/x86/vm/x86_32.ad Tue Feb 13 05:26:21 2018 +0000 @@ -1208,6 +1208,7 @@ Unimplemented(); + return 0; // Mute compiler } #ifndef PRODUCT
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Tue Feb 13 04:45:41 2018 +0000 +++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Tue Feb 13 05:26:21 2018 +0000 @@ -531,6 +531,7 @@ err.report_and_die(); ShouldNotReachHere(); + return true; // Mute compiler } void os::Linux::init_thread_fpu_state(void) {
--- a/src/share/vm/classfile/symbolTable.cpp Tue Feb 13 04:45:41 2018 +0000 +++ b/src/share/vm/classfile/symbolTable.cpp Tue Feb 13 05:26:21 2018 +0000 @@ -241,7 +241,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) { @@ -280,7 +280,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 Tue Feb 13 04:45:41 2018 +0000 +++ b/src/share/vm/classfile/systemDictionary.cpp Tue Feb 13 05:26:21 2018 +0000 @@ -204,15 +204,15 @@ class_name->as_C_string(), class_loader.is_null() ? "null" : class_loader->klass()->klass_part()->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/prims/jvm.cpp Tue Feb 13 04:45:41 2018 +0000 +++ b/src/share/vm/prims/jvm.cpp Tue Feb 13 05:26:21 2018 +0000 @@ -4311,7 +4311,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 Tue Feb 13 04:45:41 2018 +0000 +++ b/src/share/vm/runtime/reflection.cpp Tue Feb 13 05:26:21 2018 +0000 @@ -1031,7 +1031,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 Tue Feb 13 04:45:41 2018 +0000 +++ b/src/share/vm/runtime/sharedRuntime.cpp Tue Feb 13 05:26:21 2018 +0000 @@ -1018,7 +1018,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); }