*** old/src/share/vm/opto/stringopts.cpp	Thu Feb  4 13:44:51 2010
--- new/src/share/vm/opto/stringopts.cpp	Thu Feb  4 13:44:51 2010

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright 2009-2010 Sun Microsystems, Inc.  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.

*** 1071,1081 ****
--- 1071,1081 ----
      Node *mem = PhiNode::make(head, kit.memory(char_adr_idx), Type::MEMORY, TypeAryPtr::CHARS);
      kit.gvn().set_type(mem, Type::MEMORY);
      kit.set_control(head);
      kit.set_memory(mem, char_adr_idx);
  
!     Node* q = __ DivI(kit.null(), i_phi, __ intcon(10));
!     Node* q = __ DivI(NULL, i_phi, __ intcon(10));
      Node* r = __ SubI(i_phi, __ AddI(__ LShiftI(q, __ intcon(3)),
                                       __ LShiftI(q, __ intcon(1))));
      Node* m1 = __ SubI(charPos, __ intcon(1));
      Node* ch = __ AddI(r, __ intcon('0'));
  

*** 1268,1285 ****
--- 1268,1286 ----
          } else if (!type->higher_equal(TypeInstPtr::NOTNULL)) {
            // s = s != null ? s : "null";
            // length = length + (s.count - s.offset);
            RegionNode *r = new (C, 3) RegionNode(3);
            kit.gvn().set_type(r, Type::CONTROL);
-           Node *phi = new (C, 3) PhiNode(r, type->join(TypeInstPtr::NOTNULL));
            kit.gvn().set_type(phi, phi->bottom_type());
            Node* p = __ Bool(__ CmpP(arg, kit.null()), BoolTest::ne);
            IfNode* iff = kit.create_and_map_if(kit.control(), p, PROB_MIN, COUNT_UNKNOWN);
            Node* notnull = __ IfTrue(iff);
            Node* isnull =  __ IfFalse(iff);
+           kit.set_control(notnull); // set control for the cast_not_null
            r->init_req(1, notnull);
!           phi->init_req(1, kit.cast_not_null(arg, false));
            r->init_req(2, isnull);
            phi->init_req(2, null_string);
            kit.set_control(r);
            C->record_for_igvn(r);
            C->record_for_igvn(phi);