Mercurial > hg > truffle

diff src/share/vm/gc_implementation/g1/vm_operations_g1.cpp @ 20771:9fa3bf3043a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Wed, 26 Nov 2014 08:14:21 -0800
parents 4e4ebe50c8e3
children
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp	Wed Nov 19 12:52:56 2014 -0800
+++ b/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp	Wed Nov 26 08:14:21 2014 -0800
@@ -213,8 +213,12 @@
   assert(_needs_pll, "don't call this otherwise");
   // The caller may block while communicating
   // with the SLT thread in order to acquire/release the PLL.
-  ConcurrentMarkThread::slt()->
-    manipulatePLL(SurrogateLockerThread::acquirePLL);
+  SurrogateLockerThread* slt = ConcurrentMarkThread::slt();
+  if (slt != NULL) {
+    slt->manipulatePLL(SurrogateLockerThread::acquirePLL);
+  } else {
+    SurrogateLockerThread::report_missing_slt();
+  }
 }
 
 void VM_CGC_Operation::release_and_notify_pending_list_lock() {