Mercurial > hg > truffle

changeset 20230:f619b069f2ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author drchase
date Thu, 24 Jul 2014 18:46:55 +0000
parents 55fbdf0799ae (diff) f72d8917322a (current diff)
children f0afba33c928
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/multnode.cpp	Fri Jul 18 09:04:01 2014 +0200
+++ b/src/share/vm/opto/multnode.cpp	Thu Jul 24 18:46:55 2014 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -194,7 +194,9 @@
     }
   }
 
-  ProjNode* other_proj = iff->proj_out(1-_con)->as_Proj();
+  ProjNode* other_proj = iff->proj_out(1-_con);
+  if (other_proj == NULL) // Should never happen, but make Parfait happy.
+      return false;
   if (other_proj->is_uncommon_trap_proj(reason)) {
     assert(reason == Deoptimization::Reason_none ||
            Compile::current()->is_predicate_opaq(iff->in(1)->in(1)), "should be on the list");