Mercurial > hg > graal-jvmci-8
diff src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp @ 14328:2c2a99f6cf83
8029775: Solaris code cleanup
8033464: Linux code cleanup
Summary: cleaned up warnings in solaris and linux specific os code.
Reviewed-by: coleenp, fparain, dcubed
Contributed-by: gerald.thornbrugh@oracle.com
author | coleenp |
---|---|
date | Thu, 06 Feb 2014 14:28:35 -0500 |
parents | af21010d1062 |
children | 4ca6dc0799b6 98af1e198e73 |
line wrap: on
line diff
--- a/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Wed Feb 05 21:24:29 2014 -0800 +++ b/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Thu Feb 06 14:28:35 2014 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -475,9 +475,11 @@ // here if the underlying file has been truncated. // Do not crash the VM in such a case. CodeBlob* cb = CodeCache::find_blob_unsafe(pc); - nmethod* nm = cb->is_nmethod() ? (nmethod*)cb : NULL; - if (nm != NULL && nm->has_unsafe_access()) { - stub = StubRoutines::handler_for_unsafe_access(); + if (cb != NULL) { + nmethod* nm = cb->is_nmethod() ? (nmethod*)cb : NULL; + if (nm != NULL && nm->has_unsafe_access()) { + stub = StubRoutines::handler_for_unsafe_access(); + } } } else @@ -724,6 +726,7 @@ err.report_and_die(); ShouldNotReachHere(); + return false; } void os::print_context(outputStream *st, void *context) {