This is the mail archive of the frysk-cvs@sources.redhat.com mailing list for the frysk project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[SCM] master: Work around compiler being too smart and noticing o == null.


The branch, master has been updated
       via  a7b96009e7ad2f2cf0b5c5b1687f8e71de99adac (commit)
       via  870c86d1ce1e4d5383b3a822bc20b6f6b710b77b (commit)
      from  f13cb684cd4a80a3c1080cbc5b2823ba5e4b65d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit a7b96009e7ad2f2cf0b5c5b1687f8e71de99adac
Author: Mark Wielaard <mjw@redhat.com>
Date:   Fri Mar 20 21:17:17 2009 +0100

    Work around compiler being too smart and noticing o == null.

commit 870c86d1ce1e4d5383b3a822bc20b6f6b710b77b
Author: Mark Wielaard <mjw@redhat.com>
Date:   Fri Mar 20 21:14:23 2009 +0100

    * TestDebugInfoStackTrace.java (pushPopAssertions): Initialize line.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/debuginfo/ChangeLog               |    5 +++++
 .../frysk/debuginfo/TestDebugInfoStackTrace.java   |    2 +-
 frysk-core/frysk/pkglibdir/ChangeLog               |    5 +++++
 .../frysk/pkglibdir/FunitSimpleInterfaceTest.java  |    2 ++
 4 files changed, 13 insertions(+), 1 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
index 37736fc..cfcade3 100644
--- a/frysk-core/frysk/debuginfo/ChangeLog
+++ b/frysk-core/frysk/debuginfo/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-20  Mark Wielaard  <mark@klomp.org>
+
+	* TestDebugInfoStackTrace.java (pushPopAssertions): Make sure
+	line is initialized.
+
 2008-06-15  Andrew Cagney  <cagney@redhat.com>
 
 	* gen-type-expect-tests.py (open_file): Use assert, not if/println
diff --git a/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java b/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java
index 35e2737..9f1d953 100644
--- a/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java
+++ b/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java
@@ -500,7 +500,7 @@ public class TestDebugInfoStackTrace
   public void pushPopAssertions ()
   {
     DebugInfoFrame sFrame = DebugInfoStackFactory.createDebugInfoStackTrace(myTask);
-    SourceLocation line = null; 
+    SourceLocation line = sFrame.getLine(); 
     
     if (this.testState == PUSH || this.testState == POP)
       {
diff --git a/frysk-core/frysk/pkglibdir/ChangeLog b/frysk-core/frysk/pkglibdir/ChangeLog
index 0c4b20f..9b88513 100644
--- a/frysk-core/frysk/pkglibdir/ChangeLog
+++ b/frysk-core/frysk/pkglibdir/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-20  Mark Wielaard  <mark@klomp.org>
+
+	* FunitSimpleInterfaceTest.java (main): Work around compiler being
+	too smart...and noticing o == null.
+
 2008-06-17 Teresa Thomas <tthomas@redhat.com>
 
 	* funit-ctypes.c: Write to float_.
diff --git a/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceTest.java b/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceTest.java
index dd2504e..3bb9de4 100644
--- a/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceTest.java
+++ b/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceTest.java
@@ -43,6 +43,8 @@ public class FunitSimpleInterfaceTest implements FunitSimpleInterface{
 	FunitSimpleInterface inter = new FunitSimpleInterfaceTest();
 	// Crash
 	Object o = null;
+        if (o == inter) // Work around compiler being too smart...
+          o = inter;
 	o.toString();
 	inter.simpleMethod();
     }


hooks/post-receive
--
frysk system monitor/debugger


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]