Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Apr 10 11:24:26 2014 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Apr 10 14:01:53 2014 -0700
     1.3 @@ -3009,15 +3009,6 @@
     1.4                  Type ctype = cfolder.fold1(opc, argtype);
     1.5                  if (ctype != null) {
     1.6                      owntype = cfolder.coerce(ctype, owntype);
     1.7 -
     1.8 -                    // Remove constant types from arguments to
     1.9 -                    // conserve space. The parser will fold concatenations
    1.10 -                    // of string literals; the code here also
    1.11 -                    // gets rid of intermediate results when some of the
    1.12 -                    // operands are constant identifiers.
    1.13 -                    if (tree.arg.type.tsym == syms.stringType.tsym) {
    1.14 -                        tree.arg.type = syms.stringType;
    1.15 -                    }
    1.16                  }
    1.17              }
    1.18          }
    1.19 @@ -3051,18 +3042,6 @@
    1.20                  Type ctype = cfolder.fold2(opc, left, right);
    1.21                  if (ctype != null) {
    1.22                      owntype = cfolder.coerce(ctype, owntype);
    1.23 -
    1.24 -                    // Remove constant types from arguments to
    1.25 -                    // conserve space. The parser will fold concatenations
    1.26 -                    // of string literals; the code here also
    1.27 -                    // gets rid of intermediate results when some of the
    1.28 -                    // operands are constant identifiers.
    1.29 -                    if (tree.lhs.type.tsym == syms.stringType.tsym) {
    1.30 -                        tree.lhs.type = syms.stringType;
    1.31 -                    }
    1.32 -                    if (tree.rhs.type.tsym == syms.stringType.tsym) {
    1.33 -                        tree.rhs.type = syms.stringType;
    1.34 -                    }
    1.35                  }
    1.36              }
    1.37  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/lambda/T8037935/LambdaWithBinOpConstRefToConstString.java	Thu Apr 10 14:01:53 2014 -0700
     2.3 @@ -0,0 +1,43 @@
     2.4 +/*
     2.5 + * Copyright (c) 2014, 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 + * @test
    2.29 + * @bug 8037935
    2.30 + * @summary Javac: final local String var referenced in binary/unary op in lambda produces code that does not verify
    2.31 + * @run main LambdaWithBinOpConstRefToConstString
    2.32 + */
    2.33 +
    2.34 +interface MyFI {
    2.35 +    void accept();
    2.36 +}
    2.37 +
    2.38 +public class LambdaWithBinOpConstRefToConstString {
    2.39 +    public static void main(String[] args) {
    2.40 +        final String CONSTANT_STRING_VALUE = "mwmwm";
    2.41 +
    2.42 +        MyFI consumeStrings = () -> {
    2.43 +            System.out.println(" local constant: " + CONSTANT_STRING_VALUE);
    2.44 +        };
    2.45 +    }
    2.46 +}