Fri, 18 Oct 2013 10:50:17 +0200
8022783: Nashorn test fails with: assert(!def_outside->member(r))
Summary: Enables private copies of inputs for recent spill copies as well
Reviewed-by: kvn, twisti
rbackman@5791 | 1 | /* |
rbackman@5791 | 2 | * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. |
rbackman@5791 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
rbackman@5791 | 4 | * |
rbackman@5791 | 5 | * This code is free software; you can redistribute it and/or modify it |
rbackman@5791 | 6 | * under the terms of the GNU General Public License version 2 only, as |
rbackman@5791 | 7 | * published by the Free Software Foundation. |
rbackman@5791 | 8 | * |
rbackman@5791 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
rbackman@5791 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
rbackman@5791 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
rbackman@5791 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
rbackman@5791 | 13 | * accompanied this code). |
rbackman@5791 | 14 | * |
rbackman@5791 | 15 | * You should have received a copy of the GNU General Public License version |
rbackman@5791 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
rbackman@5791 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
rbackman@5791 | 18 | * |
rbackman@5791 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
rbackman@5791 | 20 | * or visit www.oracle.com if you need additional information or have any |
rbackman@5791 | 21 | * questions. |
rbackman@5791 | 22 | * |
rbackman@5791 | 23 | */ |
rbackman@5791 | 24 | |
rbackman@5791 | 25 | #include "precompiled.hpp" |
rbackman@5791 | 26 | #include "memory/allocation.inline.hpp" |
rbackman@5791 | 27 | #include "opto/addnode.hpp" |
rbackman@5927 | 28 | #include "opto/cfgnode.hpp" |
rbackman@5791 | 29 | #include "opto/machnode.hpp" |
rbackman@5927 | 30 | #include "opto/matcher.hpp" |
rbackman@5791 | 31 | #include "opto/mathexactnode.hpp" |
rbackman@5791 | 32 | #include "opto/subnode.hpp" |
rbackman@5791 | 33 | |
rbackman@5791 | 34 | MathExactNode::MathExactNode(Node* ctrl, Node* n1, Node* n2) : MultiNode(3) { |
rbackman@5791 | 35 | init_req(0, ctrl); |
rbackman@5791 | 36 | init_req(1, n1); |
rbackman@5791 | 37 | init_req(2, n2); |
rbackman@5791 | 38 | } |
rbackman@5791 | 39 | |
rbackman@5927 | 40 | BoolNode* MathExactNode::bool_node() const { |
rbackman@5927 | 41 | Node* flags = flags_node(); |
rbackman@5927 | 42 | BoolNode* boolnode = flags->unique_out()->as_Bool(); |
rbackman@5927 | 43 | assert(boolnode != NULL, "must have BoolNode"); |
rbackman@5927 | 44 | return boolnode; |
rbackman@5927 | 45 | } |
rbackman@5927 | 46 | |
rbackman@5927 | 47 | IfNode* MathExactNode::if_node() const { |
rbackman@5927 | 48 | BoolNode* boolnode = bool_node(); |
rbackman@5927 | 49 | IfNode* ifnode = boolnode->unique_out()->as_If(); |
rbackman@5927 | 50 | assert(ifnode != NULL, "must have IfNode"); |
rbackman@5927 | 51 | return ifnode; |
rbackman@5927 | 52 | } |
rbackman@5927 | 53 | |
rbackman@5927 | 54 | Node* MathExactNode::control_node() const { |
rbackman@5927 | 55 | IfNode* ifnode = if_node(); |
rbackman@5927 | 56 | return ifnode->in(0); |
rbackman@5927 | 57 | } |
rbackman@5927 | 58 | |
rbackman@5927 | 59 | Node* MathExactNode::non_throwing_branch() const { |
rbackman@5927 | 60 | IfNode* ifnode = if_node(); |
rbackman@5927 | 61 | if (bool_node()->_test._test == BoolTest::overflow) { |
rbackman@5927 | 62 | return ifnode->proj_out(0); |
rbackman@5927 | 63 | } |
rbackman@5927 | 64 | return ifnode->proj_out(1); |
rbackman@5927 | 65 | } |
rbackman@5927 | 66 | |
rbackman@5791 | 67 | Node* AddExactINode::match(const ProjNode* proj, const Matcher* m) { |
rbackman@5791 | 68 | uint ideal_reg = proj->ideal_reg(); |
rbackman@5791 | 69 | RegMask rm; |
rbackman@5791 | 70 | if (proj->_con == result_proj_node) { |
rbackman@5791 | 71 | rm = m->mathExactI_result_proj_mask(); |
rbackman@5791 | 72 | } else { |
rbackman@5791 | 73 | assert(proj->_con == flags_proj_node, "must be result or flags"); |
rbackman@5791 | 74 | assert(ideal_reg == Op_RegFlags, "sanity"); |
rbackman@5791 | 75 | rm = m->mathExactI_flags_proj_mask(); |
rbackman@5791 | 76 | } |
rbackman@5791 | 77 | return new (m->C) MachProjNode(this, proj->_con, rm, ideal_reg); |
rbackman@5791 | 78 | } |
rbackman@5791 | 79 | |
rbackman@5791 | 80 | // If the MathExactNode won't overflow we have to replace the |
rbackman@5791 | 81 | // FlagsProjNode and ProjNode that is generated by the MathExactNode |
rbackman@5791 | 82 | Node* MathExactNode::no_overflow(PhaseGVN *phase, Node* new_result) { |
rbackman@5791 | 83 | PhaseIterGVN *igvn = phase->is_IterGVN(); |
rbackman@5791 | 84 | if (igvn) { |
rbackman@5791 | 85 | ProjNode* result = result_node(); |
rbackman@5791 | 86 | ProjNode* flags = flags_node(); |
rbackman@5791 | 87 | |
rbackman@5791 | 88 | if (result != NULL) { |
rbackman@5791 | 89 | igvn->replace_node(result, new_result); |
rbackman@5791 | 90 | } |
rbackman@5791 | 91 | |
rbackman@5791 | 92 | if (flags != NULL) { |
rbackman@5927 | 93 | BoolNode* boolnode = bool_node(); |
rbackman@5927 | 94 | switch (boolnode->_test._test) { |
rbackman@5791 | 95 | case BoolTest::overflow: |
rbackman@5791 | 96 | // if the check is for overflow - never taken |
rbackman@5927 | 97 | igvn->replace_node(boolnode, phase->intcon(0)); |
rbackman@5791 | 98 | break; |
rbackman@5791 | 99 | case BoolTest::no_overflow: |
rbackman@5791 | 100 | // if the check is for no overflow - always taken |
rbackman@5927 | 101 | igvn->replace_node(boolnode, phase->intcon(1)); |
rbackman@5791 | 102 | break; |
rbackman@5791 | 103 | default: |
rbackman@5791 | 104 | fatal("Unexpected value of BoolTest"); |
rbackman@5791 | 105 | break; |
rbackman@5791 | 106 | } |
rbackman@5791 | 107 | flags->del_req(0); |
rbackman@5791 | 108 | } |
rbackman@5791 | 109 | } |
rbackman@5791 | 110 | return new_result; |
rbackman@5791 | 111 | } |
rbackman@5791 | 112 | |
rbackman@5791 | 113 | Node *AddExactINode::Ideal(PhaseGVN *phase, bool can_reshape) { |
rbackman@5791 | 114 | Node *arg1 = in(1); |
rbackman@5791 | 115 | Node *arg2 = in(2); |
rbackman@5791 | 116 | |
rbackman@5791 | 117 | const Type* type1 = phase->type(arg1); |
rbackman@5791 | 118 | const Type* type2 = phase->type(arg2); |
rbackman@5791 | 119 | |
rbackman@5791 | 120 | if (type1 != Type::TOP && type1->singleton() && |
rbackman@5791 | 121 | type2 != Type::TOP && type2->singleton()) { |
rbackman@5791 | 122 | jint val1 = arg1->get_int(); |
rbackman@5791 | 123 | jint val2 = arg2->get_int(); |
rbackman@5791 | 124 | jint result = val1 + val2; |
rbackman@5791 | 125 | // Hacker's Delight 2-12 Overflow if both arguments have the opposite sign of the result |
rbackman@5791 | 126 | if ( (((val1 ^ result) & (val2 ^ result)) >= 0)) { |
rbackman@5791 | 127 | Node* con_result = ConINode::make(phase->C, result); |
rbackman@5791 | 128 | return no_overflow(phase, con_result); |
rbackman@5791 | 129 | } |
rbackman@5791 | 130 | return NULL; |
rbackman@5791 | 131 | } |
rbackman@5791 | 132 | |
rbackman@5791 | 133 | if (type1 == TypeInt::ZERO) { // (Add 0 x) == x |
rbackman@5791 | 134 | Node* add_result = new (phase->C) AddINode(arg1, arg2); |
rbackman@5791 | 135 | return no_overflow(phase, add_result); |
rbackman@5791 | 136 | } |
rbackman@5791 | 137 | |
rbackman@5791 | 138 | if (type2 == TypeInt::ZERO) { // (Add x 0) == x |
rbackman@5791 | 139 | Node* add_result = new (phase->C) AddINode(arg1, arg2); |
rbackman@5791 | 140 | return no_overflow(phase, add_result); |
rbackman@5791 | 141 | } |
rbackman@5791 | 142 | |
rbackman@5791 | 143 | if (type2->singleton()) { |
rbackman@5791 | 144 | return NULL; // no change - keep constant on the right |
rbackman@5791 | 145 | } |
rbackman@5791 | 146 | |
rbackman@5791 | 147 | if (type1->singleton()) { |
rbackman@5791 | 148 | // Make it x + Constant - move constant to the right |
rbackman@5791 | 149 | swap_edges(1, 2); |
rbackman@5791 | 150 | return this; |
rbackman@5791 | 151 | } |
rbackman@5791 | 152 | |
rbackman@5791 | 153 | if (arg2->is_Load()) { |
rbackman@5791 | 154 | return NULL; // no change - keep load on the right |
rbackman@5791 | 155 | } |
rbackman@5791 | 156 | |
rbackman@5791 | 157 | if (arg1->is_Load()) { |
rbackman@5791 | 158 | // Make it x + Load - move load to the right |
rbackman@5791 | 159 | swap_edges(1, 2); |
rbackman@5791 | 160 | return this; |
rbackman@5791 | 161 | } |
rbackman@5791 | 162 | |
rbackman@5791 | 163 | if (arg1->_idx > arg2->_idx) { |
rbackman@5791 | 164 | // Sort the edges |
rbackman@5791 | 165 | swap_edges(1, 2); |
rbackman@5791 | 166 | return this; |
rbackman@5791 | 167 | } |
rbackman@5791 | 168 | |
rbackman@5791 | 169 | return NULL; |
rbackman@5791 | 170 | } |
rbackman@5791 | 171 |