Mercurial > hg > graal-compiler
comparison src/share/vm/classfile/systemDictionary.hpp @ 21561:ce2113326bc8
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 28 May 2015 17:13:22 +0200 |
parents | be896a1983c0 5cbaf1e9ff2e |
children | 4c146c9367b6 |
comparison
equal
deleted
inserted
replaced
21560:a9fba0dfb155 | 21561:ce2113326bc8 |
---|---|
222 JVMCI_ONLY(do_klass(Assumptions_CallSiteTargetValue_klass, com_oracle_jvmci_meta_Assumptions_CallSiteTargetValue, Jvmci)) \ | 222 JVMCI_ONLY(do_klass(Assumptions_CallSiteTargetValue_klass, com_oracle_jvmci_meta_Assumptions_CallSiteTargetValue, Jvmci)) \ |
223 JVMCI_ONLY(do_klass(BytecodePosition_klass, com_oracle_jvmci_code_BytecodePosition, Jvmci)) \ | 223 JVMCI_ONLY(do_klass(BytecodePosition_klass, com_oracle_jvmci_code_BytecodePosition, Jvmci)) \ |
224 JVMCI_ONLY(do_klass(DebugInfo_klass, com_oracle_jvmci_code_DebugInfo, Jvmci)) \ | 224 JVMCI_ONLY(do_klass(DebugInfo_klass, com_oracle_jvmci_code_DebugInfo, Jvmci)) \ |
225 JVMCI_ONLY(do_klass(RegisterSaveLayout_klass, com_oracle_jvmci_code_RegisterSaveLayout, Jvmci)) \ | 225 JVMCI_ONLY(do_klass(RegisterSaveLayout_klass, com_oracle_jvmci_code_RegisterSaveLayout, Jvmci)) \ |
226 JVMCI_ONLY(do_klass(BytecodeFrame_klass, com_oracle_jvmci_code_BytecodeFrame, Jvmci)) \ | 226 JVMCI_ONLY(do_klass(BytecodeFrame_klass, com_oracle_jvmci_code_BytecodeFrame, Jvmci)) \ |
227 JVMCI_ONLY(do_klass(CompilationResult_klass, com_oracle_jvmci_code_CompilationResult, Jvmci)) \ | |
228 JVMCI_ONLY(do_klass(CompilationResult_Call_klass, com_oracle_jvmci_code_CompilationResult_Call, Jvmci)) \ | 227 JVMCI_ONLY(do_klass(CompilationResult_Call_klass, com_oracle_jvmci_code_CompilationResult_Call, Jvmci)) \ |
229 JVMCI_ONLY(do_klass(CompilationResult_ConstantReference_klass, com_oracle_jvmci_code_CompilationResult_ConstantReference, Jvmci)) \ | 228 JVMCI_ONLY(do_klass(CompilationResult_ConstantReference_klass, com_oracle_jvmci_code_CompilationResult_ConstantReference, Jvmci)) \ |
230 JVMCI_ONLY(do_klass(CompilationResult_DataPatch_klass, com_oracle_jvmci_code_CompilationResult_DataPatch, Jvmci)) \ | 229 JVMCI_ONLY(do_klass(CompilationResult_DataPatch_klass, com_oracle_jvmci_code_CompilationResult_DataPatch, Jvmci)) \ |
231 JVMCI_ONLY(do_klass(CompilationResult_DataSectionReference_klass, com_oracle_jvmci_code_CompilationResult_DataSectionReference, Jvmci)) \ | 230 JVMCI_ONLY(do_klass(CompilationResult_DataSectionReference_klass, com_oracle_jvmci_code_CompilationResult_DataSectionReference, Jvmci)) \ |
232 JVMCI_ONLY(do_klass(CompilationResult_ExceptionHandler_klass, com_oracle_jvmci_code_CompilationResult_ExceptionHandler, Jvmci))\ | 231 JVMCI_ONLY(do_klass(CompilationResult_ExceptionHandler_klass, com_oracle_jvmci_code_CompilationResult_ExceptionHandler, Jvmci))\ |