#5206 bootstrap diff using #5141 locker

boostrap.diff

diff --git i/compiler/compiler.properties w/compiler/compiler.properties
index e365f23826..e58c4fffde 100644
--- i/compiler/compiler.properties
+++ w/compiler/compiler.properties
@@ -1,4 +1,4 @@
-#Thu, 02 Jun 2016 12:59:56 -0700
+#Thu, 02 Jun 2016 13:04:37 -0700
 
 version.number=2.12.0-20160602-100833-8775ec53d8
 maven.version.number=2.12.0-SNAPSHOT
diff --git i/compiler/scala/reflect/macros/compiler/Validators$Validator.class w/compiler/scala/reflect/macros/compiler/Validators$Validator.class
index 2166fbab73..867f752c8f 100644
--- i/compiler/scala/reflect/macros/compiler/Validators$Validator.class
+++ w/compiler/scala/reflect/macros/compiler/Validators$Validator.class
@@ -82,26 +82,6 @@ public abstract interface scala/reflect/macros/compiler/Validators$Validator {
     MAXLOCALS = 1
 
   // access flags 0x2
-  private default SigGenerator$1(Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$;
-    // parameter final  SigGenerator$module$1
-    ALOAD 1
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$
-    IFNONNULL L0
-    ALOAD 0
-    ALOAD 1
-    INVOKESPECIAL scala/reflect/macros/compiler/Validators$Validator.SigGenerator$lzycompute$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$;
-    GOTO L1
-   L0
-    ALOAD 1
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$
-   L1
-    ARETURN
-    MAXSTACK = 2
-    MAXLOCALS = 2
-
-  // access flags 0x2
   private default SigGenerator$lzycompute$1(Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$;
     // parameter final  SigGenerator$module$1
     TRYCATCHBLOCK L0 L1 L2 java/lang/Throwable
@@ -1092,6 +1072,26 @@ public abstract interface scala/reflect/macros/compiler/Validators$Validator {
   public abstract scala$reflect$macros$compiler$Validators$Validator$$MacroImplSig()Lscala/reflect/macros/compiler/Validators$Validator$MacroImplSig$;
 
   // access flags 0x1
+  public default scala$reflect$macros$compiler$Validators$Validator$$SigGenerator$1(Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$;
+    // parameter final  SigGenerator$module$1
+    ALOAD 1
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$
+    IFNONNULL L0
+    ALOAD 0
+    ALOAD 1
+    INVOKESPECIAL scala/reflect/macros/compiler/Validators$Validator.SigGenerator$lzycompute$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$;
+    GOTO L1
+   L0
+    ALOAD 1
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$
+   L1
+    ARETURN
+    MAXSTACK = 2
+    MAXLOCALS = 2
+
+  // access flags 0x1
   public default scala$reflect$macros$compiler$Validators$Validator$$macroImplSig()Lscala/reflect/macros/compiler/Validators$Validator$MacroImplSig;
     ALOAD 0
     CHECKCAST scala/reflect/macros/compiler/Resolvers$Resolver
@@ -1190,11 +1190,11 @@ public abstract interface scala/reflect/macros/compiler/Validators$Validator {
     CHECKCAST scala/collection/immutable/List
     ALOAD 0
     ALOAD 1
-    INVOKESPECIAL scala/reflect/macros/compiler/Validators$Validator.SigGenerator$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$;
+    INVOKEINTERFACE scala/reflect/macros/compiler/Validators$Validator.scala$reflect$macros$compiler$Validators$Validator$$SigGenerator$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$;
     INVOKEVIRTUAL scala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$.paramss ()Lscala/collection/immutable/List;
     ALOAD 0
     ALOAD 1
-    INVOKESPECIAL scala/reflect/macros/compiler/Validators$Validator.SigGenerator$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$;
+    INVOKEINTERFACE scala/reflect/macros/compiler/Validators$Validator.scala$reflect$macros$compiler$Validators$Validator$$SigGenerator$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$;
     INVOKEVIRTUAL scala/reflect/macros/compiler/Validators$Validator$SigGenerator$2$.implReturnType ()Lscala/reflect/internal/Types$Type;
     INVOKESPECIAL scala/reflect/macros/compiler/Validators$Validator$MacroImplSig.<init> (Lscala/reflect/macros/compiler/DefaultMacroCompiler$MacroImplRefCompiler;Lscala/collection/immutable/List;Lscala/collection/immutable/List;Lscala/reflect/internal/Types$Type;)V
     ASTORE 2
diff --git i/compiler/scala/reflect/macros/contexts/Reifiers.class w/compiler/scala/reflect/macros/contexts/Reifiers.class
index d3d460d438..e1dee80299 100644
--- i/compiler/scala/reflect/macros/contexts/Reifiers.class
+++ w/compiler/scala/reflect/macros/contexts/Reifiers.class
@@ -90,7 +90,7 @@ public abstract interface scala/reflect/macros/contexts/Reifiers {
     ASTORE 5
     ALOAD 0
     ALOAD 4
-    INVOKESPECIAL scala/reflect/macros/contexts/Reifiers.utils$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
+    INVOKEINTERFACE scala/reflect/macros/contexts/Reifiers.scala$reflect$macros$contexts$Reifiers$$utils$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
     INVOKEVIRTUAL scala/reflect/macros/contexts/Reifiers$utils$2$.ReifiedTree ()Lscala/reflect/reify/utils/Extractors$ReifiedTree$;
     ALOAD 5
     INVOKEVIRTUAL scala/reflect/reify/utils/Extractors$ReifiedTree$.unapply (Lscala/reflect/internal/Trees$Tree;)Lscala/Option;
@@ -117,7 +117,7 @@ public abstract interface scala/reflect/macros/contexts/Reifiers {
    L4
     ALOAD 0
     ALOAD 4
-    INVOKESPECIAL scala/reflect/macros/contexts/Reifiers.utils$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
+    INVOKEINTERFACE scala/reflect/macros/contexts/Reifiers.scala$reflect$macros$contexts$Reifiers$$utils$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
     INVOKEVIRTUAL scala/reflect/macros/contexts/Reifiers$utils$2$.ReifiedType ()Lscala/reflect/reify/utils/Extractors$ReifiedType$;
     ALOAD 5
     INVOKEVIRTUAL scala/reflect/reify/utils/Extractors$ReifiedType$.unapply (Lscala/reflect/internal/Trees$Tree;)Lscala/Option;
@@ -384,7 +384,7 @@ public abstract interface scala/reflect/macros/contexts/Reifiers {
     ASTORE 5
     ALOAD 0
     ALOAD 2
-    INVOKESPECIAL scala/reflect/macros/contexts/Reifiers.utils$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
+    INVOKEINTERFACE scala/reflect/macros/contexts/Reifiers.scala$reflect$macros$contexts$Reifiers$$utils$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
     INVOKEVIRTUAL scala/reflect/macros/contexts/Reifiers$utils$2$.FreeTermDef ()Lscala/reflect/reify/utils/Extractors$FreeTermDef$;
     ALOAD 5
     INVOKEVIRTUAL scala/reflect/reify/utils/Extractors$FreeTermDef$.unapply (Lscala/reflect/internal/Trees$Tree;)Lscala/Option;
@@ -492,7 +492,7 @@ public abstract interface scala/reflect/macros/contexts/Reifiers {
    L3
     ALOAD 0
     ALOAD 2
-    INVOKESPECIAL scala/reflect/macros/contexts/Reifiers.utils$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
+    INVOKEINTERFACE scala/reflect/macros/contexts/Reifiers.scala$reflect$macros$contexts$Reifiers$$utils$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
     INVOKEVIRTUAL scala/reflect/macros/contexts/Reifiers$utils$2$.FreeTypeDef ()Lscala/reflect/reify/utils/Extractors$FreeTypeDef$;
     ALOAD 5
     INVOKEVIRTUAL scala/reflect/reify/utils/Extractors$FreeTypeDef$.unapply (Lscala/reflect/internal/Trees$Tree;)Lscala/Option;
@@ -621,6 +621,26 @@ public abstract interface scala/reflect/macros/contexts/Reifiers {
     MAXSTACK = 4
     MAXLOCALS = 4
 
+  // access flags 0x1
+  public default scala$reflect$macros$contexts$Reifiers$$utils$1(Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
+    // parameter final  utils$module$1
+    ALOAD 1
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/reflect/macros/contexts/Reifiers$utils$2$
+    IFNONNULL L0
+    ALOAD 0
+    ALOAD 1
+    INVOKESPECIAL scala/reflect/macros/contexts/Reifiers.utils$lzycompute$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
+    GOTO L1
+   L0
+    ALOAD 1
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/reflect/macros/contexts/Reifiers$utils$2$
+   L1
+    ARETURN
+    MAXSTACK = 2
+    MAXLOCALS = 2
+
   // access flags 0x401
   public abstract scala$reflect$macros$contexts$Reifiers$_setter_$global_$eq(Lscala/tools/nsc/Global;)V
     // parameter final  x$1
@@ -673,26 +693,6 @@ public abstract interface scala/reflect/macros/contexts/Reifiers {
     MAXLOCALS = 3
 
   // access flags 0x2
-  private default utils$1(Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
-    // parameter final  utils$module$1
-    ALOAD 1
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/reflect/macros/contexts/Reifiers$utils$2$
-    IFNONNULL L0
-    ALOAD 0
-    ALOAD 1
-    INVOKESPECIAL scala/reflect/macros/contexts/Reifiers.utils$lzycompute$1 (Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
-    GOTO L1
-   L0
-    ALOAD 1
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/reflect/macros/contexts/Reifiers$utils$2$
-   L1
-    ARETURN
-    MAXSTACK = 2
-    MAXLOCALS = 2
-
-  // access flags 0x2
   private default utils$lzycompute$1(Lscala/runtime/VolatileObjectRef;)Lscala/reflect/macros/contexts/Reifiers$utils$2$;
     // parameter final  utils$module$1
     TRYCATCHBLOCK L0 L1 L2 java/lang/Throwable
diff --git i/compiler/scala/reflect/quasiquotes/Parsers$Parser.class w/compiler/scala/reflect/quasiquotes/Parsers$Parser.class
index 7d08c33ac8..b57c0a174a 100644
--- i/compiler/scala/reflect/quasiquotes/Parsers$Parser.class
+++ w/compiler/scala/reflect/quasiquotes/Parsers$Parser.class
@@ -816,10 +816,10 @@ public abstract class scala/reflect/quasiquotes/Parsers$Parser implements scala/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/immutable/List<Lscala/Tuple2<Lscala/reflect/internal/Names$Name;Ljava/lang/Object;>;>;)V
   // declaration: void scala$tools$nsc$ast$parser$Scanners$_setter_$scala$tools$nsc$ast$parser$Scanners$$allKeywords_$eq(scala.collection.immutable.List<scala.Tuple2<scala.reflect.internal.Names$Name, java.lang.Object>>)
-  public scala$tools$nsc$ast$parser$Scanners$_setter_$scala$tools$nsc$ast$parser$Scanners$$allKeywords_$eq(Lscala/collection/immutable/List;)V
+  public final scala$tools$nsc$ast$parser$Scanners$_setter_$scala$tools$nsc$ast$parser$Scanners$$allKeywords_$eq(Lscala/collection/immutable/List;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -828,8 +828,8 @@ public abstract class scala/reflect/quasiquotes/Parsers$Parser implements scala/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
-  public scala$tools$nsc$ast$parser$Scanners$_setter_$scala$tools$nsc$ast$parser$Scanners$$kwArray_$eq([I)V
+  // access flags 0x11
+  public final scala$tools$nsc$ast$parser$Scanners$_setter_$scala$tools$nsc$ast$parser$Scanners$$kwArray_$eq([I)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/reflect/reify/Reifier.class w/compiler/scala/reflect/reify/Reifier.class
index 2ef80ca39c..8ebf69ae7d 100644
--- i/compiler/scala/reflect/reify/Reifier.class
+++ w/compiler/scala/reflect/reify/Reifier.class
@@ -2519,8 +2519,8 @@ public abstract class scala/reflect/reify/Reifier implements scala/reflect/reify
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$reflect$reify$codegen$GenTypes$_setter_$scala$reflect$reify$codegen$GenTypes$$runDefinitions_$eq(Lscala/reflect/internal/Definitions$DefinitionsClass$RunDefinitions;)V
+  // access flags 0x11
+  public final scala$reflect$reify$codegen$GenTypes$_setter_$scala$reflect$reify$codegen$GenTypes$$runDefinitions_$eq(Lscala/reflect/internal/Definitions$DefinitionsClass$RunDefinitions;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -2583,8 +2583,8 @@ public abstract class scala/reflect/reify/Reifier implements scala/reflect/reify
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
-  public scala$reflect$reify$phases$Reshape$_setter_$scala$reflect$reify$phases$Reshape$$runDefinitions_$eq(Lscala/reflect/internal/Definitions$DefinitionsClass$RunDefinitions;)V
+  // access flags 0x11
+  public final scala$reflect$reify$phases$Reshape$_setter_$scala$reflect$reify$phases$Reshape$$runDefinitions_$eq(Lscala/reflect/internal/Definitions$DefinitionsClass$RunDefinitions;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/Global$$anon$1.class w/compiler/scala/tools/nsc/Global$$anon$1.class
index b402108c48..aba82de900 100644
--- i/compiler/scala/tools/nsc/Global$$anon$1.class
+++ w/compiler/scala/tools/nsc/Global$$anon$1.class
@@ -3502,10 +3502,10 @@ public final class scala/tools/nsc/Global$$anon$1 implements scala/tools/nsc/typ
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/Function1<Lscala/tools/nsc/typechecker/Macros$MacroArgs;Ljava/lang/Object;>;>;)V
   // declaration: void scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Symbols$Symbol, scala.Function1<scala.tools.nsc.typechecker.Macros$MacroArgs, java.lang.Object>>)
-  public scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -3859,10 +3859,10 @@ public final class scala/tools/nsc/Global$$anon$1 implements scala/tools/nsc/typ
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/Function0<Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(scala.Function0<java.lang.Object>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(Lscala/Function0;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(Lscala/Function0;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -3871,10 +3871,10 @@ public final class scala/tools/nsc/Global$$anon$1 implements scala/tools/nsc/typ
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Types$Type;Lscala/collection/immutable/List<Lscala/collection/immutable/List<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Types$Type, scala.collection.immutable.List<scala.collection.immutable.List<scala.tools.nsc.typechecker.Implicits$ImplicitInfo>>>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -3883,10 +3883,10 @@ public final class scala/tools/nsc/Global$$anon$1 implements scala/tools/nsc/typ
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/Tuple2<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(scala.collection.mutable.HashMap<scala.Tuple2<scala.tools.nsc.typechecker.Implicits$ImplicitInfo, scala.tools.nsc.typechecker.Implicits$ImplicitInfo>, java.lang.Object>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -3895,10 +3895,10 @@ public final class scala/tools/nsc/Global$$anon$1 implements scala/tools/nsc/typ
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Symbols$Symbol, scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Symbols$Symbol, scala.collection.immutable.List<scala.tools.nsc.typechecker.Implicits$ImplicitInfo>>>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4075,10 +4075,10 @@ public final class scala/tools/nsc/Global$$anon$1 implements scala/tools/nsc/typ
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Trees$Tree;Lscala/collection/mutable/Set<Ljava/lang/Object;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Trees$Tree, scala.collection.mutable.Set<java.lang.Object>>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4087,10 +4087,10 @@ public final class scala/tools/nsc/Global$$anon$1 implements scala/tools/nsc/typ
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/reflect/internal/util/WeakHashSet<Lscala/reflect/internal/Trees$Tree;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(scala.reflect.internal.util.WeakHashSet<scala.reflect.internal.Trees$Tree>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(Lscala/reflect/internal/util/WeakHashSet;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(Lscala/reflect/internal/util/WeakHashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4099,10 +4099,10 @@ public final class scala/tools/nsc/Global$$anon$1 implements scala/tools/nsc/typ
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashSet<Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(scala.collection.mutable.HashSet<java.lang.Object>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(Lscala/collection/mutable/HashSet;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(Lscala/collection/mutable/HashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4550,10 +4550,10 @@ public final class scala/tools/nsc/Global$$anon$1 implements scala/tools/nsc/typ
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/reflect/internal/util/Position;Lscala/Function0<Ljava/lang/String;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(scala.collection.mutable.HashMap<scala.reflect.internal.util.Position, scala.Function0<java.lang.String>>)
-  public scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/Global.class w/compiler/scala/tools/nsc/Global.class
index d36a7486d3..4f11664f9e 100644
--- i/compiler/scala/tools/nsc/Global.class
+++ w/compiler/scala/tools/nsc/Global.class
@@ -8329,10 +8329,10 @@ public class scala/tools/nsc/Global extends scala/tools/nsc/symtab/SymbolTable
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/Map<Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/Map<Ljava/lang/String;Ljava/lang/String;>;>;)V
   // declaration: void scala$tools$nsc$ast$DocComments$_setter_$scala$tools$nsc$ast$DocComments$$defs_$eq(scala.collection.mutable.Map<scala.reflect.internal.Symbols$Symbol, scala.collection.immutable.Map<java.lang.String, java.lang.String>>)
-  public scala$tools$nsc$ast$DocComments$_setter_$scala$tools$nsc$ast$DocComments$$defs_$eq(Lscala/collection/mutable/Map;)V
+  public final scala$tools$nsc$ast$DocComments$_setter_$scala$tools$nsc$ast$DocComments$$defs_$eq(Lscala/collection/mutable/Map;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/ast/NodePrinters$nodeToRegularString$.class w/compiler/scala/tools/nsc/ast/NodePrinters$nodeToRegularString$.class
index 7d4712b6fd..23d1b432de 100644
--- i/compiler/scala/tools/nsc/ast/NodePrinters$nodeToRegularString$.class
+++ w/compiler/scala/tools/nsc/ast/NodePrinters$nodeToRegularString$.class
@@ -130,8 +130,8 @@ public class scala/tools/nsc/ast/NodePrinters$nodeToRegularString$ implements sc
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
-  public scala$tools$nsc$ast$NodePrinters$PrintAST$_setter_$scala$tools$nsc$ast$NodePrinters$PrintAST$$buf_$eq(Lscala/collection/mutable/StringBuilder;)V
+  // access flags 0x11
+  public final scala$tools$nsc$ast$NodePrinters$PrintAST$_setter_$scala$tools$nsc$ast$NodePrinters$PrintAST$$buf_$eq(Lscala/collection/mutable/StringBuilder;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/ast/parser/SyntaxAnalyzer.class w/compiler/scala/tools/nsc/ast/parser/SyntaxAnalyzer.class
index b949e5a2a4..3db7ebbb7a 100644
--- i/compiler/scala/tools/nsc/ast/parser/SyntaxAnalyzer.class
+++ w/compiler/scala/tools/nsc/ast/parser/SyntaxAnalyzer.class
@@ -595,10 +595,10 @@ public abstract class scala/tools/nsc/ast/parser/SyntaxAnalyzer extends scala/to
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/immutable/List<Lscala/Tuple2<Lscala/reflect/internal/Names$Name;Ljava/lang/Object;>;>;)V
   // declaration: void scala$tools$nsc$ast$parser$Scanners$_setter_$scala$tools$nsc$ast$parser$Scanners$$allKeywords_$eq(scala.collection.immutable.List<scala.Tuple2<scala.reflect.internal.Names$Name, java.lang.Object>>)
-  public scala$tools$nsc$ast$parser$Scanners$_setter_$scala$tools$nsc$ast$parser$Scanners$$allKeywords_$eq(Lscala/collection/immutable/List;)V
+  public final scala$tools$nsc$ast$parser$Scanners$_setter_$scala$tools$nsc$ast$parser$Scanners$$allKeywords_$eq(Lscala/collection/immutable/List;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -607,8 +607,8 @@ public abstract class scala/tools/nsc/ast/parser/SyntaxAnalyzer extends scala/to
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
-  public scala$tools$nsc$ast$parser$Scanners$_setter_$scala$tools$nsc$ast$parser$Scanners$$kwArray_$eq([I)V
+  // access flags 0x11
+  public final scala$tools$nsc$ast$parser$Scanners$_setter_$scala$tools$nsc$ast$parser$Scanners$$kwArray_$eq([I)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/backend/jvm/BytecodeWriters$$anon$1.class w/compiler/scala/tools/nsc/backend/jvm/BytecodeWriters$$anon$1.class
index 6096d8b123..7a120243b4 100644
--- i/compiler/scala/tools/nsc/backend/jvm/BytecodeWriters$$anon$1.class
+++ w/compiler/scala/tools/nsc/backend/jvm/BytecodeWriters$$anon$1.class
@@ -88,8 +88,8 @@ public final class scala/tools/nsc/backend/jvm/BytecodeWriters$$anon$1 implement
     MAXSTACK = 5
     MAXLOCALS = 5
 
-  // access flags 0x1
-  public scala$tools$nsc$backend$jvm$BytecodeWriters$AsmpBytecodeWriter$_setter_$scala$tools$nsc$backend$jvm$BytecodeWriters$AsmpBytecodeWriter$$baseDir_$eq(Lscala/reflect/io/Directory;)V
+  // access flags 0x11
+  public final scala$tools$nsc$backend$jvm$BytecodeWriters$AsmpBytecodeWriter$_setter_$scala$tools$nsc$backend$jvm$BytecodeWriters$AsmpBytecodeWriter$$baseDir_$eq(Lscala/reflect/io/Directory;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/backend/jvm/BytecodeWriters$$anon$3.class w/compiler/scala/tools/nsc/backend/jvm/BytecodeWriters$$anon$3.class
index 2f705c453f..784c53f24b 100644
--- i/compiler/scala/tools/nsc/backend/jvm/BytecodeWriters$$anon$3.class
+++ w/compiler/scala/tools/nsc/backend/jvm/BytecodeWriters$$anon$3.class
@@ -73,8 +73,8 @@ public final class scala/tools/nsc/backend/jvm/BytecodeWriters$$anon$3 implement
     MAXSTACK = 5
     MAXLOCALS = 5
 
-  // access flags 0x1
-  public scala$tools$nsc$backend$jvm$BytecodeWriters$AsmpBytecodeWriter$_setter_$scala$tools$nsc$backend$jvm$BytecodeWriters$AsmpBytecodeWriter$$baseDir_$eq(Lscala/reflect/io/Directory;)V
+  // access flags 0x11
+  public final scala$tools$nsc$backend$jvm$BytecodeWriters$AsmpBytecodeWriter$_setter_$scala$tools$nsc$backend$jvm$BytecodeWriters$AsmpBytecodeWriter$$baseDir_$eq(Lscala/reflect/io/Directory;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/backend/jvm/analysis/BackendUtils$ProdConsAnalyzer.class w/compiler/scala/tools/nsc/backend/jvm/analysis/BackendUtils$ProdConsAnalyzer.class
index abce68130c..8ce2c38c28 100644
--- i/compiler/scala/tools/nsc/backend/jvm/analysis/BackendUtils$ProdConsAnalyzer.class
+++ w/compiler/scala/tools/nsc/backend/jvm/analysis/BackendUtils$ProdConsAnalyzer.class
@@ -147,10 +147,10 @@ public class scala/tools/nsc/backend/jvm/analysis/BackendUtils$ProdConsAnalyzer
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/AnyRefMap<Lscala/Tuple2<Lscala/tools/asm/tree/AbstractInsnNode;Ljava/lang/Object;>;Lscala/collection/immutable/Set<Lscala/tools/asm/tree/AbstractInsnNode;>;>;)V
   // declaration: void scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$_setter_$scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$$_initialProducersCache_$eq(scala.collection.mutable.AnyRefMap<scala.Tuple2<scala.tools.asm.tree.AbstractInsnNode, java.lang.Object>, scala.collection.immutable.Set<scala.tools.asm.tree.AbstractInsnNode>>)
-  public scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$_setter_$scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$$_initialProducersCache_$eq(Lscala/collection/mutable/AnyRefMap;)V
+  public final scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$_setter_$scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$$_initialProducersCache_$eq(Lscala/collection/mutable/AnyRefMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -159,10 +159,10 @@ public class scala/tools/nsc/backend/jvm/analysis/BackendUtils$ProdConsAnalyzer
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/AnyRefMap<Lscala/Tuple2<Lscala/tools/asm/tree/AbstractInsnNode;Ljava/lang/Object;>;Lscala/collection/immutable/Set<Lscala/tools/asm/tree/AbstractInsnNode;>;>;)V
   // declaration: void scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$_setter_$scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$$_ultimateConsumersCache_$eq(scala.collection.mutable.AnyRefMap<scala.Tuple2<scala.tools.asm.tree.AbstractInsnNode, java.lang.Object>, scala.collection.immutable.Set<scala.tools.asm.tree.AbstractInsnNode>>)
-  public scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$_setter_$scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$$_ultimateConsumersCache_$eq(Lscala/collection/mutable/AnyRefMap;)V
+  public final scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$_setter_$scala$tools$nsc$backend$jvm$analysis$ProdConsAnalyzerImpl$$_ultimateConsumersCache_$eq(Lscala/collection/mutable/AnyRefMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/classpath/ZipAndJarClassPathFactory$.class w/compiler/scala/tools/nsc/classpath/ZipAndJarClassPathFactory$.class
index b9b68f0b02..9d32d94513 100644
--- i/compiler/scala/tools/nsc/classpath/ZipAndJarClassPathFactory$.class
+++ w/compiler/scala/tools/nsc/classpath/ZipAndJarClassPathFactory$.class
@@ -123,10 +123,10 @@ public final class scala/tools/nsc/classpath/ZipAndJarClassPathFactory$ implemen
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/Map<Lscala/reflect/io/AbstractFile;Lscala/tools/nsc/util/ClassPath;>;)V
   // declaration: void scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$_setter_$scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$$cache_$eq(scala.collection.mutable.Map<scala.reflect.io.AbstractFile, scala.tools.nsc.util.ClassPath>)
-  public scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$_setter_$scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$$cache_$eq(Lscala/collection/mutable/Map;)V
+  public final scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$_setter_$scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$$cache_$eq(Lscala/collection/mutable/Map;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/classpath/ZipAndJarClassPathFactory$ZipArchiveClassPath.class w/compiler/scala/tools/nsc/classpath/ZipAndJarClassPathFactory$ZipArchiveClassPath.class
index 20cccb4fa6..b064d0704f 100644
--- i/compiler/scala/tools/nsc/classpath/ZipAndJarClassPathFactory$ZipArchiveClassPath.class
+++ w/compiler/scala/tools/nsc/classpath/ZipAndJarClassPathFactory$ZipArchiveClassPath.class
@@ -384,8 +384,8 @@ public class scala/tools/nsc/classpath/ZipAndJarClassPathFactory$ZipArchiveClass
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$tools$nsc$classpath$ZipArchiveFileLookup$_setter_$scala$tools$nsc$classpath$ZipArchiveFileLookup$$archive_$eq(Lscala/reflect/io/FileZipArchive;)V
+  // access flags 0x11
+  public final scala$tools$nsc$classpath$ZipArchiveFileLookup$_setter_$scala$tools$nsc$classpath$ZipArchiveFileLookup$$archive_$eq(Lscala/reflect/io/FileZipArchive;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/classpath/ZipAndJarSourcePathFactory$.class w/compiler/scala/tools/nsc/classpath/ZipAndJarSourcePathFactory$.class
index 099a49063b..92fd60ebda 100644
--- i/compiler/scala/tools/nsc/classpath/ZipAndJarSourcePathFactory$.class
+++ w/compiler/scala/tools/nsc/classpath/ZipAndJarSourcePathFactory$.class
@@ -55,10 +55,10 @@ public final class scala/tools/nsc/classpath/ZipAndJarSourcePathFactory$ impleme
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/Map<Lscala/reflect/io/AbstractFile;Lscala/tools/nsc/util/ClassPath;>;)V
   // declaration: void scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$_setter_$scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$$cache_$eq(scala.collection.mutable.Map<scala.reflect.io.AbstractFile, scala.tools.nsc.util.ClassPath>)
-  public scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$_setter_$scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$$cache_$eq(Lscala/collection/mutable/Map;)V
+  public final scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$_setter_$scala$tools$nsc$classpath$ZipAndJarFileLookupFactory$$cache_$eq(Lscala/collection/mutable/Map;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/classpath/ZipAndJarSourcePathFactory$ZipArchiveSourcePath.class w/compiler/scala/tools/nsc/classpath/ZipAndJarSourcePathFactory$ZipArchiveSourcePath.class
index 3ff6cea60e..a7f022eec1 100644
--- i/compiler/scala/tools/nsc/classpath/ZipAndJarSourcePathFactory$ZipArchiveSourcePath.class
+++ w/compiler/scala/tools/nsc/classpath/ZipAndJarSourcePathFactory$ZipArchiveSourcePath.class
@@ -236,8 +236,8 @@ public class scala/tools/nsc/classpath/ZipAndJarSourcePathFactory$ZipArchiveSour
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$tools$nsc$classpath$ZipArchiveFileLookup$_setter_$scala$tools$nsc$classpath$ZipArchiveFileLookup$$archive_$eq(Lscala/reflect/io/FileZipArchive;)V
+  // access flags 0x11
+  public final scala$tools$nsc$classpath$ZipArchiveFileLookup$_setter_$scala$tools$nsc$classpath$ZipArchiveFileLookup$$archive_$eq(Lscala/reflect/io/FileZipArchive;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/transform/Constructors$OmittablesHelper.class w/compiler/scala/tools/nsc/transform/Constructors$OmittablesHelper.class
index f94a5d9293..3d5939ea90 100644
--- i/compiler/scala/tools/nsc/transform/Constructors$OmittablesHelper.class
+++ w/compiler/scala/tools/nsc/transform/Constructors$OmittablesHelper.class
@@ -123,34 +123,6 @@ public abstract interface scala/tools/nsc/transform/Constructors$OmittablesHelpe
     MAXLOCALS = 8
 
   // access flags 0x2
-  private default detectUsages$1(Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List;ZLscala/collection/mutable/Set;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$;
-    // parameter final  clazz$2
-    // parameter final  defs$1
-    // parameter final  isEffectivelyFinal$1
-    // parameter final  omittables$1
-    // parameter final  detectUsages$module$1
-    ALOAD 5
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$
-    IFNONNULL L0
-    ALOAD 0
-    ALOAD 1
-    ALOAD 2
-    ILOAD 3
-    ALOAD 4
-    ALOAD 5
-    INVOKESPECIAL scala/tools/nsc/transform/Constructors$OmittablesHelper.detectUsages$lzycompute$1 (Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List;ZLscala/collection/mutable/Set;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$;
-    GOTO L1
-   L0
-    ALOAD 5
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$
-   L1
-    ARETURN
-    MAXSTACK = 6
-    MAXLOCALS = 6
-
-  // access flags 0x2
   private default detectUsages$lzycompute$1(Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List;ZLscala/collection/mutable/Set;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$;
     // parameter final  clazz$2
     // parameter final  defs$1
@@ -273,7 +245,7 @@ public abstract interface scala/tools/nsc/transform/Constructors$OmittablesHelpe
     ILOAD 3
     ALOAD 4
     ALOAD 5
-    INVOKESPECIAL scala/tools/nsc/transform/Constructors$OmittablesHelper.detectUsages$1 (Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List;ZLscala/collection/mutable/Set;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$;
+    INVOKEINTERFACE scala/tools/nsc/transform/Constructors$OmittablesHelper.scala$tools$nsc$transform$Constructors$OmittablesHelper$$detectUsages$1 (Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List;ZLscala/collection/mutable/Set;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$;
     ALOAD 6
     INVOKEVIRTUAL scala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$.traverse (Lscala/reflect/internal/Trees$Tree;)V
     RETURN
@@ -305,6 +277,34 @@ public abstract interface scala/tools/nsc/transform/Constructors$OmittablesHelpe
   public abstract synthetic scala$tools$nsc$transform$Constructors$OmittablesHelper$$$outer()Lscala/tools/nsc/transform/Constructors;
 
   // access flags 0x1
+  public default scala$tools$nsc$transform$Constructors$OmittablesHelper$$detectUsages$1(Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List;ZLscala/collection/mutable/Set;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$;
+    // parameter final  clazz$2
+    // parameter final  defs$1
+    // parameter final  isEffectivelyFinal$1
+    // parameter final  omittables$1
+    // parameter final  detectUsages$module$1
+    ALOAD 5
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$
+    IFNONNULL L0
+    ALOAD 0
+    ALOAD 1
+    ALOAD 2
+    ILOAD 3
+    ALOAD 4
+    ALOAD 5
+    INVOKESPECIAL scala/tools/nsc/transform/Constructors$OmittablesHelper.detectUsages$lzycompute$1 (Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List;ZLscala/collection/mutable/Set;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$;
+    GOTO L1
+   L0
+    ALOAD 5
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/tools/nsc/transform/Constructors$OmittablesHelper$detectUsages$2$
+   L1
+    ARETURN
+    MAXSTACK = 6
+    MAXLOCALS = 6
+
+  // access flags 0x1
   public default scala$tools$nsc$transform$Constructors$OmittablesHelper$$omittableOuterAcc$1(Lscala/reflect/internal/Symbols$Symbol;Z)Z
     // parameter final  sym
     // parameter final  isEffectivelyFinal$1
diff --git i/compiler/scala/tools/nsc/transform/Erasure.class w/compiler/scala/tools/nsc/transform/Erasure.class
index fb2f3f1bd5..525199715a 100644
--- i/compiler/scala/tools/nsc/transform/Erasure.class
+++ w/compiler/scala/tools/nsc/transform/Erasure.class
@@ -5919,10 +5919,10 @@ public abstract class scala/tools/nsc/transform/Erasure extends scala/tools/nsc/
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/Function1<Lscala/tools/nsc/typechecker/Macros$MacroArgs;Ljava/lang/Object;>;>;)V
   // declaration: void scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Symbols$Symbol, scala.Function1<scala.tools.nsc.typechecker.Macros$MacroArgs, java.lang.Object>>)
-  public scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -7049,10 +7049,10 @@ public abstract class scala/tools/nsc/transform/Erasure extends scala/tools/nsc/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/Function0<Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(scala.Function0<java.lang.Object>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(Lscala/Function0;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(Lscala/Function0;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -7061,10 +7061,10 @@ public abstract class scala/tools/nsc/transform/Erasure extends scala/tools/nsc/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Types$Type;Lscala/collection/immutable/List<Lscala/collection/immutable/List<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Types$Type, scala.collection.immutable.List<scala.collection.immutable.List<scala.tools.nsc.typechecker.Implicits$ImplicitInfo>>>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -7073,10 +7073,10 @@ public abstract class scala/tools/nsc/transform/Erasure extends scala/tools/nsc/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/Tuple2<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(scala.collection.mutable.HashMap<scala.Tuple2<scala.tools.nsc.typechecker.Implicits$ImplicitInfo, scala.tools.nsc.typechecker.Implicits$ImplicitInfo>, java.lang.Object>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -7085,10 +7085,10 @@ public abstract class scala/tools/nsc/transform/Erasure extends scala/tools/nsc/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Symbols$Symbol, scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Symbols$Symbol, scala.collection.immutable.List<scala.tools.nsc.typechecker.Implicits$ImplicitInfo>>>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -7265,10 +7265,10 @@ public abstract class scala/tools/nsc/transform/Erasure extends scala/tools/nsc/
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Trees$Tree;Lscala/collection/mutable/Set<Ljava/lang/Object;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Trees$Tree, scala.collection.mutable.Set<java.lang.Object>>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -7277,10 +7277,10 @@ public abstract class scala/tools/nsc/transform/Erasure extends scala/tools/nsc/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/reflect/internal/util/WeakHashSet<Lscala/reflect/internal/Trees$Tree;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(scala.reflect.internal.util.WeakHashSet<scala.reflect.internal.Trees$Tree>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(Lscala/reflect/internal/util/WeakHashSet;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(Lscala/reflect/internal/util/WeakHashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -7289,10 +7289,10 @@ public abstract class scala/tools/nsc/transform/Erasure extends scala/tools/nsc/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashSet<Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(scala.collection.mutable.HashSet<java.lang.Object>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(Lscala/collection/mutable/HashSet;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(Lscala/collection/mutable/HashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -7740,10 +7740,10 @@ public abstract class scala/tools/nsc/transform/Erasure extends scala/tools/nsc/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/reflect/internal/util/Position;Lscala/Function0<Ljava/lang/String;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(scala.collection.mutable.HashMap<scala.reflect.internal.util.Position, scala.Function0<java.lang.String>>)
-  public scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/transform/ExplicitOuter$OuterPathTransformer.class w/compiler/scala/tools/nsc/transform/ExplicitOuter$OuterPathTransformer.class
index 83515bb470..fce8c8c744 100644
--- i/compiler/scala/tools/nsc/transform/ExplicitOuter$OuterPathTransformer.class
+++ w/compiler/scala/tools/nsc/transform/ExplicitOuter$OuterPathTransformer.class
@@ -439,10 +439,10 @@ public abstract class scala/tools/nsc/transform/ExplicitOuter$OuterPathTransform
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/Stack<Lscala/reflect/internal/Symbols$Symbol;>;)V
   // declaration: void scala$reflect$internal$Trees$UnderConstructionTransformer$_setter_$scala$reflect$internal$Trees$UnderConstructionTransformer$$selfOrSuperCalls_$eq(scala.collection.mutable.Stack<scala.reflect.internal.Symbols$Symbol>)
-  public scala$reflect$internal$Trees$UnderConstructionTransformer$_setter_$scala$reflect$internal$Trees$UnderConstructionTransformer$$selfOrSuperCalls_$eq(Lscala/collection/mutable/Stack;)V
+  public final scala$reflect$internal$Trees$UnderConstructionTransformer$_setter_$scala$reflect$internal$Trees$UnderConstructionTransformer$$selfOrSuperCalls_$eq(Lscala/collection/mutable/Stack;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/transform/UnCurry.class w/compiler/scala/tools/nsc/transform/UnCurry.class
index 87ade33932..ab54f1df41 100644
--- i/compiler/scala/tools/nsc/transform/UnCurry.class
+++ w/compiler/scala/tools/nsc/transform/UnCurry.class
@@ -203,8 +203,8 @@ public abstract class scala/tools/nsc/transform/UnCurry extends scala/tools/nsc/
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$reflect$internal$transform$UnCurry$_setter_$scala$reflect$internal$transform$UnCurry$$uncurryType_$eq(Lscala/reflect/internal/tpe/TypeMaps$TypeMap;)V
+  // access flags 0x11
+  public final scala$reflect$internal$transform$UnCurry$_setter_$scala$reflect$internal$transform$UnCurry$$uncurryType_$eq(Lscala/reflect/internal/tpe/TypeMaps$TypeMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.class w/compiler/scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.class
index 5b4185eb1c..e695c97f4e 100644
--- i/compiler/scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.class
+++ w/compiler/scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.class
@@ -267,28 +267,6 @@ public abstract interface scala/tools/nsc/transform/patmat/Logic$PropositionalLo
     // parameter final  solvable
 
   // access flags 0x2
-  private default gatherEqualities$1(Lscala/collection/mutable/HashSet;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$;
-    // parameter final  vars$2
-    // parameter final  gatherEqualities$module$1
-    ALOAD 2
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$
-    IFNONNULL L0
-    ALOAD 0
-    ALOAD 1
-    ALOAD 2
-    INVOKESPECIAL scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.gatherEqualities$lzycompute$1 (Lscala/collection/mutable/HashSet;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$;
-    GOTO L1
-   L0
-    ALOAD 2
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$
-   L1
-    ARETURN
-    MAXSTACK = 3
-    MAXLOCALS = 3
-
-  // access flags 0x2
   private default gatherEqualities$lzycompute$1(Lscala/collection/mutable/HashSet;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$;
     // parameter final  vars$2
     // parameter final  gatherEqualities$module$1
@@ -1006,26 +984,6 @@ public abstract interface scala/tools/nsc/transform/patmat/Logic$PropositionalLo
     // parameter final  message
 
   // access flags 0x2
-  private default rewriteEqualsToProp$1(Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$;
-    // parameter final  rewriteEqualsToProp$module$1
-    ALOAD 1
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$
-    IFNONNULL L0
-    ALOAD 0
-    ALOAD 1
-    INVOKESPECIAL scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.rewriteEqualsToProp$lzycompute$1 (Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$;
-    GOTO L1
-   L0
-    ALOAD 1
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$
-   L1
-    ARETURN
-    MAXSTACK = 2
-    MAXLOCALS = 2
-
-  // access flags 0x2
   private default rewriteEqualsToProp$lzycompute$1(Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$;
     // parameter final  rewriteEqualsToProp$module$1
     TRYCATCHBLOCK L0 L1 L2 java/lang/Throwable
@@ -1365,7 +1323,7 @@ public abstract interface scala/tools/nsc/transform/patmat/Logic$PropositionalLo
     ALOAD 0
     ALOAD 1
     ALOAD 2
-    INVOKESPECIAL scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.gatherEqualities$1 (Lscala/collection/mutable/HashSet;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$;
+    INVOKEINTERFACE scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.scala$tools$nsc$transform$patmat$Logic$PropositionalLogic$$gatherEqualities$1 (Lscala/collection/mutable/HashSet;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$;
     ALOAD 3
     INVOKEVIRTUAL scala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$.apply (Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$Prop;)V
     RETURN
@@ -1412,7 +1370,7 @@ public abstract interface scala/tools/nsc/transform/patmat/Logic$PropositionalLo
     // parameter final  p
     ALOAD 0
     ALOAD 1
-    INVOKESPECIAL scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.rewriteEqualsToProp$1 (Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$;
+    INVOKEINTERFACE scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.scala$tools$nsc$transform$patmat$Logic$PropositionalLogic$$rewriteEqualsToProp$1 (Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$;
     ALOAD 2
     INVOKEVIRTUAL scala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$.apply (Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$Prop;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$Prop;
     ARETURN
@@ -1899,6 +1857,48 @@ public abstract interface scala/tools/nsc/transform/patmat/Logic$PropositionalLo
   // access flags 0x1401
   public abstract synthetic scala$tools$nsc$transform$patmat$Logic$PropositionalLogic$$$outer()Lscala/tools/nsc/transform/patmat/Logic;
 
+  // access flags 0x1
+  public default scala$tools$nsc$transform$patmat$Logic$PropositionalLogic$$gatherEqualities$1(Lscala/collection/mutable/HashSet;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$;
+    // parameter final  vars$2
+    // parameter final  gatherEqualities$module$1
+    ALOAD 2
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$
+    IFNONNULL L0
+    ALOAD 0
+    ALOAD 1
+    ALOAD 2
+    INVOKESPECIAL scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.gatherEqualities$lzycompute$1 (Lscala/collection/mutable/HashSet;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$;
+    GOTO L1
+   L0
+    ALOAD 2
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/tools/nsc/transform/patmat/Logic$PropositionalLogic$gatherEqualities$2$
+   L1
+    ARETURN
+    MAXSTACK = 3
+    MAXLOCALS = 3
+
+  // access flags 0x1
+  public default scala$tools$nsc$transform$patmat$Logic$PropositionalLogic$$rewriteEqualsToProp$1(Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$;
+    // parameter final  rewriteEqualsToProp$module$1
+    ALOAD 1
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$
+    IFNONNULL L0
+    ALOAD 0
+    ALOAD 1
+    INVOKESPECIAL scala/tools/nsc/transform/patmat/Logic$PropositionalLogic.rewriteEqualsToProp$lzycompute$1 (Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$;
+    GOTO L1
+   L0
+    ALOAD 1
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/tools/nsc/transform/patmat/Logic$PropositionalLogic$rewriteEqualsToProp$2$
+   L1
+    ARETURN
+    MAXSTACK = 2
+    MAXLOCALS = 2
+
   // access flags 0x401
   // signature (Lscala/sys/Prop<Ljava/lang/String;>;)V
   // declaration: void scala$tools$nsc$transform$patmat$Logic$PropositionalLogic$_setter_$budgetProp_$eq(scala.sys.Prop<java.lang.String>)
diff --git i/compiler/scala/tools/nsc/transform/patmat/Solving$CNF$TransformToCnf.class w/compiler/scala/tools/nsc/transform/patmat/Solving$CNF$TransformToCnf.class
index f5a550cc62..baf78a0869 100644
--- i/compiler/scala/tools/nsc/transform/patmat/Solving$CNF$TransformToCnf.class
+++ w/compiler/scala/tools/nsc/transform/patmat/Solving$CNF$TransformToCnf.class
@@ -824,10 +824,10 @@ public class scala/tools/nsc/transform/patmat/Solving$CNF$TransformToCnf impleme
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/ArrayBuffer<Lscala/collection/immutable/Set<Lscala/tools/nsc/transform/patmat/Lit;>;>;)V
   // declaration: void scala$tools$nsc$transform$patmat$Solving$CNF$CnfBuilder$_setter_$scala$tools$nsc$transform$patmat$Solving$CNF$CnfBuilder$$buff_$eq(scala.collection.mutable.ArrayBuffer<scala.collection.immutable.Set<scala.tools.nsc.transform.patmat.Lit>>)
-  public scala$tools$nsc$transform$patmat$Solving$CNF$CnfBuilder$_setter_$scala$tools$nsc$transform$patmat$Solving$CNF$CnfBuilder$$buff_$eq(Lscala/collection/mutable/ArrayBuffer;)V
+  public final scala$tools$nsc$transform$patmat$Solving$CNF$CnfBuilder$_setter_$scala$tools$nsc$transform$patmat$Solving$CNF$CnfBuilder$$buff_$eq(Lscala/collection/mutable/ArrayBuffer;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/transform/patmat/Solving$Solver.class w/compiler/scala/tools/nsc/transform/patmat/Solving$Solver.class
index 6e288e4559..1aa3878bb2 100644
--- i/compiler/scala/tools/nsc/transform/patmat/Solving$Solver.class
+++ w/compiler/scala/tools/nsc/transform/patmat/Solving$Solver.class
@@ -88,26 +88,6 @@ public abstract interface scala/tools/nsc/transform/patmat/Solving$Solver implem
   public abstract NoTseitinModel()Lscala/collection/immutable/Set;
 
   // access flags 0x2
-  private default TseitinSolution$2(Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$;
-    // parameter final  TseitinSolution$module$1
-    ALOAD 1
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$
-    IFNONNULL L0
-    ALOAD 0
-    ALOAD 1
-    INVOKESPECIAL scala/tools/nsc/transform/patmat/Solving$Solver.TseitinSolution$lzycompute$1 (Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$;
-    GOTO L1
-   L0
-    ALOAD 1
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$
-   L1
-    ARETURN
-    MAXSTACK = 2
-    MAXLOCALS = 2
-
-  // access flags 0x2
   private default TseitinSolution$lzycompute$1(Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$;
     // parameter final  TseitinSolution$module$1
     TRYCATCHBLOCK L0 L1 L2 java/lang/Throwable
@@ -347,7 +327,7 @@ public abstract interface scala/tools/nsc/transform/patmat/Solving$Solver implem
     INVOKEVIRTUAL scala/tools/nsc/transform/patmat/Debugging$debug$.patmat (Lscala/Function0;)V
     ALOAD 0
     ALOAD 6
-    INVOKESPECIAL scala/tools/nsc/transform/patmat/Solving$Solver.TseitinSolution$2 (Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$;
+    INVOKEINTERFACE scala/tools/nsc/transform/patmat/Solving$Solver.scala$tools$nsc$transform$patmat$Solving$Solver$$TseitinSolution$2 (Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$;
     ALOAD 8
     ALOAD 9
     INVOKEVIRTUAL scala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$.apply (Lscala/collection/immutable/Set;Lscala/collection/immutable/List;)Lscala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$3;
@@ -1262,6 +1242,26 @@ public abstract interface scala/tools/nsc/transform/patmat/Solving$Solver implem
   public abstract synthetic scala$tools$nsc$transform$patmat$Solving$Solver$$$outer()Lscala/tools/nsc/transform/patmat/Solving;
 
   // access flags 0x1
+  public default scala$tools$nsc$transform$patmat$Solving$Solver$$TseitinSolution$2(Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$;
+    // parameter final  TseitinSolution$module$1
+    ALOAD 1
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$
+    IFNONNULL L0
+    ALOAD 0
+    ALOAD 1
+    INVOKESPECIAL scala/tools/nsc/transform/patmat/Solving$Solver.TseitinSolution$lzycompute$1 (Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$;
+    GOTO L1
+   L0
+    ALOAD 1
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/tools/nsc/transform/patmat/Solving$Solver$TseitinSolution$4$
+   L1
+    ARETURN
+    MAXSTACK = 2
+    MAXLOCALS = 2
+
+  // access flags 0x1
   // signature (Lscala/collection/immutable/Set<Lscala/tools/nsc/transform/patmat/Lit;>;Lscala/collection/immutable/Map<Ljava/lang/Object;Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$Sym;>;)Lscala/collection/immutable/Map<Lscala/tools/nsc/transform/patmat/Logic$PropositionalLogic$Sym;Ljava/lang/Object;>;
   // declaration: scala.collection.immutable.Map<scala.tools.nsc.transform.patmat.Logic$PropositionalLogic$Sym, java.lang.Object> scala$tools$nsc$transform$patmat$Solving$Solver$$projectToModel(scala.collection.immutable.Set<scala.tools.nsc.transform.patmat.Lit>, scala.collection.immutable.Map<java.lang.Object, scala.tools.nsc.transform.patmat.Logic$PropositionalLogic$Sym>)
   public default scala$tools$nsc$transform$patmat$Solving$Solver$$projectToModel(Lscala/collection/immutable/Set;Lscala/collection/immutable/Map;)Lscala/collection/immutable/Map;
diff --git i/compiler/scala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis.class w/compiler/scala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis.class
index 6027fd92d7..a2f4f19827 100644
--- i/compiler/scala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis.class
+++ w/compiler/scala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis.class
@@ -60,7 +60,7 @@ public abstract interface scala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$C
     ASTORE 2
     ALOAD 0
     ALOAD 2
-    INVOKESPECIAL scala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis.typeArgsToWildcardsExceptArray$1 (Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis$typeArgsToWildcardsExceptArray$2$;
+    INVOKEINTERFACE scala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis.scala$tools$nsc$transform$patmat$TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis$$typeArgsToWildcardsExceptArray$1 (Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis$typeArgsToWildcardsExceptArray$2$;
     ALOAD 1
     INVOKEVIRTUAL scala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis$typeArgsToWildcardsExceptArray$2$.apply (Lscala/reflect/internal/Types$Type;)Lscala/reflect/internal/Types$Type;
     ASTORE 3
@@ -1188,8 +1188,8 @@ public abstract interface scala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$C
   // access flags 0x1401
   public abstract synthetic scala$tools$nsc$transform$patmat$TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis$$$outer()Lscala/tools/nsc/transform/patmat/TreeAndTypeAnalysis;
 
-  // access flags 0x2
-  private default typeArgsToWildcardsExceptArray$1(Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis$typeArgsToWildcardsExceptArray$2$;
+  // access flags 0x1
+  public default scala$tools$nsc$transform$patmat$TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis$$typeArgsToWildcardsExceptArray$1(Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/transform/patmat/TreeAndTypeAnalysis$CheckableTreeAndTypeAnalysis$typeArgsToWildcardsExceptArray$2$;
     // parameter final  typeArgsToWildcardsExceptArray$module$1
     ALOAD 1
     GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
diff --git i/compiler/scala/tools/nsc/typechecker/Contexts$Context$$anon$1.class w/compiler/scala/tools/nsc/typechecker/Contexts$Context$$anon$1.class
index b47b3eb491..ffee6a6996 100644
--- i/compiler/scala/tools/nsc/typechecker/Contexts$Context$$anon$1.class
+++ w/compiler/scala/tools/nsc/typechecker/Contexts$Context$$anon$1.class
@@ -119,8 +119,8 @@ public final class scala/tools/nsc/typechecker/Contexts$Context$$anon$1 extends
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$tools$nsc$typechecker$Contexts$ImportContext$_setter_$scala$tools$nsc$typechecker$Contexts$ImportContext$$impInfo_$eq(Lscala/tools/nsc/typechecker/Contexts$ImportInfo;)V
+  // access flags 0x11
+  public final scala$tools$nsc$typechecker$Contexts$ImportContext$_setter_$scala$tools$nsc$typechecker$Contexts$ImportContext$$impInfo_$eq(Lscala/tools/nsc/typechecker/Contexts$ImportInfo;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/typechecker/Duplicators.class w/compiler/scala/tools/nsc/typechecker/Duplicators.class
index a27db6e857..f2179bcc03 100644
--- i/compiler/scala/tools/nsc/typechecker/Duplicators.class
+++ w/compiler/scala/tools/nsc/typechecker/Duplicators.class
@@ -3623,10 +3623,10 @@ public abstract class scala/tools/nsc/typechecker/Duplicators implements scala/t
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/Function1<Lscala/tools/nsc/typechecker/Macros$MacroArgs;Ljava/lang/Object;>;>;)V
   // declaration: void scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Symbols$Symbol, scala.Function1<scala.tools.nsc.typechecker.Macros$MacroArgs, java.lang.Object>>)
-  public scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4059,10 +4059,10 @@ public abstract class scala/tools/nsc/typechecker/Duplicators implements scala/t
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/Function0<Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(scala.Function0<java.lang.Object>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(Lscala/Function0;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(Lscala/Function0;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4071,10 +4071,10 @@ public abstract class scala/tools/nsc/typechecker/Duplicators implements scala/t
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Types$Type;Lscala/collection/immutable/List<Lscala/collection/immutable/List<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Types$Type, scala.collection.immutable.List<scala.collection.immutable.List<scala.tools.nsc.typechecker.Implicits$ImplicitInfo>>>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4083,10 +4083,10 @@ public abstract class scala/tools/nsc/typechecker/Duplicators implements scala/t
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/Tuple2<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(scala.collection.mutable.HashMap<scala.Tuple2<scala.tools.nsc.typechecker.Implicits$ImplicitInfo, scala.tools.nsc.typechecker.Implicits$ImplicitInfo>, java.lang.Object>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4095,10 +4095,10 @@ public abstract class scala/tools/nsc/typechecker/Duplicators implements scala/t
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Symbols$Symbol, scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Symbols$Symbol, scala.collection.immutable.List<scala.tools.nsc.typechecker.Implicits$ImplicitInfo>>>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4275,10 +4275,10 @@ public abstract class scala/tools/nsc/typechecker/Duplicators implements scala/t
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Trees$Tree;Lscala/collection/mutable/Set<Ljava/lang/Object;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Trees$Tree, scala.collection.mutable.Set<java.lang.Object>>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4287,10 +4287,10 @@ public abstract class scala/tools/nsc/typechecker/Duplicators implements scala/t
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/reflect/internal/util/WeakHashSet<Lscala/reflect/internal/Trees$Tree;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(scala.reflect.internal.util.WeakHashSet<scala.reflect.internal.Trees$Tree>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(Lscala/reflect/internal/util/WeakHashSet;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(Lscala/reflect/internal/util/WeakHashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4299,10 +4299,10 @@ public abstract class scala/tools/nsc/typechecker/Duplicators implements scala/t
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashSet<Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(scala.collection.mutable.HashSet<java.lang.Object>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(Lscala/collection/mutable/HashSet;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(Lscala/collection/mutable/HashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4750,10 +4750,10 @@ public abstract class scala/tools/nsc/typechecker/Duplicators implements scala/t
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/reflect/internal/util/Position;Lscala/Function0<Ljava/lang/String;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(scala.collection.mutable.HashMap<scala.reflect.internal.util.Position, scala.Function0<java.lang.String>>)
-  public scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/typechecker/Macros.class w/compiler/scala/tools/nsc/typechecker/Macros.class
index b0e393cf6d..b84fd8f3c9 100644
--- i/compiler/scala/tools/nsc/typechecker/Macros.class
+++ w/compiler/scala/tools/nsc/typechecker/Macros.class
@@ -232,32 +232,6 @@ public abstract interface scala/tools/nsc/typechecker/Macros implements scala/re
   public abstract Success()Lscala/tools/nsc/typechecker/Macros$Success$;
 
   // access flags 0x2
-  private default UnsigmaTypeMap$1(Lscala/reflect/internal/Trees$DefDef;Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/Map;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$;
-    // parameter final  macroDdef$1
-    // parameter final  implCtxParam$1
-    // parameter final  implToDef$1
-    // parameter final  UnsigmaTypeMap$module$1
-    ALOAD 4
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$
-    IFNONNULL L0
-    ALOAD 0
-    ALOAD 1
-    ALOAD 2
-    ALOAD 3
-    ALOAD 4
-    INVOKESPECIAL scala/tools/nsc/typechecker/Macros.UnsigmaTypeMap$lzycompute$1 (Lscala/reflect/internal/Trees$DefDef;Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/Map;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$;
-    GOTO L1
-   L0
-    ALOAD 4
-    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
-    CHECKCAST scala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$
-   L1
-    ARETURN
-    MAXSTACK = 5
-    MAXLOCALS = 5
-
-  // access flags 0x2
   private default UnsigmaTypeMap$lzycompute$1(Lscala/reflect/internal/Trees$DefDef;Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/Map;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$;
     // parameter final  macroDdef$1
     // parameter final  implCtxParam$1
@@ -3311,6 +3285,32 @@ public abstract interface scala/tools/nsc/typechecker/Macros implements scala/re
     MAXLOCALS = 1
 
   // access flags 0x1
+  public default scala$tools$nsc$typechecker$Macros$$UnsigmaTypeMap$1(Lscala/reflect/internal/Trees$DefDef;Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/Map;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$;
+    // parameter final  macroDdef$1
+    // parameter final  implCtxParam$1
+    // parameter final  implToDef$1
+    // parameter final  UnsigmaTypeMap$module$1
+    ALOAD 4
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$
+    IFNONNULL L0
+    ALOAD 0
+    ALOAD 1
+    ALOAD 2
+    ALOAD 3
+    ALOAD 4
+    INVOKESPECIAL scala/tools/nsc/typechecker/Macros.UnsigmaTypeMap$lzycompute$1 (Lscala/reflect/internal/Trees$DefDef;Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/Map;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$;
+    GOTO L1
+   L0
+    ALOAD 4
+    GETFIELD scala/runtime/VolatileObjectRef.elem : Ljava/lang/Object;
+    CHECKCAST scala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$
+   L1
+    ARETURN
+    MAXSTACK = 5
+    MAXLOCALS = 5
+
+  // access flags 0x1
   // signature (Lscala/reflect/internal/Trees$Tree;)Lscala/collection/mutable/Set<Ljava/lang/Object;>;
   // declaration: scala.collection.mutable.Set<java.lang.Object> scala$tools$nsc$typechecker$Macros$$calculateUndetparams(scala.reflect.internal.Trees$Tree)
   public default scala$tools$nsc$typechecker$Macros$$calculateUndetparams(Lscala/reflect/internal/Trees$Tree;)Lscala/collection/mutable/Set;
@@ -4087,7 +4087,7 @@ public abstract interface scala/tools/nsc/typechecker/Macros implements scala/re
     ALOAD 10
     ALOAD 13
     ALOAD 12
-    INVOKESPECIAL scala/tools/nsc/typechecker/Macros.UnsigmaTypeMap$1 (Lscala/reflect/internal/Trees$DefDef;Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/Map;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$;
+    INVOKEINTERFACE scala/tools/nsc/typechecker/Macros.scala$tools$nsc$typechecker$Macros$$UnsigmaTypeMap$1 (Lscala/reflect/internal/Trees$DefDef;Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/Map;Lscala/runtime/VolatileObjectRef;)Lscala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$;
     ALOAD 1
     INVOKEVIRTUAL scala/tools/nsc/typechecker/Macros$UnsigmaTypeMap$2$.apply (Lscala/reflect/internal/Types$Type;)Lscala/reflect/internal/Types$Type;
     ASTORE 4
diff --git i/compiler/scala/tools/nsc/typechecker/StructuredTypeStrings$intoNodes$.class w/compiler/scala/tools/nsc/typechecker/StructuredTypeStrings$intoNodes$.class
index 751b5fe023..7c2e30d1fd 100644
--- i/compiler/scala/tools/nsc/typechecker/StructuredTypeStrings$intoNodes$.class
+++ w/compiler/scala/tools/nsc/typechecker/StructuredTypeStrings$intoNodes$.class
@@ -85,10 +85,10 @@ public class scala/tools/nsc/typechecker/StructuredTypeStrings$intoNodes$ implem
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/Set<Lscala/reflect/internal/Symbols$Symbol;>;)V
   // declaration: void scala$tools$nsc$typechecker$DestructureTypes$DestructureType$_setter_$scala$tools$nsc$typechecker$DestructureTypes$DestructureType$$openSymbols_$eq(scala.collection.mutable.Set<scala.reflect.internal.Symbols$Symbol>)
-  public scala$tools$nsc$typechecker$DestructureTypes$DestructureType$_setter_$scala$tools$nsc$typechecker$DestructureTypes$DestructureType$$openSymbols_$eq(Lscala/collection/mutable/Set;)V
+  public final scala$tools$nsc$typechecker$DestructureTypes$DestructureType$_setter_$scala$tools$nsc$typechecker$DestructureTypes$DestructureType$$openSymbols_$eq(Lscala/collection/mutable/Set;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/typechecker/TreeCheckers.class w/compiler/scala/tools/nsc/typechecker/TreeCheckers.class
index aa960410b2..5e4f7c3f4d 100644
--- i/compiler/scala/tools/nsc/typechecker/TreeCheckers.class
+++ w/compiler/scala/tools/nsc/typechecker/TreeCheckers.class
@@ -4401,10 +4401,10 @@ public abstract class scala/tools/nsc/typechecker/TreeCheckers implements scala/
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/Function1<Lscala/tools/nsc/typechecker/Macros$MacroArgs;Ljava/lang/Object;>;>;)V
   // declaration: void scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Symbols$Symbol, scala.Function1<scala.tools.nsc.typechecker.Macros$MacroArgs, java.lang.Object>>)
-  public scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4758,10 +4758,10 @@ public abstract class scala/tools/nsc/typechecker/TreeCheckers implements scala/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/Function0<Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(scala.Function0<java.lang.Object>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(Lscala/Function0;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(Lscala/Function0;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4770,10 +4770,10 @@ public abstract class scala/tools/nsc/typechecker/TreeCheckers implements scala/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Types$Type;Lscala/collection/immutable/List<Lscala/collection/immutable/List<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Types$Type, scala.collection.immutable.List<scala.collection.immutable.List<scala.tools.nsc.typechecker.Implicits$ImplicitInfo>>>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4782,10 +4782,10 @@ public abstract class scala/tools/nsc/typechecker/TreeCheckers implements scala/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/Tuple2<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(scala.collection.mutable.HashMap<scala.Tuple2<scala.tools.nsc.typechecker.Implicits$ImplicitInfo, scala.tools.nsc.typechecker.Implicits$ImplicitInfo>, java.lang.Object>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4794,10 +4794,10 @@ public abstract class scala/tools/nsc/typechecker/TreeCheckers implements scala/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Symbols$Symbol, scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Symbols$Symbol, scala.collection.immutable.List<scala.tools.nsc.typechecker.Implicits$ImplicitInfo>>>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4974,10 +4974,10 @@ public abstract class scala/tools/nsc/typechecker/TreeCheckers implements scala/
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Trees$Tree;Lscala/collection/mutable/Set<Ljava/lang/Object;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Trees$Tree, scala.collection.mutable.Set<java.lang.Object>>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4986,10 +4986,10 @@ public abstract class scala/tools/nsc/typechecker/TreeCheckers implements scala/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/reflect/internal/util/WeakHashSet<Lscala/reflect/internal/Trees$Tree;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(scala.reflect.internal.util.WeakHashSet<scala.reflect.internal.Trees$Tree>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(Lscala/reflect/internal/util/WeakHashSet;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(Lscala/reflect/internal/util/WeakHashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4998,10 +4998,10 @@ public abstract class scala/tools/nsc/typechecker/TreeCheckers implements scala/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashSet<Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(scala.collection.mutable.HashSet<java.lang.Object>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(Lscala/collection/mutable/HashSet;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(Lscala/collection/mutable/HashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -6238,10 +6238,10 @@ public abstract class scala/tools/nsc/typechecker/TreeCheckers implements scala/
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/reflect/internal/util/Position;Lscala/Function0<Ljava/lang/String;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(scala.collection.mutable.HashMap<scala.reflect.internal.util.Position, scala.Function0<java.lang.String>>)
-  public scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/typechecker/TypeStrings$.class w/compiler/scala/tools/nsc/typechecker/TypeStrings$.class
index 8cce9722a0..1e0e1d4b91 100644
--- i/compiler/scala/tools/nsc/typechecker/TypeStrings$.class
+++ w/compiler/scala/tools/nsc/typechecker/TypeStrings$.class
@@ -71,10 +71,10 @@ public final class scala/tools/nsc/typechecker/TypeStrings$ implements scala/too
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Ljava/lang/Class<Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$TypeStrings$_setter_$scala$tools$nsc$typechecker$TypeStrings$$ObjectClass_$eq(java.lang.Class<java.lang.Object>)
-  public scala$tools$nsc$typechecker$TypeStrings$_setter_$scala$tools$nsc$typechecker$TypeStrings$$ObjectClass_$eq(Ljava/lang/Class;)V
+  public final scala$tools$nsc$typechecker$TypeStrings$_setter_$scala$tools$nsc$typechecker$TypeStrings$$ObjectClass_$eq(Ljava/lang/Class;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -83,10 +83,10 @@ public final class scala/tools/nsc/typechecker/TypeStrings$ implements scala/too
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/immutable/Map<Ljava/lang/String;Ljava/lang/String;>;)V
   // declaration: void scala$tools$nsc$typechecker$TypeStrings$_setter_$scala$tools$nsc$typechecker$TypeStrings$$primitiveMap_$eq(scala.collection.immutable.Map<java.lang.String, java.lang.String>)
-  public scala$tools$nsc$typechecker$TypeStrings$_setter_$scala$tools$nsc$typechecker$TypeStrings$$primitiveMap_$eq(Lscala/collection/immutable/Map;)V
+  public final scala$tools$nsc$typechecker$TypeStrings$_setter_$scala$tools$nsc$typechecker$TypeStrings$$primitiveMap_$eq(Lscala/collection/immutable/Map;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -95,10 +95,10 @@ public final class scala/tools/nsc/typechecker/TypeStrings$ implements scala/too
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/immutable/Set<Ljava/lang/String;>;)V
   // declaration: void scala$tools$nsc$typechecker$TypeStrings$_setter_$scala$tools$nsc$typechecker$TypeStrings$$primitives_$eq(scala.collection.immutable.Set<java.lang.String>)
-  public scala$tools$nsc$typechecker$TypeStrings$_setter_$scala$tools$nsc$typechecker$TypeStrings$$primitives_$eq(Lscala/collection/immutable/Set;)V
+  public final scala$tools$nsc$typechecker$TypeStrings$_setter_$scala$tools$nsc$typechecker$TypeStrings$$primitives_$eq(Lscala/collection/immutable/Set;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/typechecker/Typers$Typer.class w/compiler/scala/tools/nsc/typechecker/Typers$Typer.class
index 0305e83b9c..edf9431bf6 100644
--- i/compiler/scala/tools/nsc/typechecker/Typers$Typer.class
+++ w/compiler/scala/tools/nsc/typechecker/Typers$Typer.class
@@ -16008,8 +16008,8 @@ public abstract class scala/tools/nsc/typechecker/Typers$Typer implements scala/
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$tools$nsc$typechecker$Tags$Tag$_setter_$scala$tools$nsc$typechecker$Tags$Tag$$runDefinitions_$eq(Lscala/reflect/internal/Definitions$DefinitionsClass$RunDefinitions;)V
+  // access flags 0x11
+  public final scala$tools$nsc$typechecker$Tags$Tag$_setter_$scala$tools$nsc$typechecker$Tags$Tag$$runDefinitions_$eq(Lscala/reflect/internal/Definitions$DefinitionsClass$RunDefinitions;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/nsc/util/ShowPickled$.class w/compiler/scala/tools/nsc/util/ShowPickled$.class
index ea201b8000..6887eeddb0 100644
--- i/compiler/scala/tools/nsc/util/ShowPickled$.class
+++ w/compiler/scala/tools/nsc/util/ShowPickled$.class
@@ -1630,8 +1630,8 @@ public final class scala/tools/nsc/util/ShowPickled$ implements scala/reflect/in
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
-  public scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$nameLock_$eq(Ljava/lang/Object;)V
+  // access flags 0x11
+  public final scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$nameLock_$eq(Ljava/lang/Object;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -1640,8 +1640,8 @@ public final class scala/tools/nsc/util/ShowPickled$ implements scala/reflect/in
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
-  public scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$termHashtable_$eq([Lscala/reflect/internal/Names$TermName;)V
+  // access flags 0x11
+  public final scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$termHashtable_$eq([Lscala/reflect/internal/Names$TermName;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -1650,8 +1650,8 @@ public final class scala/tools/nsc/util/ShowPickled$ implements scala/reflect/in
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
-  public scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$typeHashtable_$eq([Lscala/reflect/internal/Names$TypeName;)V
+  // access flags 0x11
+  public final scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$typeHashtable_$eq([Lscala/reflect/internal/Names$TypeName;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/reflect/ReflectGlobal$$anon$1.class w/compiler/scala/tools/reflect/ReflectGlobal$$anon$1.class
index df3592413f..e02301b669 100644
--- i/compiler/scala/tools/reflect/ReflectGlobal$$anon$1.class
+++ w/compiler/scala/tools/reflect/ReflectGlobal$$anon$1.class
@@ -3540,10 +3540,10 @@ public final class scala/tools/reflect/ReflectGlobal$$anon$1 implements scala/to
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/Function1<Lscala/tools/nsc/typechecker/Macros$MacroArgs;Ljava/lang/Object;>;>;)V
   // declaration: void scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Symbols$Symbol, scala.Function1<scala.tools.nsc.typechecker.Macros$MacroArgs, java.lang.Object>>)
-  public scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$reflect$macros$runtime$MacroRuntimes$_setter_$scala$reflect$macros$runtime$MacroRuntimes$$macroRuntimesCache_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -3897,10 +3897,10 @@ public final class scala/tools/reflect/ReflectGlobal$$anon$1 implements scala/to
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/Function0<Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(scala.Function0<java.lang.Object>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(Lscala/Function0;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitSearchId_$eq(Lscala/Function0;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -3909,10 +3909,10 @@ public final class scala/tools/reflect/ReflectGlobal$$anon$1 implements scala/to
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Types$Type;Lscala/collection/immutable/List<Lscala/collection/immutable/List<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Types$Type, scala.collection.immutable.List<scala.collection.immutable.List<scala.tools.nsc.typechecker.Implicits$ImplicitInfo>>>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$implicitsCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -3921,10 +3921,10 @@ public final class scala/tools/reflect/ReflectGlobal$$anon$1 implements scala/to
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/Tuple2<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(scala.collection.mutable.HashMap<scala.Tuple2<scala.tools.nsc.typechecker.Implicits$ImplicitInfo, scala.tools.nsc.typechecker.Implicits$ImplicitInfo>, java.lang.Object>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$improvesCache_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -3933,10 +3933,10 @@ public final class scala/tools/reflect/ReflectGlobal$$anon$1 implements scala/to
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/mutable/LinkedHashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/collection/immutable/List<Lscala/tools/nsc/typechecker/Implicits$ImplicitInfo;>;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Symbols$Symbol, scala.collection.mutable.LinkedHashMap<scala.reflect.internal.Symbols$Symbol, scala.collection.immutable.List<scala.tools.nsc.typechecker.Implicits$ImplicitInfo>>>)
-  public scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
+  public final scala$tools$nsc$typechecker$Implicits$_setter_$scala$tools$nsc$typechecker$Implicits$$infoMapCache_$eq(Lscala/collection/mutable/LinkedHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4113,10 +4113,10 @@ public final class scala/tools/reflect/ReflectGlobal$$anon$1 implements scala/to
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Trees$Tree;Lscala/collection/mutable/Set<Ljava/lang/Object;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Trees$Tree, scala.collection.mutable.Set<java.lang.Object>>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$delayed_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4125,10 +4125,10 @@ public final class scala/tools/reflect/ReflectGlobal$$anon$1 implements scala/to
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/reflect/internal/util/WeakHashSet<Lscala/reflect/internal/Trees$Tree;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(scala.reflect.internal.util.WeakHashSet<scala.reflect.internal.Trees$Tree>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(Lscala/reflect/internal/util/WeakHashSet;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$forced_$eq(Lscala/reflect/internal/util/WeakHashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4137,10 +4137,10 @@ public final class scala/tools/reflect/ReflectGlobal$$anon$1 implements scala/to
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashSet<Ljava/lang/Object;>;)V
   // declaration: void scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(scala.collection.mutable.HashSet<java.lang.Object>)
-  public scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(Lscala/collection/mutable/HashSet;)V
+  public final scala$tools$nsc$typechecker$Macros$_setter_$scala$tools$nsc$typechecker$Macros$$undetparams_$eq(Lscala/collection/mutable/HashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -4588,10 +4588,10 @@ public final class scala/tools/reflect/ReflectGlobal$$anon$1 implements scala/to
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/reflect/internal/util/Position;Lscala/Function0<Ljava/lang/String;>;>;)V
   // declaration: void scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(scala.collection.mutable.HashMap<scala.reflect.internal.util.Position, scala.Function0<java.lang.String>>)
-  public scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$tools$nsc$typechecker$TypeDiagnostics$_setter_$scala$tools$nsc$typechecker$TypeDiagnostics$$addendums_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/compiler/scala/tools/reflect/ReflectGlobal.class w/compiler/scala/tools/reflect/ReflectGlobal.class
index 263471bda1..daf812b557 100644
--- i/compiler/scala/tools/reflect/ReflectGlobal.class
+++ w/compiler/scala/tools/reflect/ReflectGlobal.class
@@ -1699,10 +1699,10 @@ public class scala/tools/reflect/ReflectGlobal extends scala/tools/nsc/Global  i
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Types$Type;Ljava/lang/ref/WeakReference<Lscala/reflect/internal/Types$Type;>;>;)V
   // declaration: void scala$reflect$runtime$SynchronizedTypes$_setter_$scala$reflect$runtime$SynchronizedTypes$$uniques_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Types$Type, java.lang.ref.WeakReference<scala.reflect.internal.Types$Type>>)
-  public scala$reflect$runtime$SynchronizedTypes$_setter_$scala$reflect$runtime$SynchronizedTypes$$uniques_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$reflect$runtime$SynchronizedTypes$_setter_$scala$reflect$runtime$SynchronizedTypes$$uniques_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/library/library.properties w/library/library.properties
index d3af9a683d..7aae7a850e 100644
--- i/library/library.properties
+++ w/library/library.properties
@@ -1,4 +1,4 @@
-#Thu, 02 Jun 2016 12:57:52 -0700
+#Thu, 02 Jun 2016 13:02:36 -0700
 
 version.number=2.12.0-20160602-100833-8775ec53d8
 maven.version.number=2.12.0-SNAPSHOT
diff --git i/library/scala/collection/parallel/ExecutionContextTaskSupport.class w/library/scala/collection/parallel/ExecutionContextTaskSupport.class
index 085e0e2359..889a335582 100644
--- i/library/scala/collection/parallel/ExecutionContextTaskSupport.class
+++ w/library/scala/collection/parallel/ExecutionContextTaskSupport.class
@@ -72,8 +72,8 @@ public class scala/collection/parallel/ExecutionContextTaskSupport implements sc
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$collection$parallel$ExecutionContextTasks$_setter_$scala$collection$parallel$ExecutionContextTasks$$driver_$eq(Lscala/collection/parallel/Tasks;)V
+  // access flags 0x11
+  public final scala$collection$parallel$ExecutionContextTasks$_setter_$scala$collection$parallel$ExecutionContextTasks$$driver_$eq(Lscala/collection/parallel/Tasks;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/library/scala/collection/parallel/ParIterableLike$$anon$5.class w/library/scala/collection/parallel/ParIterableLike$$anon$5.class
index e8d94d4ada..bc51037bb9 100644
--- i/library/scala/collection/parallel/ParIterableLike$$anon$5.class
+++ w/library/scala/collection/parallel/ParIterableLike$$anon$5.class
@@ -38,8 +38,8 @@ public final class scala/collection/parallel/ParIterableLike$$anon$5 extends sca
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
+  // access flags 0x11
+  public final scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/library/scala/collection/parallel/ParIterableLike$$anon$6.class w/library/scala/collection/parallel/ParIterableLike$$anon$6.class
index 2c1f6092e7..23a67b99c2 100644
--- i/library/scala/collection/parallel/ParIterableLike$$anon$6.class
+++ w/library/scala/collection/parallel/ParIterableLike$$anon$6.class
@@ -38,8 +38,8 @@ public final class scala/collection/parallel/ParIterableLike$$anon$6 extends sca
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
+  // access flags 0x11
+  public final scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/library/scala/collection/parallel/ParIterableLike$$anon$7.class w/library/scala/collection/parallel/ParIterableLike$$anon$7.class
index 422a7078fd..26c856ea61 100644
--- i/library/scala/collection/parallel/ParIterableLike$$anon$7.class
+++ w/library/scala/collection/parallel/ParIterableLike$$anon$7.class
@@ -38,8 +38,8 @@ public final class scala/collection/parallel/ParIterableLike$$anon$7 extends sca
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
+  // access flags 0x11
+  public final scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/library/scala/collection/parallel/ParSeqLike$$anon$3.class w/library/scala/collection/parallel/ParSeqLike$$anon$3.class
index 857fdc463b..a08ceab99b 100644
--- i/library/scala/collection/parallel/ParSeqLike$$anon$3.class
+++ w/library/scala/collection/parallel/ParSeqLike$$anon$3.class
@@ -38,8 +38,8 @@ public final class scala/collection/parallel/ParSeqLike$$anon$3 extends scala/co
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
+  // access flags 0x11
+  public final scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/library/scala/collection/parallel/ParSeqLike$$anon$4.class w/library/scala/collection/parallel/ParSeqLike$$anon$4.class
index d05c4125c9..180a35978f 100644
--- i/library/scala/collection/parallel/ParSeqLike$$anon$4.class
+++ w/library/scala/collection/parallel/ParSeqLike$$anon$4.class
@@ -38,8 +38,8 @@ public final class scala/collection/parallel/ParSeqLike$$anon$4 extends scala/co
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
+  // access flags 0x11
+  public final scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/library/scala/collection/parallel/ParSeqLike$$anon$5.class w/library/scala/collection/parallel/ParSeqLike$$anon$5.class
index 44237c2930..9d29a18a30 100644
--- i/library/scala/collection/parallel/ParSeqLike$$anon$5.class
+++ w/library/scala/collection/parallel/ParSeqLike$$anon$5.class
@@ -38,8 +38,8 @@ public final class scala/collection/parallel/ParSeqLike$$anon$5 extends scala/co
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
+  // access flags 0x11
+  public final scala$collection$generic$AtomicIndexFlag$_setter_$scala$collection$generic$AtomicIndexFlag$$intflag_$eq(Ljava/util/concurrent/atomic/AtomicInteger;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/library/scala/concurrent/Future$InternalCallbackExecutor$.class w/library/scala/concurrent/Future$InternalCallbackExecutor$.class
index d9a3750509..1e2c8c0748 100644
--- i/library/scala/concurrent/Future$InternalCallbackExecutor$.class
+++ w/library/scala/concurrent/Future$InternalCallbackExecutor$.class
@@ -57,10 +57,10 @@ public class scala/concurrent/Future$InternalCallbackExecutor$ implements scala/
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Ljava/lang/ThreadLocal<Lscala/collection/immutable/List<Ljava/lang/Runnable;>;>;)V
   // declaration: void scala$concurrent$BatchingExecutor$_setter_$scala$concurrent$BatchingExecutor$$_tasksLocal_$eq(java.lang.ThreadLocal<scala.collection.immutable.List<java.lang.Runnable>>)
-  public scala$concurrent$BatchingExecutor$_setter_$scala$concurrent$BatchingExecutor$$_tasksLocal_$eq(Ljava/lang/ThreadLocal;)V
+  public final scala$concurrent$BatchingExecutor$_setter_$scala$concurrent$BatchingExecutor$$_tasksLocal_$eq(Ljava/lang/ThreadLocal;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/library/scala/util/matching/Regex$MatchIterator$$anon$1.class w/library/scala/util/matching/Regex$MatchIterator$$anon$1.class
index fae27a2c1a..d33e24909d 100644
--- i/library/scala/util/matching/Regex$MatchIterator$$anon$1.class
+++ w/library/scala/util/matching/Regex$MatchIterator$$anon$1.class
@@ -95,8 +95,8 @@ public final class scala/util/matching/Regex$MatchIterator$$anon$1 extends scala
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$util$matching$Regex$Replacement$_setter_$scala$util$matching$Regex$Replacement$$sb_$eq(Ljava/lang/StringBuffer;)V
+  // access flags 0x11
+  public final scala$util$matching$Regex$Replacement$_setter_$scala$util$matching$Regex$Replacement$$sb_$eq(Ljava/lang/StringBuffer;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/reflect/reflect.properties w/reflect/reflect.properties
index 8166264698..7076890700 100644
--- i/reflect/reflect.properties
+++ w/reflect/reflect.properties
@@ -1,4 +1,4 @@
-#Thu, 02 Jun 2016 12:58:41 -0700
+#Thu, 02 Jun 2016 13:03:27 -0700
 
 version.number=2.12.0-20160602-100833-8775ec53d8
 maven.version.number=2.12.0-SNAPSHOT
diff --git i/reflect/scala/reflect/internal/Chars$.class w/reflect/scala/reflect/internal/Chars$.class
index 8916f843ee..bcde9e3df7 100644
--- i/reflect/scala/reflect/internal/Chars$.class
+++ w/reflect/scala/reflect/internal/Chars$.class
@@ -67,8 +67,8 @@ public final class scala/reflect/internal/Chars$ implements scala/reflect/intern
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$reflect$internal$Chars$_setter_$scala$reflect$internal$Chars$$char2uescapeArray_$eq([C)V
+  // access flags 0x11
+  public final scala$reflect$internal$Chars$_setter_$scala$reflect$internal$Chars$$char2uescapeArray_$eq([C)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/reflect/scala/reflect/internal/Definitions$DefinitionsClass.class w/reflect/scala/reflect/internal/Definitions$DefinitionsClass.class
index d651aaf4d8..5935ae492b 100644
--- i/reflect/scala/reflect/internal/Definitions$DefinitionsClass.class
+++ w/reflect/scala/reflect/internal/Definitions$DefinitionsClass.class
@@ -26663,10 +26663,10 @@ public abstract class scala/reflect/internal/Definitions$DefinitionsClass implem
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/immutable/Map<Lscala/reflect/internal/Names$Name;Ljava/lang/Object;>;)V
   // declaration: void scala$reflect$internal$Definitions$ValueClassDefinitions$_setter_$scala$reflect$internal$Definitions$ValueClassDefinitions$$nameToTag_$eq(scala.collection.immutable.Map<scala.reflect.internal.Names$Name, java.lang.Object>)
-  public scala$reflect$internal$Definitions$ValueClassDefinitions$_setter_$scala$reflect$internal$Definitions$ValueClassDefinitions$$nameToTag_$eq(Lscala/collection/immutable/Map;)V
+  public final scala$reflect$internal$Definitions$ValueClassDefinitions$_setter_$scala$reflect$internal$Definitions$ValueClassDefinitions$$nameToTag_$eq(Lscala/collection/immutable/Map;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -26675,10 +26675,10 @@ public abstract class scala/reflect/internal/Definitions$DefinitionsClass implem
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/immutable/Map<Lscala/reflect/internal/Names$Name;Ljava/lang/Object;>;)V
   // declaration: void scala$reflect$internal$Definitions$ValueClassDefinitions$_setter_$scala$reflect$internal$Definitions$ValueClassDefinitions$$nameToWeight_$eq(scala.collection.immutable.Map<scala.reflect.internal.Names$Name, java.lang.Object>)
-  public scala$reflect$internal$Definitions$ValueClassDefinitions$_setter_$scala$reflect$internal$Definitions$ValueClassDefinitions$$nameToWeight_$eq(Lscala/collection/immutable/Map;)V
+  public final scala$reflect$internal$Definitions$ValueClassDefinitions$_setter_$scala$reflect$internal$Definitions$ValueClassDefinitions$$nameToWeight_$eq(Lscala/collection/immutable/Map;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/reflect/scala/reflect/internal/SymbolTable.class w/reflect/scala/reflect/internal/SymbolTable.class
index 78377a1b51..cfd911f0e4 100644
--- i/reflect/scala/reflect/internal/SymbolTable.class
+++ w/reflect/scala/reflect/internal/SymbolTable.class
@@ -13496,8 +13496,8 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
-  public scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$nameLock_$eq(Ljava/lang/Object;)V
+  // access flags 0x11
+  public final scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$nameLock_$eq(Ljava/lang/Object;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -13506,8 +13506,8 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
-  public scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$termHashtable_$eq([Lscala/reflect/internal/Names$TermName;)V
+  // access flags 0x11
+  public final scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$termHashtable_$eq([Lscala/reflect/internal/Names$TermName;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -13516,8 +13516,8 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
-  public scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$typeHashtable_$eq([Lscala/reflect/internal/Names$TypeName;)V
+  // access flags 0x11
+  public final scala$reflect$internal$Names$_setter_$scala$reflect$internal$Names$$typeHashtable_$eq([Lscala/reflect/internal/Names$TypeName;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -14167,10 +14167,10 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/reflect/internal/Symbols$Symbol;Lscala/reflect/internal/Symbols$Symbol;>;)V
   // declaration: void scala$reflect$internal$Symbols$_setter_$scala$reflect$internal$Symbols$$originalOwnerMap_$eq(scala.collection.mutable.HashMap<scala.reflect.internal.Symbols$Symbol, scala.reflect.internal.Symbols$Symbol>)
-  public scala$reflect$internal$Symbols$_setter_$scala$reflect$internal$Symbols$$originalOwnerMap_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$reflect$internal$Symbols$_setter_$scala$reflect$internal$Symbols$$originalOwnerMap_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -15391,10 +15391,10 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/collection/immutable/List<Lscala/reflect/internal/Types$Type;>;Lscala/ref/WeakReference<Lscala/reflect/internal/Types$Type;>;>;)V
   // declaration: void scala$reflect$internal$Types$_setter_$scala$reflect$internal$Types$$_intersectionWitness_$eq(scala.collection.mutable.WeakHashMap<scala.collection.immutable.List<scala.reflect.internal.Types$Type>, scala.ref.WeakReference<scala.reflect.internal.Types$Type>>)
-  public scala$reflect$internal$Types$_setter_$scala$reflect$internal$Types$$_intersectionWitness_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$reflect$internal$Types$_setter_$scala$reflect$internal$Types$$_intersectionWitness_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -15403,10 +15403,10 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashSet<Lscala/reflect/internal/Types$Type;>;)V
   // declaration: void scala$reflect$internal$Types$_setter_$scala$reflect$internal$Types$$_pendingBaseTypes_$eq(scala.collection.mutable.HashSet<scala.reflect.internal.Types$Type>)
-  public scala$reflect$internal$Types$_setter_$scala$reflect$internal$Types$$_pendingBaseTypes_$eq(Lscala/collection/mutable/HashSet;)V
+  public final scala$reflect$internal$Types$_setter_$scala$reflect$internal$Types$$_pendingBaseTypes_$eq(Lscala/collection/mutable/HashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -15437,8 +15437,8 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
-  public scala$reflect$internal$Types$_setter_$scala$reflect$internal$Types$$initialUniquesCapacity_$eq(I)V
+  // access flags 0x11
+  public final scala$reflect$internal$Types$_setter_$scala$reflect$internal$Types$$initialUniquesCapacity_$eq(I)V
     // parameter final  x$1
     ALOAD 0
     ILOAD 1
@@ -15447,10 +15447,10 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashSet<Lscala/reflect/internal/Symbols$Symbol;>;)V
   // declaration: void scala$reflect$internal$Types$_setter_$scala$reflect$internal$Types$$pendingVolatiles_$eq(scala.collection.mutable.HashSet<scala.reflect.internal.Symbols$Symbol>)
-  public scala$reflect$internal$Types$_setter_$scala$reflect$internal$Types$$pendingVolatiles_$eq(Lscala/collection/mutable/HashSet;)V
+  public final scala$reflect$internal$Types$_setter_$scala$reflect$internal$Types$$pendingVolatiles_$eq(Lscala/collection/mutable/HashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -15803,10 +15803,10 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/Tuple2<Lscala/reflect/internal/Depth;Lscala/collection/immutable/List<Lscala/reflect/internal/Types$Type;>;>;Lscala/reflect/internal/Types$Type;>;)V
   // declaration: void scala$reflect$internal$tpe$GlbLubs$_setter_$scala$reflect$internal$tpe$GlbLubs$$_glbResults_$eq(scala.collection.mutable.HashMap<scala.Tuple2<scala.reflect.internal.Depth, scala.collection.immutable.List<scala.reflect.internal.Types$Type>>, scala.reflect.internal.Types$Type>)
-  public scala$reflect$internal$tpe$GlbLubs$_setter_$scala$reflect$internal$tpe$GlbLubs$$_glbResults_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$reflect$internal$tpe$GlbLubs$_setter_$scala$reflect$internal$tpe$GlbLubs$$_glbResults_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -15815,10 +15815,10 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashMap<Lscala/Tuple2<Lscala/reflect/internal/Depth;Lscala/collection/immutable/List<Lscala/reflect/internal/Types$Type;>;>;Lscala/reflect/internal/Types$Type;>;)V
   // declaration: void scala$reflect$internal$tpe$GlbLubs$_setter_$scala$reflect$internal$tpe$GlbLubs$$_lubResults_$eq(scala.collection.mutable.HashMap<scala.Tuple2<scala.reflect.internal.Depth, scala.collection.immutable.List<scala.reflect.internal.Types$Type>>, scala.reflect.internal.Types$Type>)
-  public scala$reflect$internal$tpe$GlbLubs$_setter_$scala$reflect$internal$tpe$GlbLubs$$_lubResults_$eq(Lscala/collection/mutable/HashMap;)V
+  public final scala$reflect$internal$tpe$GlbLubs$_setter_$scala$reflect$internal$tpe$GlbLubs$$_lubResults_$eq(Lscala/collection/mutable/HashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -15886,10 +15886,10 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/HashSet<Lscala/reflect/internal/tpe/TypeComparers$SubTypePair;>;)V
   // declaration: void scala$reflect$internal$tpe$TypeComparers$_setter_$scala$reflect$internal$tpe$TypeComparers$$_pendingSubTypes_$eq(scala.collection.mutable.HashSet<scala.reflect.internal.tpe.TypeComparers$SubTypePair>)
-  public scala$reflect$internal$tpe$TypeComparers$_setter_$scala$reflect$internal$tpe$TypeComparers$$_pendingSubTypes_$eq(Lscala/collection/mutable/HashSet;)V
+  public final scala$reflect$internal$tpe$TypeComparers$_setter_$scala$reflect$internal$tpe$TypeComparers$$_pendingSubTypes_$eq(Lscala/collection/mutable/HashSet;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -16153,10 +16153,10 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/reflect/internal/transform/Transforms$Lazy<Lscala/reflect/internal/transform/Erasure;>;)V
   // declaration: void scala$reflect$internal$transform$Transforms$_setter_$scala$reflect$internal$transform$Transforms$$erasureLazy_$eq(scala.reflect.internal.transform.Transforms$Lazy<scala.reflect.internal.transform.Erasure>)
-  public scala$reflect$internal$transform$Transforms$_setter_$scala$reflect$internal$transform$Transforms$$erasureLazy_$eq(Lscala/reflect/internal/transform/Transforms$Lazy;)V
+  public final scala$reflect$internal$transform$Transforms$_setter_$scala$reflect$internal$transform$Transforms$$erasureLazy_$eq(Lscala/reflect/internal/transform/Transforms$Lazy;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -16165,10 +16165,10 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/reflect/internal/transform/Transforms$Lazy<Lscala/reflect/internal/transform/PostErasure;>;)V
   // declaration: void scala$reflect$internal$transform$Transforms$_setter_$scala$reflect$internal$transform$Transforms$$postErasureLazy_$eq(scala.reflect.internal.transform.Transforms$Lazy<scala.reflect.internal.transform.PostErasure>)
-  public scala$reflect$internal$transform$Transforms$_setter_$scala$reflect$internal$transform$Transforms$$postErasureLazy_$eq(Lscala/reflect/internal/transform/Transforms$Lazy;)V
+  public final scala$reflect$internal$transform$Transforms$_setter_$scala$reflect$internal$transform$Transforms$$postErasureLazy_$eq(Lscala/reflect/internal/transform/Transforms$Lazy;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
@@ -16177,10 +16177,10 @@ public abstract class scala/reflect/internal/SymbolTable extends scala/reflect/m
     MAXSTACK = 2
     MAXLOCALS = 2
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/reflect/internal/transform/Transforms$Lazy<Lscala/reflect/internal/transform/UnCurry;>;)V
   // declaration: void scala$reflect$internal$transform$Transforms$_setter_$scala$reflect$internal$transform$Transforms$$uncurryLazy_$eq(scala.reflect.internal.transform.Transforms$Lazy<scala.reflect.internal.transform.UnCurry>)
-  public scala$reflect$internal$transform$Transforms$_setter_$scala$reflect$internal$transform$Transforms$$uncurryLazy_$eq(Lscala/reflect/internal/transform/Transforms$Lazy;)V
+  public final scala$reflect$internal$transform$Transforms$_setter_$scala$reflect$internal$transform$Transforms$$uncurryLazy_$eq(Lscala/reflect/internal/transform/Transforms$Lazy;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/reflect/scala/reflect/internal/transform/Transforms$$anon$3.class w/reflect/scala/reflect/internal/transform/Transforms$$anon$3.class
index 689019a1c1..a7281b3563 100644
--- i/reflect/scala/reflect/internal/transform/Transforms$$anon$3.class
+++ w/reflect/scala/reflect/internal/transform/Transforms$$anon$3.class
@@ -105,8 +105,8 @@ public final class scala/reflect/internal/transform/Transforms$$anon$3 implement
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
-  public scala$reflect$internal$transform$UnCurry$_setter_$scala$reflect$internal$transform$UnCurry$$uncurryType_$eq(Lscala/reflect/internal/tpe/TypeMaps$TypeMap;)V
+  // access flags 0x11
+  public final scala$reflect$internal$transform$UnCurry$_setter_$scala$reflect$internal$transform$UnCurry$$uncurryType_$eq(Lscala/reflect/internal/tpe/TypeMaps$TypeMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1
diff --git i/reflect/scala/reflect/runtime/JavaUniverse.class w/reflect/scala/reflect/runtime/JavaUniverse.class
index d15c409feb..45d48d649e 100644
--- i/reflect/scala/reflect/runtime/JavaUniverse.class
+++ w/reflect/scala/reflect/runtime/JavaUniverse.class
@@ -1926,10 +1926,10 @@ public class scala/reflect/runtime/JavaUniverse extends scala/reflect/internal/S
     MAXSTACK = 1
     MAXLOCALS = 1
 
-  // access flags 0x1
+  // access flags 0x11
   // signature (Lscala/collection/mutable/WeakHashMap<Lscala/reflect/internal/Types$Type;Ljava/lang/ref/WeakReference<Lscala/reflect/internal/Types$Type;>;>;)V
   // declaration: void scala$reflect$runtime$SynchronizedTypes$_setter_$scala$reflect$runtime$SynchronizedTypes$$uniques_$eq(scala.collection.mutable.WeakHashMap<scala.reflect.internal.Types$Type, java.lang.ref.WeakReference<scala.reflect.internal.Types$Type>>)
-  public scala$reflect$runtime$SynchronizedTypes$_setter_$scala$reflect$runtime$SynchronizedTypes$$uniques_$eq(Lscala/collection/mutable/WeakHashMap;)V
+  public final scala$reflect$runtime$SynchronizedTypes$_setter_$scala$reflect$runtime$SynchronizedTypes$$uniques_$eq(Lscala/collection/mutable/WeakHashMap;)V
     // parameter final  x$1
     ALOAD 0
     ALOAD 1