Mercurial > hg > truffle

changeset 1099:c5d3d979ae27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6908167: jbb2005, OptimizeStringConcat causes assert in EA Reviewed-by: kvn
author never
date Tue, 08 Dec 2009 16:27:21 -0800
parents 8b22f86d1740
children f96a1a986f7b
files src/share/vm/opto/graphKit.cpp
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/graphKit.cpp	Wed Dec 02 13:29:00 2009 -0800
+++ b/src/share/vm/opto/graphKit.cpp	Tue Dec 08 16:27:21 2009 -0800
@@ -1714,6 +1714,11 @@
     C->gvn_replace_by(callprojs.catchall_catchproj, C->top());
     C->gvn_replace_by(callprojs.catchall_memproj,   C->top());
     C->gvn_replace_by(callprojs.catchall_ioproj,    C->top());
+
+    // Replace the old exception object with top
+    if (callprojs.exobj != NULL) {
+      C->gvn_replace_by(callprojs.exobj, C->top());
+    }
   } else {
     GraphKit ekit(ejvms);