This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: Fix MethodRef.h breakage.
- From: Bryce McKinlay <mckinlay at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: Thu, 10 Mar 2005 23:34:28 -0500
- Subject: Patch: FYI: Fix MethodRef.h breakage.
- References: <20050310223007.5445315FD6B78@gcc-regress.apple.com> <b3b0ea80675a17b9e698435e1da842ad@physics.uc.edu>
This patch cleans up some fallout from the stack trace patch. Not sure
how I managed to miss this in testing - doh!
Bryce
2005-03-10 Bryce McKinlay <mckinlay@redhat.com>
* exception.cc: Remove stray MethodRef.h include.
* java/lang/natClass.cc: Likewise.
* gnu/gcj/runtime/MethodRef.java: Removed.
* gnu/gcj/runtime/StackTrace.java,
gnu/gcj/runtime/natNameFinder.cc,
gnu/gcj/runtime/natStackTrace.cc: Really removed.
* java/lang/natRuntime.cc (_load): Remove unsed variable.
* Makefile.am (ordinary_java_source_files): Remove
MethodRef.java.
* Makefile.in: Rebuilt.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.459
diff -u -r1.459 Makefile.am
--- Makefile.am 10 Mar 2005 23:40:15 -0000 1.459
+++ Makefile.am 11 Mar 2005 04:23:56 -0000
@@ -2903,7 +2903,6 @@
gnu/gcj/runtime/FileDeleter.java \
gnu/gcj/runtime/FinalizerThread.java \
gnu/gcj/runtime/JNIWeakRef.java \
-gnu/gcj/runtime/MethodRef.java \
gnu/gcj/runtime/NameFinder.java \
gnu/gcj/runtime/PersistentByteMap.java \
gnu/gcj/runtime/SharedLibHelper.java \
Index: exception.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/exception.cc,v
retrieving revision 1.25
diff -u -r1.25 exception.cc
--- exception.cc 10 Mar 2005 19:02:16 -0000 1.25
+++ exception.cc 11 Mar 2005 04:23:57 -0000
@@ -15,7 +15,6 @@
#include <java/lang/Class.h>
#include <java/lang/NullPointerException.h>
-#include <gnu/gcj/runtime/MethodRef.h>
#include <gnu/gcj/RawData.h>
#include <gcj/cni.h>
#include <jvm.h>
Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/natClass.cc,v
retrieving revision 1.85
diff -u -r1.85 natClass.cc
--- java/lang/natClass.cc 10 Mar 2005 19:02:19 -0000 1.85
+++ java/lang/natClass.cc 11 Mar 2005 04:23:57 -0000
@@ -54,7 +54,6 @@
#include <java/lang/StringBuffer.h>
#include <java/lang/VMClassLoader.h>
#include <gcj/method.h>
-#include <gnu/gcj/runtime/MethodRef.h>
#include <gnu/gcj/RawData.h>
#include <java/lang/VerifyError.h>
Index: java/lang/natRuntime.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/natRuntime.cc,v
retrieving revision 1.49
diff -u -r1.49 natRuntime.cc
--- java/lang/natRuntime.cc 10 Mar 2005 19:02:20 -0000 1.49
+++ java/lang/natRuntime.cc 11 Mar 2005 04:24:00 -0000
@@ -162,7 +162,6 @@
if (do_search)
{
- ClassLoader *sys = ClassLoader::systemClassLoader;
ClassLoader *look = _Jv_StackTrace::GetFirstNonSystemClassLoader
();
if (look != NULL)
On 10-Mar-05, at 6:28 PM, Andrew Pinski wrote:
This was caused by:
--- /Users/regress/tbox/changelog_mail/gcc/libjava/ChangeLog Wed Mar
9 22:31:48 2005
+++ gcc/libjava/ChangeLog Thu Mar 10 11:10:40 2005
@@ -1,3 +1,104 @@
+2005-03-10 Bryce McKinlay <mckinlay@redhat.com>
+
+ New Stack Trace infrastructure.
+ * Makefile.am (libgcj0_convenience_la_SOURCES): Add stacktrace.cc.
+ (gnu/gcj/runtime/StackTrace.lo): Removed.
+ (ordinary_java_source_files): Remove obsolete files.
+ (nat_source_files): Remove obsolete files. Add natVMThrowable.cc.
+ * configure.host (fallback_backtrace_h): Set backtrace header
+ for mingw and cygwin targets.
+ * configure.ac: Make symlink for fallback backtrace headers.
+ * Makefile.in, configure: Rebuilt.
+ * defineclass.cc (_Jv_ClassReader::read_one_code_attribute):
+ Read 'LineNumberTable' attribute.
+ (_Jv_ClassReader::read_one_class_attribute): Read 'SourceFile'
+ attribute.
gnu/gcj/runtime/MethodRef.h is no longer produced but still referenced
-- Pinski