--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Jun 12 12:25:40 2017 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Jun 19 11:41:21 2017 +0200
@@ -718,8 +718,7 @@
     /** Derived visitor method: attribute a statement or definition tree.
      */
     public Type attribStat(JCTree tree, Env<AttrContext> env) {
-        Env<AttrContext> analyzeEnv =
-                env.dup(tree, env.info.dup(env.info.scope.dupUnshared(env.info.scope.owner)));
+        Env<AttrContext> analyzeEnv = analyzer.copyEnvIfNeeded(tree, env);
         try {
             return attribTree(tree, env, statInfo);
         } finally {