Mercurial > hg > truffle

diff src/cpu/x86/vm/x86_32.ad @ 12873:4e7f99b70d9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author adlertz
date Wed, 09 Oct 2013 05:03:34 -0700
parents 268e7a2178d7
children 59e8ad757e19
line wrap: on
line diff
--- a/src/cpu/x86/vm/x86_32.ad	Wed Oct 09 13:00:20 2013 +0200
+++ b/src/cpu/x86/vm/x86_32.ad	Wed Oct 09 05:03:34 2013 -0700
@@ -351,7 +351,7 @@
         int format) {
 #ifdef ASSERT
   if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) {
-    assert(oop(d32)->is_oop() && (ScavengeRootsInCode || !oop(d32)->is_scavengable()), "cannot embed scavengable oops in code");
+    assert(cast_to_oop(d32)->is_oop() && (ScavengeRootsInCode || !cast_to_oop(d32)->is_scavengable()), "cannot embed scavengable oops in code");
   }
 #endif
   cbuf.relocate(cbuf.insts_mark(), rspec, format);