Mercurial > hg > graal-compiler
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/compiler/compileBroker.cpp Fri Apr 12 11:24:56 2013 +0200 +++ b/src/share/vm/compiler/compileBroker.cpp Fri Apr 12 14:05:42 2013 +0200 @@ -1226,11 +1226,8 @@ assert(osr_bci == InvocationEntryBci || (0 <= osr_bci && osr_bci < method->code_size()), "bci out of range"); assert(!method->is_abstract() && (osr_bci == InvocationEntryBci || !method->is_native()), "cannot compile abstract/native methods"); assert(!method->method_holder()->is_not_initialized() || method->intrinsic_id() == vmIntrinsics::_CompilerToVMImpl_executeCompiledMethod, "method holder must be initialized"); - - if (!TieredCompilation) { - comp_level = CompLevel_highest_tier; - } - + // allow any levels for WhiteBox + assert(WhiteBoxAPI || TieredCompilation || comp_level == CompLevel_highest_tier, "only CompLevel_highest_tier must be used in non-tiered"); // return quickly if possible // lock, make sure that the compilation