Mercurial > hg > truffle
diff src/share/vm/opto/escape.cpp @ 13086:096c224171c4
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 20 Nov 2013 00:10:38 +0100 |
parents | 6171eb9da4fd |
children | 3e98456aab94 |
line wrap: on
line diff
--- a/src/share/vm/opto/escape.cpp Tue Nov 19 17:44:26 2013 +0100 +++ b/src/share/vm/opto/escape.cpp Wed Nov 20 00:10:38 2013 +0100 @@ -780,6 +780,7 @@ } } else { // Allocate instance if (cik->is_subclass_of(_compile->env()->Thread_klass()) || + cik->is_subclass_of(_compile->env()->Reference_klass()) || !cik->is_instance_klass() || // StressReflectiveCode cik->as_instance_klass()->has_finalizer()) { es = PointsToNode::GlobalEscape;