Mercurial > hg > graal-jvmci-8

changeset 2099:4537d449ba57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author bobv
date Fri, 07 Jan 2011 15:57:02 -0500
parents 039eb4201e06 (diff) 2f9d59b0fa5c (current diff)
children 55d7d18ccff9
files
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/solaris/vm/os_solaris.cpp	Fri Jan 07 12:44:54 2011 -0500
+++ b/src/os/solaris/vm/os_solaris.cpp	Fri Jan 07 15:57:02 2011 -0500
@@ -5197,7 +5197,7 @@
   int o_delete = (oflag & O_DELETE);
   oflag = oflag & ~O_DELETE;
 
-  fd = ::open(path, oflag, mode);
+  fd = ::open64(path, oflag, mode);
   if (fd == -1) return -1;
 
   //If the open succeeded, the file might still be a directory
--- a/src/share/vm/runtime/java.cpp	Fri Jan 07 12:44:54 2011 -0500
+++ b/src/share/vm/runtime/java.cpp	Fri Jan 07 15:57:02 2011 -0500
@@ -515,8 +515,8 @@
 }
 
 void vm_exit(int code) {
-  Thread* thread = ThreadLocalStorage::thread_index() == -1 ? NULL
-    : ThreadLocalStorage::get_thread_slow();
+  Thread* thread = ThreadLocalStorage::is_initialized() ?
+    ThreadLocalStorage::get_thread_slow() : NULL;
   if (thread == NULL) {
     // we have serious problems -- just exit
     vm_direct_exit(code);
@@ -553,8 +553,9 @@
   // Calling 'exit_globals()' will disable thread-local-storage and cause all
   // kinds of assertions to trigger in debug mode.
   if (is_init_completed()) {
-    Thread* thread = Thread::current();
-    if (thread->is_Java_thread()) {
+    Thread* thread = ThreadLocalStorage::is_initialized() ?
+                     ThreadLocalStorage::get_thread_slow() : NULL;
+    if (thread != NULL && thread->is_Java_thread()) {
       // We are leaving the VM, set state to native (in case any OS exit
       // handlers call back to the VM)
       JavaThread* jt = (JavaThread*)thread;