stacktrace.cc (StackTrace::FillInFrameInfo): Use UNWRAP_FUNCTION_DESCRIPTOR to…

stacktrace.cc (StackTrace::FillInFrameInfo): Use UNWRAP_FUNCTION_DESCRIPTOR to compare frame->start_ip against the...

2006-05-15  Andreas Tobler  <a.tobler@schweiz.ch>

	* stacktrace.cc (StackTrace::FillInFrameInfo): Use
	UNWRAP_FUNCTION_DESCRIPTOR to compare frame->start_ip against the
	klass->methods[j].ncode.

From-SVN: r113801

libjava/ChangeLog

+2006-05-15  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* stacktrace.cc (StackTrace::FillInFrameInfo): Use
+	UNWRAP_FUNCTION_DESCRIPTOR to compare frame->start_ip against the
+	klass->methods[j].ncode.
+
 2006-05-13  Tom Tromey  <tromey@redhat.com>
 
 	* sources.am, Makefile.in: Rebuilt.
@@ -91,7 +97,7 @@
 	* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Add check for
 	HP-UX and add appropriate extension for shared libraries, sl.
 	(gcj_jni_test_one): Likewise.
-	
+
 	* testsuite/lib/libjava.exp (libjava_find_lib): Add sl to the shared
 	library extensions.
 

libjava/stacktrace.cc

 // stacktrace.cc - Functions for unwinding & inspecting the call stack.
 
-/* Copyright (C) 2005  Free Software Foundation
+/* Copyright (C) 2005, 2006  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -243,7 +243,8 @@ _Jv_StackTrace::FillInFrameInfo (_Jv_StackFrame *frame)
 	// Find method in class
 	for (int j = 0; j < klass->method_count; j++)
 	  {
-	    if (klass->methods[j].ncode == frame->start_ip)
+	    void *wncode UNWRAP_FUNCTION_DESCRIPTOR (klass->methods[j].ncode);
+	    if (wncode == frame->start_ip)
 	      {
 		meth = &klass->methods[j];
 		break;