[vmkit-commits] [vmkit] r180310 - Chasing bug in exception handling generated code.

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 11:52:56 2013
New Revision: 180310

URL: http://llvm.org/viewvc/llvm-project?rev=180310&view=rev
Log:
Chasing bug in exception handling generated code.
(cherry picked from commit 8dc3b4f61293163e6eaa0f877c8acf9f7520c158)

Modified:
    vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
    vmkit/trunk/tests/ijvm.tests.Runner/src/ijvm/tests/Runner/Runner.java

Modified: vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp?rev=180310&r1=180309&r2=180310&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJIT.cpp Thu Apr 25 11:52:56 2013
@@ -1099,6 +1099,10 @@ llvm::Function* JavaJIT::javaCompile() {
     }
 #endif
 
+    if (compilingMethod->name->compare("ijvm_tests_Runner_loop") == 0) {
+  	  llvmFunction->dump();
+    }
+
   nbHandlers = readExceptionTable(reader, codeLen);
   if (nbHandlers != 0) {
     jmpBuffer = new AllocaInst(ArrayType::get(Type::getInt8Ty(*llvmContext), sizeof(vmkit::ExceptionBuffer)), "", currentBlock);
@@ -1266,9 +1270,6 @@ llvm::Function* JavaJIT::javaCompile() {
     }
   }
  
-  if (compilingMethod->name->compare("ijvm_tests_Runner_loop") == 0) {
-	  llvmFunction->dump();
-  }
   return llvmFunction;
 }
 

Modified: vmkit/trunk/tests/ijvm.tests.Runner/src/ijvm/tests/Runner/Runner.java
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/ijvm.tests.Runner/src/ijvm/tests/Runner/Runner.java?rev=180310&r1=180309&r2=180310&view=diff
==============================================================================
--- vmkit/trunk/tests/ijvm.tests.Runner/src/ijvm/tests/Runner/Runner.java (original)
+++ vmkit/trunk/tests/ijvm.tests.Runner/src/ijvm/tests/Runner/Runner.java Thu Apr 25 11:52:56 2013
@@ -41,14 +41,14 @@ public class Runner
 		System.out.println("Stopped runner thread: " + Thread.currentThread().getName());
 	}
 	
-	void ijvm_tests_Runner_loop(long delay) throws Exception
+	void ijvm_tests_Runner_loop(long delay) throws InterruptedException
 	{
 		synchronized(obj) {
 			iteration(delay);
 		}
 	}
 	
-	void iteration(long delay) throws Exception
+	void iteration(long delay) throws InterruptedException
 	{
 		while (sleeping)
 			obj.wait();