From fdf7376e100ebc133357236325fad6def17e1442 Mon Sep 17 00:00:00 2001
From: sspitsyn <unknown>
Date: Mon, 1 Jul 2013 14:13:12 -0700
Subject: [PATCH] 8009204: [dtrace] signatures returned by Java 7 jstack() are
 corrupted on Solaris Summary: The fix is basically a backport of JDK-7019165
 (pstack issue) to jhelper.d. Reviewed-by: coleenp, sspitsyn Contributed-by:
 tomas.hurka@oracle.com

---
 src/os/solaris/dtrace/jhelper.d | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/os/solaris/dtrace/jhelper.d b/src/os/solaris/dtrace/jhelper.d
index 976a83210..752f5ae53 100644
--- a/src/os/solaris/dtrace/jhelper.d
+++ b/src/os/solaris/dtrace/jhelper.d
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -332,12 +332,15 @@ dtrace:helper:ustack:
 
   this->nameSymbol = copyin_ptr(this->constantPool +
       this->nameIndex * sizeof (pointer) + SIZE_ConstantPool);
+  /* The symbol is a CPSlot and has lower bit set to indicate metadata */
+  this->nameSymbol &= (~1); /* remove metadata lsb */
 
   this->nameSymbolLength = copyin_uint16(this->nameSymbol +
       OFFSET_Symbol_length);
 
   this->signatureSymbol = copyin_ptr(this->constantPool +
       this->signatureIndex * sizeof (pointer) + SIZE_ConstantPool);
+  this->signatureSymbol &= (~1); /* remove metadata lsb */
 
   this->signatureSymbolLength = copyin_uint16(this->signatureSymbol +
       OFFSET_Symbol_length);
-- 
GitLab