Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Flow.java	Thu Jun 28 09:33:16 2012 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java	Fri Jul 13 12:58:50 2012 +0100
     1.3 @@ -746,6 +746,7 @@
     1.4                  pendingExits = prevPendingExits;
     1.5                  alive = true;
     1.6                  scanStat(tree.finalizer);
     1.7 +                tree.finallyCanCompleteNormally = alive;
     1.8                  if (!alive) {
     1.9                      // discard exits and exceptions from try and finally
    1.10                      thrown = chk.union(thrown, thrownPrev);
    1.11 @@ -764,7 +765,6 @@
    1.12                      }
    1.13                      alive = aliveEnd;
    1.14                  }
    1.15 -                tree.finallyCanCompleteNormally = alive;
    1.16              } else {
    1.17                  thrown = chk.union(thrown, chk.diff(thrownInTry, caughtInTry));
    1.18                  alive = aliveEnd;

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/DefiniteAssignment/T7181578.java	Fri Jul 13 12:58:50 2012 +0100
     2.3 @@ -0,0 +1,46 @@
     2.4 +/*
     2.5 + * Copyright (c) 2012, 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 7181578
    2.30 + * @summary javac reports uninitialized variable with nested try...finally blocks
    2.31 +  *
    2.32 + * @compile T7181578.java
    2.33 + */
    2.34 +class T7181578 {
    2.35 +    String test(boolean cond) {
    2.36 +        final String s;
    2.37 +        try {
    2.38 +            if (cond) {
    2.39 +                try {
    2.40 +                    s = "";
    2.41 +                    return s;
    2.42 +                } finally { }
    2.43 +            } else {
    2.44 +                s = "";
    2.45 +            }
    2.46 +            return s; // bug occurs here: mapping is always initialized
    2.47 +        } finally { }
    2.48 +    }
    2.49 +}