hg: jdk7/hotspot-comp/hotspot: 6965815: OptimizeStringConcat: assert(!q->is_MergeMem()) failed with specjbb2000

[tom.rodriguez at oracle.com]

Changeset: f9883ee8ce39
Author:    never
Date:      2010-09-08 20:28 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot-comp/hotspot/rev/f9883ee8ce39

6965815: OptimizeStringConcat: assert(!q->is_MergeMem()) failed with specjbb2000
Reviewed-by: kvn

! src/share/vm/opto/graphKit.cpp