comparison src/share/vm/compiler/compileBroker.cpp @ 9088:89e4d67fdd2a

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 12 Apr 2013 14:05:42 +0200
parents 22851e342f0e b84fd7d73702
children a323a9e20f9d
comparison
equal deleted inserted replaced
9037:b008f40b67d0 9088:89e4d67fdd2a
1224 // make sure arguments make sense 1224 // make sure arguments make sense
1225 assert(method->method_holder()->oop_is_instance(), "not an instance method"); 1225 assert(method->method_holder()->oop_is_instance(), "not an instance method");
1226 assert(osr_bci == InvocationEntryBci || (0 <= osr_bci && osr_bci < method->code_size()), "bci out of range"); 1226 assert(osr_bci == InvocationEntryBci || (0 <= osr_bci && osr_bci < method->code_size()), "bci out of range");
1227 assert(!method->is_abstract() && (osr_bci == InvocationEntryBci || !method->is_native()), "cannot compile abstract/native methods"); 1227 assert(!method->is_abstract() && (osr_bci == InvocationEntryBci || !method->is_native()), "cannot compile abstract/native methods");
1228 assert(!method->method_holder()->is_not_initialized() || method->intrinsic_id() == vmIntrinsics::_CompilerToVMImpl_executeCompiledMethod, "method holder must be initialized"); 1228 assert(!method->method_holder()->is_not_initialized() || method->intrinsic_id() == vmIntrinsics::_CompilerToVMImpl_executeCompiledMethod, "method holder must be initialized");
1229 1229 // allow any levels for WhiteBox
1230 if (!TieredCompilation) { 1230 assert(WhiteBoxAPI || TieredCompilation || comp_level == CompLevel_highest_tier, "only CompLevel_highest_tier must be used in non-tiered");
1231 comp_level = CompLevel_highest_tier;
1232 }
1233
1234 // return quickly if possible 1231 // return quickly if possible
1235 1232
1236 // lock, make sure that the compilation 1233 // lock, make sure that the compilation
1237 // isn't prohibited in a straightforward way. 1234 // isn't prohibited in a straightforward way.
1238 AbstractCompiler *comp = CompileBroker::compiler(comp_level); 1235 AbstractCompiler *comp = CompileBroker::compiler(comp_level);