Mercurial > hg > truffle
diff src/share/vm/graal/graalCodeInstaller.cpp @ 7070:c2a3b92c9e79
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Mon, 26 Nov 2012 10:57:02 +0100 |
parents | 263bc2349f15 17eeac928874 |
children | 3e61ffb9ce29 |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp Mon Nov 26 10:51:39 2012 +0100 +++ b/src/share/vm/graal/graalCodeInstaller.cpp Mon Nov 26 10:57:02 2012 +0100 @@ -625,14 +625,13 @@ TRACE_graal_3("relocating (stub) at %p", inst); } else { // method != NULL assert(hotspot_method != NULL, "unexpected JavaMethod"); - assert(debug_info != NULL, "debug info expected"); - +#ifdef ASSERT Method* method = NULL; // we need to check, this might also be an unresolved method if (hotspot_method->is_a(HotSpotResolvedJavaMethod::klass())) { method = getMethodFromHotSpotMethod(hotspot_method); } - +#endif assert(debug_info != NULL, "debug info expected"); TRACE_graal_3("method call");