Mercurial > hg > truffle

comparison src/share/vm/classfile/systemDictionary.cpp @ 20762:c2844108a708

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 23 Oct 2014 12:02:08 -0700
parents 13dbe89e447c 01dcaba9b3f3
children 02c7eebe5f52
comparison
equal deleted inserted replaced
20550:8538a606a105 20762:c2844108a708
1906 1906
1907 // Preload ref klasses and set reference types 1907 // Preload ref klasses and set reference types
1908 InstanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER); 1908 InstanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER);
1909 InstanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass)); 1909 InstanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass));
1910 1910
1911 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK); 1911 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Cleaner_klass), scan, CHECK);
1912 InstanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT); 1912 InstanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT);
1913 InstanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK); 1913 InstanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK);
1914 InstanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL); 1914 InstanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL);
1915 InstanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM); 1915 InstanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM);
1916 InstanceKlass::cast(WK_KLASS(Cleaner_klass))->set_reference_type(REF_CLEANER);
1916 1917
1917 // JSR 292 classes 1918 // JSR 292 classes
1918 WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass); 1919 WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass);
1919 WKID jsr292_group_end = WK_KLASS_ENUM_NAME(VolatileCallSite_klass); 1920 WKID jsr292_group_end = WK_KLASS_ENUM_NAME(VolatileCallSite_klass);
1920 initialize_wk_klasses_until(jsr292_group_start, scan, CHECK); 1921 initialize_wk_klasses_until(jsr292_group_start, scan, CHECK);