Merge
authordrchase
Tue, 11 Mar 2014 10:59:26 -0700
changeset 23218 71c4e6b29c5d
parent 23217 35c6db6d3575 (diff)
parent 23216 2f5c20eb1dc1 (current diff)
child 23219 69e72eaf9f51
Merge
--- a/hotspot/src/share/vm/opto/multnode.cpp	Tue Mar 11 11:26:14 2014 -0400
+++ b/hotspot/src/share/vm/opto/multnode.cpp	Tue Mar 11 10:59:26 2014 -0700
@@ -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");