# HG changeset patch # User drchase # Date 1394559512 14400 # Node ID 35c6db6d3575358eedf893071b93564a06141984 # Parent 469fa23da94b3c0cc0ede3df59ba8984e4b3712a 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 diff -r 469fa23da94b -r 35c6db6d3575 hotspot/src/share/vm/opto/multnode.cpp --- 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");