Mercurial > hg > graal-jvmci-8

diff src/share/vm/classfile/systemDictionary.cpp @ 20806:6ee9b878902b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge mess-ups
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 18:57:02 +0200
parents 7848fc12602b
children be896a1983c0
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.cpp	Tue Apr 07 15:00:39 2015 +0200
+++ b/src/share/vm/classfile/systemDictionary.cpp	Tue Apr 07 18:57:02 2015 +0200
@@ -1728,7 +1728,7 @@
   strong->do_oop(&_java_system_loader);
   strong->do_oop(&_system_loader_lock_obj);
   CDS_ONLY(SystemDictionaryShared::roots_oops_do(strong);)
-  GRAAL_ONLY(blk->do_oop(&_graal_loader);)
+  GRAAL_ONLY(strong->do_oop(&_graal_loader);)
 
   // Adjust dictionary
   dictionary()->roots_oops_do(strong, weak);