Mercurial > hg > truffle

changeset 14691:a23a5456416b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author drchase
date Tue, 11 Mar 2014 10:59:26 -0700
parents de9cd35a3d1f (diff) 3596c63bf3d6 (current diff)
children 8504393de66b
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/multnode.cpp	Tue Mar 11 11:26:14 2014 -0400
+++ b/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");