Mercurial > hg > truffle
comparison src/share/vm/code/debugInfoRec.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 | 51111665eda6 1d7922586cf6 |
children | e522a00b91aa |
comparison
equal
deleted
inserted
replaced
5891:fd8832ae511d | 6275:957c266d8bc5 |
---|---|
319 stream()->write_int(oop_recorder()->find_index(method_enc)); | 319 stream()->write_int(oop_recorder()->find_index(method_enc)); |
320 stream()->write_bci(bci); | 320 stream()->write_bci(bci); |
321 assert(method == NULL || | 321 assert(method == NULL || |
322 (method->is_native() && bci == 0) || | 322 (method->is_native() && bci == 0) || |
323 (!method->is_native() && 0 <= bci && bci < method->code_size()) || | 323 (!method->is_native() && 0 <= bci && bci < method->code_size()) || |
324 bci == -1, "illegal bci"); | 324 (method->is_compiled_lambda_form() && bci == -99) || // this might happen in C1 |
325 assert(methodH.is_null() || | |
326 (methodH->is_native() && bci == 0) || | |
327 (!methodH->is_native() && 0 <= bci && bci < methodH->code_size()) || | |
328 bci == -1, "illegal bci"); | 325 bci == -1, "illegal bci"); |
329 | 326 |
330 // serialize the locals/expressions/monitors | 327 // serialize the locals/expressions/monitors |
331 stream()->write_int((intptr_t) locals); | 328 stream()->write_int((intptr_t) locals); |
332 stream()->write_int((intptr_t) expressions); | 329 stream()->write_int((intptr_t) expressions); |