*** old/src/share/vm/opto/callGenerator.cpp	Mon Aug  4 14:31:47 2014
--- new/src/share/vm/opto/callGenerator.cpp	Mon Aug  4 14:31:47 2014

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2000, 2014, 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.

*** 355,365 ****
--- 355,365 ----
      map->init_req(i1, call->in(i1));
    }
  
    // Make sure the state is a MergeMem for parsing.
    if (!map->in(TypeFunc::Memory)->is_MergeMem()) {
-     Node* mem = MergeMemNode::make(C, map->in(TypeFunc::Memory));
      C->initial_gvn()->set_type_bottom(mem);
      map->set_req(TypeFunc::Memory, mem);
    }
  
    uint nargs = method()->arg_size();