Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/opto/multnode.cpp	Thu Jul 17 10:21:31 2014 +0200
     1.2 +++ b/src/share/vm/opto/multnode.cpp	Tue Mar 11 13:38:32 2014 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -194,7 +194,9 @@
    1.11      }
    1.12    }
    1.13  
    1.14 -  ProjNode* other_proj = iff->proj_out(1-_con)->as_Proj();
    1.15 +  ProjNode* other_proj = iff->proj_out(1-_con);
    1.16 +  if (other_proj == NULL) // Should never happen, but make Parfait happy.
    1.17 +      return false;
    1.18    if (other_proj->is_uncommon_trap_proj(reason)) {
    1.19      assert(reason == Deoptimization::Reason_none ||
    1.20             Compile::current()->is_predicate_opaq(iff->in(1)->in(1)), "should be on the list");