Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/vframe.cpp @ 6275:957c266d8bc5
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 21 Aug 2012 10:39:19 +0200 |
| parents | a6d18567b2ff 1d7922586cf6 |
| children | e522a00b91aa |
comparison
equal
deleted
inserted
replaced
| 5891:fd8832ae511d | 6275:957c266d8bc5 |
|---|---|
| 408 // This is Method.invoke() -- skip it | 408 // This is Method.invoke() -- skip it |
| 409 } else if (use_new_reflection && | 409 } else if (use_new_reflection && |
| 410 Klass::cast(method()->method_holder()) | 410 Klass::cast(method()->method_holder()) |
| 411 ->is_subclass_of(SystemDictionary::reflect_MethodAccessorImpl_klass())) { | 411 ->is_subclass_of(SystemDictionary::reflect_MethodAccessorImpl_klass())) { |
| 412 // This is an auxilary frame -- skip it | 412 // This is an auxilary frame -- skip it |
| 413 } else if (method()->is_method_handle_adapter()) { | 413 } else if (method()->is_method_handle_intrinsic() || |
| 414 // This is an internal adapter frame from the MethodHandleCompiler -- skip it | 414 method()->is_compiled_lambda_form()) { |
| 415 // This is an internal adapter frame for method handles -- skip it | |
| 415 } else { | 416 } else { |
| 416 // This is non-excluded frame, we need to count it against the depth | 417 // This is non-excluded frame, we need to count it against the depth |
| 417 if (depth-- <= 0) { | 418 if (depth-- <= 0) { |
| 418 // we have reached the desired depth, we are done | 419 // we have reached the desired depth, we are done |
| 419 break; | 420 break; |