Mercurial > hg > truffle
changeset 7773:f1f4fc5a609f
Merge.
| author | Roland Schatz <roland.schatz@oracle.com> |
|---|---|
| date | Mon, 11 Feb 2013 17:47:21 +0100 |
| parents | 62bcf515831d (diff) f0aa36715f35 (current diff) |
| children | b4e4501bfa7a |
| files | graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BooleanNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LogicNode.java |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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; } }
--- 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();