# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1360601241 -3600
# Node ID f1f4fc5a609fa4b406e447148296ce82379bcc6f
# Parent  62bcf515831d3f23a7eef5c7c31954cf8d6d9e3c# Parent  f0aa36715f356bf8323d7d9f3447fb673dccd8b0
Merge.

diff -r f0aa36715f35 -r f1f4fc5a609f src/share/vm/graal/graalCodeInstaller.cpp
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Mon Feb 11 16:46:11 2013 +0100
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Mon Feb 11 17:47:21 2013 +0100
@@ -63,6 +63,7 @@
     }
 #endif
     ShouldNotReachHere();
+    return NULL;
   }
 }
 
diff -r f0aa36715f35 -r f1f4fc5a609f src/share/vm/runtime/javaCalls.cpp
--- a/src/share/vm/runtime/javaCalls.cpp	Mon Feb 11 16:46:11 2013 +0100
+++ b/src/share/vm/runtime/javaCalls.cpp	Mon Feb 11 17:47:21 2013 +0100
@@ -365,12 +365,13 @@
   }
   else debug_only(args->verify(method, result->get_type(), thread));
 
+#ifndef GRAAL
   // Ignore call if method is empty
   if (method->is_empty_method()) {
     assert(result->get_type() == T_VOID, "an empty method must return a void value");
     return;
   }
-
+#endif
 
 #ifdef ASSERT
   { InstanceKlass* holder = method->method_holder();