changeset 23217:35c6db6d3575

8028037: [parfait] warnings from b114 for hotspot.src.share.vm Summary: Insert null check for one warning; other warning handled in parfait config Reviewed-by: kvn
author drchase
date Tue, 11 Mar 2014 13:38:32 -0400
parents 469fa23da94b
children 71c4e6b29c5d
files hotspot/src/share/vm/opto/multnode.cpp
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/opto/multnode.cpp	Mon Mar 10 11:09:02 2014 -0700
+++ b/hotspot/src/share/vm/opto/multnode.cpp	Tue Mar 11 13:38:32 2014 -0400
@@ -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");