Mercurial > hg > truffle
diff src/share/vm/opto/gcm.cpp @ 2014:4de5f4101cfd
Merge
author | iveresov |
---|---|
date | Wed, 08 Dec 2010 17:50:49 -0800 |
parents | 2f644f85485d |
children | b92c45f2bc75 |
line wrap: on
line diff
--- a/src/share/vm/opto/gcm.cpp Wed Dec 08 04:50:35 2010 -0800 +++ b/src/share/vm/opto/gcm.cpp Wed Dec 08 17:50:49 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;