Mercurial > hg > graal-jvmci-8
comparison src/share/vm/classfile/systemDictionary.hpp @ 13404:2315fab779ca
Merge
author | drchase |
---|---|
date | Fri, 29 Nov 2013 11:32:45 -0500 |
parents | 86e6d691f2e1 9d15b81d5d1b |
children | 02f27ecb4f3a 48314d596a04 |
comparison
equal
deleted
inserted
replaced
13402:e567d5afd4dd | 13404:2315fab779ca |
---|---|
163 do_klass(VolatileCallSite_klass, java_lang_invoke_VolatileCallSite, Pre_JSR292 ) \ | 163 do_klass(VolatileCallSite_klass, java_lang_invoke_VolatileCallSite, Pre_JSR292 ) \ |
164 /* Note: MethodHandle must be first, and VolatileCallSite last in group */ \ | 164 /* Note: MethodHandle must be first, and VolatileCallSite last in group */ \ |
165 \ | 165 \ |
166 do_klass(StringBuffer_klass, java_lang_StringBuffer, Pre ) \ | 166 do_klass(StringBuffer_klass, java_lang_StringBuffer, Pre ) \ |
167 do_klass(StringBuilder_klass, java_lang_StringBuilder, Pre ) \ | 167 do_klass(StringBuilder_klass, java_lang_StringBuilder, Pre ) \ |
168 do_klass(misc_Unsafe_klass, sun_misc_Unsafe, Pre ) \ | |
168 \ | 169 \ |
169 /* It's NULL in non-1.4 JDKs. */ \ | 170 /* It's NULL in non-1.4 JDKs. */ \ |
170 do_klass(StackTraceElement_klass, java_lang_StackTraceElement, Opt ) \ | 171 do_klass(StackTraceElement_klass, java_lang_StackTraceElement, Opt ) \ |
171 /* 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. */ \ |
172 /* 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. */ \ |