Mercurial > hg > truffle
comparison src/share/vm/opto/multnode.cpp @ 14726:92aa6797d639
Backed out merge changeset: b51e29501f30
Backed out merge revision to its first parent (8f483e200405)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 24 Mar 2014 21:30:43 +0100 |
parents | de9cd35a3d1f |
children |
comparison
equal
deleted
inserted
replaced
14719:0bdd0d157040 | 14726:92aa6797d639 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
192 iff->in(1)->in(1)->Opcode() != Op_Opaque1) { | 192 iff->in(1)->in(1)->Opcode() != Op_Opaque1) { |
193 return false; | 193 return false; |
194 } | 194 } |
195 } | 195 } |
196 | 196 |
197 ProjNode* other_proj = iff->proj_out(1-_con); | 197 ProjNode* other_proj = iff->proj_out(1-_con)->as_Proj(); |
198 if (other_proj == NULL) // Should never happen, but make Parfait happy. | |
199 return false; | |
200 if (other_proj->is_uncommon_trap_proj(reason)) { | 198 if (other_proj->is_uncommon_trap_proj(reason)) { |
201 assert(reason == Deoptimization::Reason_none || | 199 assert(reason == Deoptimization::Reason_none || |
202 Compile::current()->is_predicate_opaq(iff->in(1)->in(1)), "should be on the list"); | 200 Compile::current()->is_predicate_opaq(iff->in(1)->in(1)), "should be on the list"); |
203 return true; | 201 return true; |
204 } | 202 } |