Mercurial > hg > graal-compiler

diff src/share/vm/opto/gcm.cpp @ 2008:2f644f85485d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6961690: load oops from constant table on SPARC Summary: oops should be loaded from the constant table of an nmethod instead of materializing them with a long code sequence. Reviewed-by: never, kvn
author twisti
date Fri, 03 Dec 2010 01:34:31 -0800
parents f95d63e2154a
children b92c45f2bc75
line wrap: on
line diff
--- a/src/share/vm/opto/gcm.cpp	Thu Dec 02 17:21:12 2010 -0800
+++ b/src/share/vm/opto/gcm.cpp	Fri Dec 03 01:34:31 2010 -0800
@@ -89,7 +89,7 @@
   assert(in0 != NULL, "Only control-dependent");
   const Node *p = in0->is_block_proj();
   if (p != NULL && p != n) {    // Control from a block projection?
-    assert(!n->pinned() || n->is_SafePointScalarObject(), "only SafePointScalarObject pinned node is expected here");
+    assert(!n->pinned() || n->is_MachConstantBase() || n->is_SafePointScalarObject(), "only pinned MachConstantBase or SafePointScalarObject node is expected here");
     // Find trailing Region
     Block *pb = _bbs[in0->_idx]; // Block-projection already has basic block
     uint j = 0;