Mercurial > hg > graal-jvmci-8
comparison src/share/vm/classfile/systemDictionary.hpp @ 13086:096c224171c4
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 20 Nov 2013 00:10:38 +0100 |
parents | 3cce976666d9 292050e5d5ea |
children | dfb780080923 |
comparison
equal
deleted
inserted
replaced
12782:92b7ec34ddfa | 13086:096c224171c4 |
---|---|
171 do_klass(StackTraceElement_klass, java_lang_StackTraceElement, Opt ) \ | 171 do_klass(StackTraceElement_klass, java_lang_StackTraceElement, Opt ) \ |
172 /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \ | 172 /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \ |
173 /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ | 173 /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ |
174 do_klass(nio_Buffer_klass, java_nio_Buffer, Opt ) \ | 174 do_klass(nio_Buffer_klass, java_nio_Buffer, Opt ) \ |
175 \ | 175 \ |
176 do_klass(PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt ) \ | |
177 \ | |
178 /* Preload boxing klasses */ \ | 176 /* Preload boxing klasses */ \ |
179 do_klass(Boolean_klass, java_lang_Boolean, Pre ) \ | 177 do_klass(Boolean_klass, java_lang_Boolean, Pre ) \ |
180 do_klass(Character_klass, java_lang_Character, Pre ) \ | 178 do_klass(Character_klass, java_lang_Character, Pre ) \ |
181 do_klass(Float_klass, java_lang_Float, Pre ) \ | 179 do_klass(Float_klass, java_lang_Float, Pre ) \ |
182 do_klass(Double_klass, java_lang_Double, Pre ) \ | 180 do_klass(Double_klass, java_lang_Double, Pre ) \ |