gcc/java

	PR java/29013:
	* jcf-write.c (generate_bytecode_insns) <CALL_EXPR>: Always note
	the push of the called method's return result.
libjava
	PR java/29013:
	* testsuite/libjava.lang/PR29013.out: Likewise.
	* testsuite/libjava.lang/PR29013.java: New file.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116902 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/java/ChangeLog

@@ -1,3 +1,9 @@
+2006-09-12  Tom Tromey  <[email protected]>
+
+	PR java/29013:
+	* jcf-write.c (generate_bytecode_insns) <CALL_EXPR>: Always note
+	the push of the called method's return result.
+
 2006-09-12  Tom Tromey  <[email protected]>
 
 	* jvspec.c (lang_specific_driver): Read spec file even if

gcc/java/jcf-write.c

@@ -2651,10 +2651,14 @@ generate_bytecode_insns (tree exp, int target, struct jcf_partial *state)
 	    if (TREE_CODE (f) != VOID_TYPE)
 	      {
 		int size = TYPE_IS_WIDE (f) ? 2 : 1;
+		/* Always note the push here, so that we correctly
+		   compute the required maximum stack size.  */
+		NOTE_PUSH (size);
 		if (target == IGNORE_TARGET)
-		  emit_pop (size, state);
-		else
-		  NOTE_PUSH (size);
+		  {
+		    emit_pop (size, state);
+		    NOTE_POP (size);
+		  }
 	      }
 	    break;
 	  }

libjava/ChangeLog

@@ -1,3 +1,9 @@
+2006-09-12  Tom Tromey  <[email protected]>
+
+	PR java/29013:
+	* testsuite/libjava.lang/PR29013.out: Likewise.
+	* testsuite/libjava.lang/PR29013.java: New file.
+
 2006-09-12  Tom Tromey  <[email protected]>
 
 	* testsuite/libjava.jacks/jacks.exp (load_gcc_lib): Removed.

libjava/testsuite/libjava.lang/PR29013.java

@@ -0,0 +1,9 @@
+public class PR29013 {
+  public static int result() { return 5; }
+
+  public static void computeResult() { result(); }
+
+  public static void main(String[] args) {
+    computeResult();
+  }
+}