Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/codegen/BranchOptimizer.java	Wed Oct 16 10:12:22 2013 +0200
     1.2 +++ b/src/jdk/nashorn/internal/codegen/BranchOptimizer.java	Wed Oct 16 10:15:55 2013 +0200
     1.3 @@ -84,7 +84,6 @@
     1.4      private void branchOptimizer(final BinaryNode binaryNode, final Label label, final boolean state) {
     1.5          final Expression lhs = binaryNode.lhs();
     1.6          final Expression rhs = binaryNode.rhs();
     1.7 -        Type widest = Type.widest(lhs.getType(), rhs.getType());
     1.8  
     1.9          switch (binaryNode.tokenType()) {
    1.10          case AND:
    1.11 @@ -113,33 +112,33 @@
    1.12  
    1.13          case EQ:
    1.14          case EQ_STRICT:
    1.15 -            codegen.loadBinaryOperands(lhs, rhs, widest);
    1.16 +            codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
    1.17              method.conditionalJump(state ? EQ : NE, true, label);
    1.18              return;
    1.19  
    1.20          case NE:
    1.21          case NE_STRICT:
    1.22 -            codegen.loadBinaryOperands(lhs, rhs, widest);
    1.23 +            codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
    1.24              method.conditionalJump(state ? NE : EQ, true, label);
    1.25              return;
    1.26  
    1.27          case GE:
    1.28 -            codegen.loadBinaryOperands(lhs, rhs, widest);
    1.29 +            codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
    1.30              method.conditionalJump(state ? GE : LT, !state, label);
    1.31              return;
    1.32  
    1.33          case GT:
    1.34 -            codegen.loadBinaryOperands(lhs, rhs, widest);
    1.35 +            codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
    1.36              method.conditionalJump(state ? GT : LE, !state, label);
    1.37              return;
    1.38  
    1.39          case LE:
    1.40 -            codegen.loadBinaryOperands(lhs, rhs, widest);
    1.41 +            codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
    1.42              method.conditionalJump(state ? LE : GT, state, label);
    1.43              return;
    1.44  
    1.45          case LT:
    1.46 -            codegen.loadBinaryOperands(lhs, rhs, widest);
    1.47 +            codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
    1.48              method.conditionalJump(state ? LT : GE, state, label);
    1.49              return;
    1.50  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8026693.js	Wed Oct 16 10:15:55 2013 +0200
     2.3 @@ -0,0 +1,33 @@
     2.4 +/*
     2.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + * 
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + * 
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + * 
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + * 
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * JDK-8026693: getType() called on DISCARD node
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +function f() {
    2.35 +    if(x, y) z;
    2.36 +}