*** old/src/share/vm/opto/gcm.cpp	Thu Nov 18 08:15:03 2010
--- new/src/share/vm/opto/gcm.cpp	Thu Nov 18 08:15:03 2010

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 64,74 ****
--- 64,74 ----
  void PhaseCFG::replace_block_proj_ctrl( Node *n ) {
    const Node *in0 = n->in(0);
    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;
      if (pb->_num_succs != 1) {  // More then 1 successor?
        // Search for successor