changeset 40058:b4441f6cfe79

Merge
author zmajo
date Tue, 12 Jul 2016 08:42:46 +0000
parents 6bdd3da90181 a0511d037cbe
children c2304140ed64
files
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/ci/ciEnv.cpp	Tue Jul 12 08:57:00 2016 +0200
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp	Tue Jul 12 08:42:46 2016 +0000
@@ -204,11 +204,13 @@
 }
 
 ciEnv::~ciEnv() {
-  CompilerThread* current_thread = CompilerThread::current();
-  _factory->remove_symbols();
-  // Need safepoint to clear the env on the thread.  RedefineClasses might
-  // be reading it.
-  GUARDED_VM_ENTRY(current_thread->set_env(NULL);)
+  GUARDED_VM_ENTRY(
+      CompilerThread* current_thread = CompilerThread::current();
+      _factory->remove_symbols();
+      // Need safepoint to clear the env on the thread.  RedefineClasses might
+      // be reading it.
+      current_thread->set_env(NULL);
+  )
 }
 
 // ------------------------------------------------------------------