Mercurial > hg > truffle
changeset 2344:8a3f8defe568
7019165: Incorrect symbols in pstack output after SymbolTable changes
Summary: And out lsb which is set for symbols in constant pool slots to distinguish them from strings
Reviewed-by: phh, dholmes, never, dcubed
| author | coleenp |
|---|---|
| date | Wed, 16 Mar 2011 14:57:49 -0400 |
| parents | 65f880e2869b |
| children | 2074c95f707e |
| files | src/os/solaris/dtrace/libjvm_db.c |
| diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/solaris/dtrace/libjvm_db.c Tue Mar 15 06:50:01 2011 -0700 +++ b/src/os/solaris/dtrace/libjvm_db.c Wed Mar 16 14:57:49 2011 -0400 @@ -524,6 +524,8 @@ CHECK_FAIL(err); err = read_pointer(J, constantPool + nameIndex * POINTER_SIZE + SIZE_constantPoolOopDesc, &nameSymbol); CHECK_FAIL(err); + // The symbol is a CPSlot and has lower bit set to indicate metadata + nameSymbol &= (~1); // remove metadata lsb err = ps_pread(J->P, nameSymbol + OFFSET_Symbol_length, &nameSymbolLength, 2); CHECK_FAIL(err); nameString = (char*)calloc(nameSymbolLength + 1, 1); @@ -535,6 +537,7 @@ CHECK_FAIL(err); err = read_pointer(J, constantPool + signatureIndex * POINTER_SIZE + SIZE_constantPoolOopDesc, &signatureSymbol); CHECK_FAIL(err); + signatureSymbol &= (~1); // remove metadata lsb err = ps_pread(J->P, signatureSymbol + OFFSET_Symbol_length, &signatureSymbolLength, 2); CHECK_FAIL(err); signatureString = (char*)calloc(signatureSymbolLength + 1, 1);