51 files changed, 243 insertions, 142 deletions
diff --git a/src/compiler/scala/reflect/internal/Trees.scala b/src/compiler/scala/reflect/internal/Trees.scala
index 0413fd9896..5f1a8f3fbe 100644
--- a/src/compiler/scala/reflect/internal/Trees.scala
+++ b/src/compiler/scala/reflect/internal/Trees.scala
@@ -144,11 +144,9 @@ trait Trees extends api.Trees { self: SymbolTable =>
      *  less than the whole tree.
      */
     def summaryString: String = tree match {
-      case Select(qual, name) => qual.summaryString + "." + name.decode
-      case Ident(name)        => name.longString
       case Literal(const)     => "Literal(" + const + ")"
-      case t: DefTree         => t.shortClass + " `" + t.name.decode + "`"
-      case t: RefTree         => t.shortClass + " `" + t.name.longString + "`"
+      case Select(qual, name) => qual.summaryString + "." + name.decode
+      case t: NameTree        => t.name.longString
       case t                  =>
         t.shortClass + (
           if (t.symbol != null && t.symbol != NoSymbol) " " + t.symbol
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index 65225b185b..eb4deeeee2 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -70,6 +70,9 @@ trait ParsersCommon extends ScannersCommon {
 
     @inline final def inBracesOrNil[T](body: => List[T]): List[T] = inBracesOrError(body, Nil)
     @inline final def inBracesOrUnit[T](body: => Tree): Tree = inBracesOrError(body, Literal(Constant()))
+    @inline final def dropAnyBraces[T](body: => T): T =
+      if (in.token == LBRACE) inBraces(body)
+      else body
 
     @inline final def inBrackets[T](body: => T): T = {
       accept(LBRACKET)
@@ -1106,7 +1109,7 @@ self =>
      *  }}}
      *  @note  The returned tree does not yet have a position
      */
-    def literal(isNegated: Boolean = false): Tree = {
+    def literal(isNegated: Boolean = false, inPattern: Boolean = false): Tree = {
       def finish(value: Any): Tree = {
         val t = Literal(Constant(value))
         in.nextToken()
@@ -1115,7 +1118,7 @@ self =>
       if (in.token == SYMBOLLIT)
         Apply(scalaDot(nme.Symbol), List(finish(in.strVal)))
       else if (in.token == INTERPOLATIONID)
-        interpolatedString()
+        interpolatedString(inPattern)
       else finish(in.token match {
         case CHARLIT   => in.charVal
         case INTLIT    => in.intVal(isNegated).toInt
@@ -1141,7 +1144,7 @@ self =>
       }
     }
 
-    private def interpolatedString(): Tree = atPos(in.offset) {
+    private def interpolatedString(inPattern: Boolean = false): Tree = atPos(in.offset) {
       val start = in.offset
       val interpolator = in.name
 
@@ -1151,8 +1154,11 @@ self =>
       while (in.token == STRINGPART) {
         partsBuf += literal()
         exprBuf += {
-          if (in.token == IDENTIFIER) atPos(in.offset)(Ident(ident()))
-          else expr()
+          if (inPattern) dropAnyBraces(pattern())
+          else {
+            if (in.token == IDENTIFIER) atPos(in.offset)(Ident(ident()))
+            else expr()
+          }
         }
       }
       if (in.token == STRINGLIT) partsBuf += literal()
@@ -1837,7 +1843,7 @@ self =>
               case INTLIT | LONGLIT | FLOATLIT | DOUBLELIT =>
                 t match {
                   case Ident(nme.MINUS) =>
-                    return atPos(start) { literal(isNegated = true) }
+                    return atPos(start) { literal(isNegated = true, inPattern = true) }
                   case _ =>
                 }
               case _ =>
@@ -1855,7 +1861,7 @@ self =>
             atPos(start, start) { Ident(nme.WILDCARD) }
           case CHARLIT | INTLIT | LONGLIT | FLOATLIT | DOUBLELIT |
                STRINGLIT | INTERPOLATIONID | SYMBOLLIT | TRUE | FALSE | NULL =>
-            atPos(start) { literal() }
+            atPos(start) { literal(inPattern = true) }
           case LPAREN =>
             atPos(start)(makeParens(noSeq.patterns()))
           case XMLSTART =>
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
index fe1c90fe67..e2d4efab83 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
@@ -67,6 +67,7 @@ trait Contexts { self: Analyzer =>
     val c = sc.make(unit, tree, sc.owner, sc.scope, sc.imports)
     if (erasedTypes) c.setThrowErrors() else c.setReportErrors()
     c.implicitsEnabled = !erasedTypes
+    c.enrichmentEnabled = c.implicitsEnabled
     c
   }
 
@@ -106,7 +107,7 @@ trait Contexts { self: Analyzer =>
     var depth: Int = 0
     var imports: List[ImportInfo] = List()   // currently visible imports
     var openImplicits: List[(Type,Tree)] = List()   // types for which implicit arguments
-                                                    // are currently searched
+                                             // are currently searched
     // for a named application block (Tree) the corresponding NamedApplyInfo
     var namedApplyBlockInfo: Option[(Tree, NamedApplyInfo)] = None
     var prefix: Type = NoPrefix
@@ -120,6 +121,7 @@ trait Contexts { self: Analyzer =>
     var diagnostic: List[String] = Nil      // these messages are printed when issuing an error
     var implicitsEnabled = false
     var macrosEnabled = true
+    var enrichmentEnabled = false // to selectively allow enrichment in patterns, where other kinds of implicit conversions are not allowed
     var checking = false
     var retyping = false
 
@@ -192,8 +194,25 @@ trait Contexts { self: Analyzer =>
     def withImplicitsDisabled[T](op: => T): T = {
       val saved = implicitsEnabled
       implicitsEnabled = false
+      val savedP = enrichmentEnabled
+      enrichmentEnabled = false
       try op
-      finally implicitsEnabled = saved
+      finally {
+        implicitsEnabled = saved
+        enrichmentEnabled = savedP
+      }
+    }
+
+    def withImplicitsDisabledAllowEnrichment[T](op: => T): T = {
+      val saved = implicitsEnabled
+      implicitsEnabled = false
+      val savedP = enrichmentEnabled
+      enrichmentEnabled = true
+      try op
+      finally {
+        implicitsEnabled = saved
+        enrichmentEnabled = savedP
+      }
     }
 
     def withMacrosEnabled[T](op: => T): T = {
@@ -246,6 +265,7 @@ trait Contexts { self: Analyzer =>
       c.typingIndentLevel = typingIndentLevel
       c.implicitsEnabled = this.implicitsEnabled
       c.macrosEnabled = this.macrosEnabled
+      c.enrichmentEnabled = this.enrichmentEnabled
       c.checking = this.checking
       c.retyping = this.retyping
       c.openImplicits = this.openImplicits
@@ -298,6 +318,7 @@ trait Contexts { self: Analyzer =>
     def makeImplicit(reportAmbiguousErrors: Boolean) = {
       val c = makeSilent(reportAmbiguousErrors)
       c.implicitsEnabled = false
+      c.enrichmentEnabled = false
       c
     }
 
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
index b4e0ad6edf..4fb9362ccc 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
@@ -166,7 +166,7 @@ trait Implicits {
     }
 
     def isCyclicOrErroneous =
-      try containsError(tpe)
+      try sym.hasFlag(LOCKED) || containsError(tpe)
       catch { case _: CyclicReference => true }
 
     var useCountArg: Int = 0
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
index 988b821d1a..b7e0eaef2b 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
@@ -184,8 +184,21 @@ trait Macros { self: Analyzer =>
   def typedMacroBody(typer: Typer, ddef: DefDef): Tree = {
     import typer.context
     if (macroDebug) println("typechecking macro def %s at %s".format(ddef.symbol, ddef.pos))
+
     typer.checkFeature(ddef.pos, MacrosFeature)
 
+    // [Eugene to Martin] todo. copy/pasted this from checkFeature, because don't know a better way
+    // this is necessary to prevent macros from typechecking/expanding when they are not enabled
+    // `checkFeature` call alone is not enough, because it merely posts validation callback to unit.toCheck
+    def hasImport = inferImplicit(EmptyTree: Tree, MacrosFeature.tpe, true, false, typer.context) != SearchFailure
+    val nestedOwners = MacrosFeature.owner.ownerChain.takeWhile(_ != languageFeatureModule.moduleClass).reverse
+    val featureName = (nestedOwners map (_.name + ".")).mkString + MacrosFeature.name
+    def hasOption = settings.language.value contains featureName
+    if (!hasImport && !hasOption) {
+      ddef.symbol setFlag IS_ERROR
+      return EmptyTree
+    }
+
     implicit class AugmentedString(s: String) {
       def abbreviateCoreAliases: String = { // hack!
         var result = s
diff --git a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
index 45d916c633..4319dd10c7 100644
--- a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
@@ -14,8 +14,9 @@ import util.returning
 abstract class TreeCheckers extends Analyzer {
   import global._
 
-  private val everything = ListBuffer[(Phase, Map[Tree, (Symbol, Type)])]()
+  private val everything   = ListBuffer[(Phase, Map[Tree, (Symbol, Type)])]()
   private val currentTrees = mutable.Map[Tree, (Symbol, Type)]()
+  private val tpeOfTree    = mutable.HashMap[Tree, Type]()
 
   if (settings.debug.value) {
     sys addShutdownHook {
@@ -49,12 +50,13 @@ abstract class TreeCheckers extends Analyzer {
   object SymbolTracker extends Traverser {
     type PhaseMap = mutable.HashMap[Symbol, List[Tree]]
 
+    val defSyms       = mutable.HashMap[Symbol, List[DefTree]]() withDefaultValue Nil
+    val newSyms       = mutable.HashSet[Symbol]()
     val maps          = ListBuffer[(Phase, PhaseMap)]()
+    val movedMsgs     = ListBuffer[String]()
+
     def prev          = maps.init.last._2
     def latest        = maps.last._2
-    val defSyms       = mutable.HashMap[Symbol, List[DefTree]]()
-    val newSyms       = mutable.HashSet[Symbol]()
-    val movedMsgs     = new ListBuffer[String]
     def sortedNewSyms = newSyms.toList.distinct sortBy (_.name.toString)
 
     def inPrev(sym: Symbol) = {
@@ -119,10 +121,8 @@ abstract class TreeCheckers extends Analyzer {
       if (sym != null && sym != NoSymbol) {
         record(sym, tree)
         tree match {
-          case x: DefTree =>
-            if (defSyms contains sym) defSyms(sym) = defSyms(sym) :+ x
-            else defSyms(sym) = List(x)
-          case _ => ()
+          case x: DefTree => defSyms(sym) :+= x
+          case _          => ()
         }
       }
 
@@ -130,8 +130,6 @@ abstract class TreeCheckers extends Analyzer {
     }
   }
 
-  lazy val tpeOfTree = mutable.HashMap[Tree, Type]()
-
   def posstr(p: Position) =
     try p.source.path + ":" + p.line
     catch { case _: UnsupportedOperationException => p.toString }
@@ -147,9 +145,7 @@ abstract class TreeCheckers extends Analyzer {
     if (!cond) errorFn(msg)
 
   def checkTrees() {
-    if (settings.verbose.value)
-      Console.println("[consistency check at the beginning of phase " + phase + "]")
-
+    informFn("[consistency check at the beginning of phase " + phase + "]")
     currentRun.units foreach check
   }
 
@@ -172,7 +168,7 @@ abstract class TreeCheckers extends Analyzer {
     informProgress("checking "+unit)
     val context = rootContext(unit)
     context.checking = true
-    tpeOfTree.clear
+    tpeOfTree.clear()
     SymbolTracker.check(phase, unit)
     val checker = new TreeChecker(context)
     runWithUnit(unit) {
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index dd8631ba21..0541f85f31 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1203,7 +1203,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
         && !qtpe.typeSymbol.isBottomClass
         && qtpe != WildcardType
         && !qual.isInstanceOf[ApplyImplicitView] // don't chain views
-        && context.implicitsEnabled
+        && (context.implicitsEnabled || context.enrichmentEnabled)
         // Elaborating `context.implicitsEnabled`:
         // don't try to adapt a top-level type that's the subject of an implicit search
         // this happens because, if isView, typedImplicit tries to apply the "current" implicit value to
@@ -4210,7 +4210,10 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
           } else {
             member(qual, name)
           }
-        if (sym == NoSymbol && name != nme.CONSTRUCTOR && (mode & EXPRmode) != 0) {
+
+        // symbol not found? --> try to convert implicitly to a type that does have the required member
+        // added `| PATTERNmode` to allow enrichment in patterns (so we can add e.g., an xml member to StringContext, which in turn has an unapply[Seq] method)
+        if (sym == NoSymbol && name != nme.CONSTRUCTOR && (mode & (EXPRmode | PATTERNmode)) != 0) {
           val qual1 =
             if (member(qual, name) != NoSymbol) qual
             else adaptToMemberWithArgs(tree, qual, name, mode, true, true)
@@ -4218,6 +4221,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
           if (qual1 ne qual)
             return typed(treeCopy.Select(tree, qual1, name), mode, pt)
         }
+
         if (!reallyExists(sym)) {
           if (context.owner.enclosingTopLevelClass.isJavaDefined && name.isTypeName) {
             val tree1 = atPos(tree.pos) { gen.convertToSelectFromType(qual, name)  }
@@ -4954,6 +4958,8 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
             ptLine("typing %s: pt = %s".format(ptTree(tree), pt),
               "undetparams"      -> context.undetparams,
               "implicitsEnabled" -> context.implicitsEnabled,
+              "enrichmentEnabled"   -> context.enrichmentEnabled,
+              "mode"             -> modeString(mode),
               "silent"           -> context.bufferErrors,
               "context.owner"    -> context.owner
             )
@@ -5057,7 +5063,22 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
       // We disable implicits because otherwise some constructs will
       // type check which should not.  The pattern matcher does not
       // perform implicit conversions in an attempt to consummate a match.
-      context.withImplicitsDisabled(typed(tree, PATTERNmode, pt))
+
+      // on the one hand,
+      //   "abc" match { case Seq('a', 'b', 'c') => true }
+      // should be ruled out statically, otherwise this is a runtime
+      // error both because there is an implicit from String to Seq
+      // (even though such implicits are not used by the matcher) and
+      // because the typer is fine with concluding that "abc" might
+      // be of type "String with Seq[T]" and thus eligible for a call
+      // to unapplySeq.
+
+      // on the other hand, we want to be able to use implicits to add members retro-actively (e.g., add xml to StringContext)
+
+      // as a compromise, context.enrichmentEnabled tells adaptToMember to go ahead and enrich,
+      // but arbitrary conversions (in adapt) are disabled
+      // TODO: can we achieve the pattern matching bit of the string interpolation SIP without this?
+      context.withImplicitsDisabledAllowEnrichment(typed(tree, PATTERNmode, pt))
     }
 
     /** Types a (fully parameterized) type tree */
diff --git a/src/library/scala/reflect/api/Trees.scala b/src/library/scala/reflect/api/Trees.scala
index 6ddb2ea673..d659a9e9eb 100644
--- a/src/library/scala/reflect/api/Trees.scala
+++ b/src/library/scala/reflect/api/Trees.scala
@@ -294,18 +294,24 @@ trait Trees { self: Universe =>
     override var symbol: Symbol = NoSymbol
   }
 
+  /** A tree with a name - effectively, a DefTree or RefTree.
+   */
+  trait NameTree extends Tree {
+    def name: Name
+  }
+
   /** A tree which references a symbol-carrying entity.
    *  References one, as opposed to defining one; definitions
    *  are in DefTrees.
    */
-  trait RefTree extends SymTree {
+  trait RefTree extends SymTree with NameTree {
     def qualifier: Tree    // empty for Idents
     def name: Name
   }
 
   /** A tree which defines a symbol-carrying entity.
    */
-  abstract class DefTree extends SymTree {
+  abstract class DefTree extends SymTree with NameTree {
     def name: Name
     override def isDef = true
   }
diff --git a/test/disabled/neg/macro-deprecate-dont-touch-backquotedidents.check b/test/disabled/neg/macro-deprecate-dont-touch-backquotedidents.check
deleted file mode 100644
index 25df9a6a4a..0000000000
--- a/test/disabled/neg/macro-deprecate-dont-touch-backquotedidents.check
+++ /dev/null
@@ -1,10 +0,0 @@
-macro-deprecate-dont-touch-backquotedidents.scala:37: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-package `macro` {
-        ^
-macro-deprecate-dont-touch-backquotedidents.scala:38: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  package `macro`.bar {
-          ^
-macro-deprecate-dont-touch-backquotedidents.scala:43: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  package `macro`.foo {
-          ^
-three errors found
diff --git a/test/disabled/neg/macro-deprecate-idents.check b/test/disabled/neg/macro-deprecate-idents.check
deleted file mode 100644
index bd685fc7b9..0000000000
--- a/test/disabled/neg/macro-deprecate-idents.check
+++ /dev/null
@@ -1,46 +0,0 @@
-macro-deprecate-idents.scala:2: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  val macro = ???
-      ^
-macro-deprecate-idents.scala:6: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  var macro = ???
-      ^
-macro-deprecate-idents.scala:10: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  type macro = Int
-       ^
-macro-deprecate-idents.scala:14: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  class macro
-        ^
-macro-deprecate-idents.scala:18: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  class macro
-        ^
-macro-deprecate-idents.scala:22: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  object macro
-         ^
-macro-deprecate-idents.scala:26: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  object macro
-         ^
-macro-deprecate-idents.scala:30: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  trait macro
-        ^
-macro-deprecate-idents.scala:34: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  trait macro
-        ^
-macro-deprecate-idents.scala:37: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-package macro {
-        ^
-macro-deprecate-idents.scala:38: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  package macro.bar {
-          ^
-macro-deprecate-idents.scala:43: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  package macro.foo {
-          ^
-macro-deprecate-idents.scala:48: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  val Some(macro) = Some(42)
-           ^
-macro-deprecate-idents.scala:50: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-    case macro => println(macro)
-         ^
-macro-deprecate-idents.scala:55: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  def macro = 2
-      ^
-15 errors found
diff --git a/test/disabled/neg/macro-invalidshape-d.check b/test/disabled/neg/macro-invalidshape-d.check
deleted file mode 100644
index 031aa653ab..0000000000
--- a/test/disabled/neg/macro-invalidshape-d.check
+++ /dev/null
@@ -1,4 +0,0 @@
-Macros_Test_2.scala:2: error: illegal start of statement
-  def foo(x: Any) = {2; macro Impls.foo}
-                        ^
-one error found
diff --git a/test/disabled/neg/macro-keyword-bind.flags b/test/disabled/neg/macro-keyword-bind.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/disabled/neg/macro-keyword-bind.flags
+++ b/test/disabled/neg/macro-keyword-bind.flags
@@ -1 +1 @@
--Xmacros
-\ No newline at end of file
+-language:experimental.macros
+\ No newline at end of file
diff --git a/test/disabled/neg/macro-keyword-class1.flags b/test/disabled/neg/macro-keyword-class1.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/disabled/neg/macro-keyword-class1.flags
+++ b/test/disabled/neg/macro-keyword-class1.flags
@@ -1 +1 @@
--Xmacros
-\ No newline at end of file
+-language:experimental.macros
+\ No newline at end of file
diff --git a/test/disabled/neg/macro-keyword-class2.flags b/test/disabled/neg/macro-keyword-class2.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/disabled/neg/macro-keyword-class2.flags
+++ b/test/disabled/neg/macro-keyword-class2.flags
@@ -1 +1 @@
--Xmacros
-\ No newline at end of file
+-language:experimental.macros
+\ No newline at end of file
diff --git a/test/disabled/neg/macro-keyword-object1.flags b/test/disabled/neg/macro-keyword-object1.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/disabled/neg/macro-keyword-object1.flags
+++ b/test/disabled/neg/macro-keyword-object1.flags
@@ -1 +1 @@
--Xmacros
-\ No newline at end of file
+-language:experimental.macros
+\ No newline at end of file
diff --git a/test/disabled/neg/macro-keyword-object2.flags b/test/disabled/neg/macro-keyword-object2.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/disabled/neg/macro-keyword-object2.flags
+++ b/test/disabled/neg/macro-keyword-object2.flags
@@ -1 +1 @@
--Xmacros
-\ No newline at end of file
+-language:experimental.macros
+\ No newline at end of file
diff --git a/test/disabled/neg/macro-keyword-package1.flags b/test/disabled/neg/macro-keyword-package1.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/disabled/neg/macro-keyword-package1.flags
+++ b/test/disabled/neg/macro-keyword-package1.flags
@@ -1 +1 @@
--Xmacros
-\ No newline at end of file
+-language:experimental.macros
+\ No newline at end of file
diff --git a/test/disabled/neg/macro-keyword-package2.flags b/test/disabled/neg/macro-keyword-package2.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/disabled/neg/macro-keyword-package2.flags
+++ b/test/disabled/neg/macro-keyword-package2.flags
@@ -1 +1 @@
--Xmacros
-\ No newline at end of file
+-language:experimental.macros
+\ No newline at end of file
diff --git a/test/disabled/neg/macro-keyword-trait1.flags b/test/disabled/neg/macro-keyword-trait1.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/disabled/neg/macro-keyword-trait1.flags
+++ b/test/disabled/neg/macro-keyword-trait1.flags
@@ -1 +1 @@
--Xmacros
-\ No newline at end of file
+-language:experimental.macros
+\ No newline at end of file
diff --git a/test/disabled/neg/macro-keyword-trait2.flags b/test/disabled/neg/macro-keyword-trait2.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/disabled/neg/macro-keyword-trait2.flags
+++ b/test/disabled/neg/macro-keyword-trait2.flags
@@ -1 +1 @@
--Xmacros
-\ No newline at end of file
+-language:experimental.macros
+\ No newline at end of file
diff --git a/test/disabled/neg/macro-keyword-type.flags b/test/disabled/neg/macro-keyword-type.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/disabled/neg/macro-keyword-type.flags
+++ b/test/disabled/neg/macro-keyword-type.flags
@@ -1 +1 @@
--Xmacros
-\ No newline at end of file
+-language:experimental.macros
+\ No newline at end of file
diff --git a/test/disabled/neg/macro-keyword-val.flags b/test/disabled/neg/macro-keyword-val.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/disabled/neg/macro-keyword-val.flags
+++ b/test/disabled/neg/macro-keyword-val.flags
@@ -1 +1 @@
--Xmacros
-\ No newline at end of file
+-language:experimental.macros
+\ No newline at end of file
diff --git a/test/disabled/neg/macro-without-xmacros-a.check b/test/disabled/neg/macro-without-xmacros-a.check
deleted file mode 100644
index a3ca081f04..0000000000
--- a/test/disabled/neg/macro-without-xmacros-a.check
+++ /dev/null
@@ -1,10 +0,0 @@
-Macros_2.scala:5: error: not found: value macro
-    def foo(x: Int): Int = macro foo_impl
-                           ^
-Macros_2.scala:7: error: not found: value macro
-  def bar(x: Int): Int = macro bar_impl
-                         ^
-Macros_2.scala:11: error: not found: value macro
-  def quux(x: Int): Int = macro quux_impl
-                          ^
-three errors found
diff --git a/test/disabled/neg/macro-without-xmacros-b.check b/test/disabled/neg/macro-without-xmacros-b.check
deleted file mode 100644
index dce4a084c9..0000000000
--- a/test/disabled/neg/macro-without-xmacros-b.check
+++ /dev/null
@@ -1,10 +0,0 @@
-Macros_2.scala:3: error: ';' expected but '.' found.
-    def foo(x: Int): Int = macro Impls.foo_impl
-                                      ^
-Macros_2.scala:5: error: ';' expected but '.' found.
-  def bar(x: Int): Int = macro Impls.bar_impl
-                                    ^
-Macros_2.scala:9: error: ';' expected but '.' found.
-  def quux(x: Int): Int = macro Impls.quux_impl
-                                     ^
-three errors found
diff --git a/test/disabled/run/macro-reflective-mamd-normal-mi.check b/test/disabled/run/macro-reflective-mamd-normal-mi.check
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test/disabled/run/macro-reflective-mamd-normal-mi.check
+++ /dev/null
diff --git a/test/disabled/run/macro-reflective-mamd-normal-mi.flags b/test/disabled/run/macro-reflective-mamd-normal-mi.flags
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test/disabled/run/macro-reflective-mamd-normal-mi.flags
+++ /dev/null
diff --git a/test/files/neg/macro-deprecate-idents.check b/test/files/neg/macro-deprecate-idents.check
new file mode 100644
index 0000000000..f8a7e519df
--- /dev/null
+++ b/test/files/neg/macro-deprecate-idents.check
@@ -0,0 +1,52 @@
+macro-deprecate-idents.scala:2: error: macro is now a reserved word; usage as an identifier is deprecated
+  val macro = ???
+      ^
+macro-deprecate-idents.scala:6: error: macro is now a reserved word; usage as an identifier is deprecated
+  var macro = ???
+      ^
+macro-deprecate-idents.scala:10: error: macro is now a reserved word; usage as an identifier is deprecated
+  type macro = Int
+       ^
+macro-deprecate-idents.scala:14: error: macro is now a reserved word; usage as an identifier is deprecated
+  class macro
+        ^
+macro-deprecate-idents.scala:18: error: macro is now a reserved word; usage as an identifier is deprecated
+  class macro
+        ^
+macro-deprecate-idents.scala:22: error: macro is now a reserved word; usage as an identifier is deprecated
+  object macro
+         ^
+macro-deprecate-idents.scala:26: error: macro is now a reserved word; usage as an identifier is deprecated
+  object macro
+         ^
+macro-deprecate-idents.scala:30: error: macro is now a reserved word; usage as an identifier is deprecated
+  trait macro
+        ^
+macro-deprecate-idents.scala:34: error: macro is now a reserved word; usage as an identifier is deprecated
+  trait macro
+        ^
+macro-deprecate-idents.scala:37: error: macro is now a reserved word; usage as an identifier is deprecated
+package macro {
+        ^
+macro-deprecate-idents.scala:38: error: macro is now a reserved word; usage as an identifier is deprecated
+  package macro.bar {
+          ^
+macro-deprecate-idents.scala:43: error: macro is now a reserved word; usage as an identifier is deprecated
+  package macro.foo {
+          ^
+macro-deprecate-idents.scala:48: error: macro is now a reserved word; usage as an identifier is deprecated
+  val Some(macro) = Some(42)
+           ^
+macro-deprecate-idents.scala:49: error: macro is now a reserved word; usage as an identifier is deprecated
+  macro match {
+  ^
+macro-deprecate-idents.scala:50: error: macro is now a reserved word; usage as an identifier is deprecated
+    case macro => println(macro)
+         ^
+macro-deprecate-idents.scala:50: error: macro is now a reserved word; usage as an identifier is deprecated
+    case macro => println(macro)
+                          ^
+macro-deprecate-idents.scala:55: error: macro is now a reserved word; usage as an identifier is deprecated
+  def macro = 2
+      ^
+17 errors found
diff --git a/test/disabled/neg/macro-deprecate-idents.flags b/test/files/neg/macro-deprecate-idents.flags
index e8fb65d50c..e8fb65d50c 100644
--- a/test/disabled/neg/macro-deprecate-idents.flags
+++ b/test/files/neg/macro-deprecate-idents.flags
diff --git a/test/disabled/neg/macro-deprecate-idents.scala b/test/files/neg/macro-deprecate-idents.scala
index 23c398e341..23c398e341 100644
--- a/test/disabled/neg/macro-deprecate-idents.scala
+++ b/test/files/neg/macro-deprecate-idents.scala
diff --git a/test/files/neg/macro-invalidshape-d.check b/test/files/neg/macro-invalidshape-d.check
new file mode 100644
index 0000000000..f0d77e2f2d
--- /dev/null
+++ b/test/files/neg/macro-invalidshape-d.check
@@ -0,0 +1,8 @@
+Macros_Test_2.scala:2: warning: macro is now a reserved word; usage as an identifier is deprecated
+  def foo(x: Any) = {2; macro Impls.foo}
+                        ^
+Macros_Test_2.scala:2: error: ';' expected but '.' found.
+  def foo(x: Any) = {2; macro Impls.foo}
+                                   ^
+one warning found
+one error found
diff --git a/test/disabled/neg/macro-invalidshape-d.flags b/test/files/neg/macro-invalidshape-d.flags
index cd66464f2f..cd66464f2f 100644
--- a/test/disabled/neg/macro-invalidshape-d.flags
+++ b/test/files/neg/macro-invalidshape-d.flags
diff --git a/test/disabled/neg/macro-invalidshape-d/Impls_1.scala b/test/files/neg/macro-invalidshape-d/Impls_1.scala
index 7b1620d117..7b1620d117 100644
--- a/test/disabled/neg/macro-invalidshape-d/Impls_1.scala
+++ b/test/files/neg/macro-invalidshape-d/Impls_1.scala
diff --git a/test/disabled/neg/macro-invalidshape-d/Macros_Test_2.scala b/test/files/neg/macro-invalidshape-d/Macros_Test_2.scala
index bacd9a6e7c..bacd9a6e7c 100644
--- a/test/disabled/neg/macro-invalidshape-d/Macros_Test_2.scala
+++ b/test/files/neg/macro-invalidshape-d/Macros_Test_2.scala
diff --git a/test/files/neg/macro-without-xmacros-a.check b/test/files/neg/macro-without-xmacros-a.check
new file mode 100644
index 0000000000..fd2667dbb8
--- /dev/null
+++ b/test/files/neg/macro-without-xmacros-a.check
@@ -0,0 +1,17 @@
+Macros_2.scala:5: error: macro definition needs to be enabled
+by making the implicit value language.experimental.macros visible.
+This can be achieved by adding the import clause 'import language.experimental.macros'
+or by setting the compiler option -language:experimental.macros.
+See the Scala docs for value scala.language.experimental.macros for a discussion
+why the feature needs to be explicitly enabled.
+    def foo(x: Int): Int = macro foo_impl
+        ^
+Macros_2.scala:7: error: macro definition needs to be enabled
+by making the implicit value language.experimental.macros visible.
+  def bar(x: Int): Int = macro bar_impl
+      ^
+Macros_2.scala:11: error: macro definition needs to be enabled
+by making the implicit value language.experimental.macros visible.
+  def quux(x: Int): Int = macro quux_impl
+      ^
+three errors found
diff --git a/test/disabled/neg/macro-without-xmacros-a/Impls_1.scala b/test/files/neg/macro-without-xmacros-a/Impls_1.scala
index 2493c81c95..01daf12b1a 100644
--- a/test/disabled/neg/macro-without-xmacros-a/Impls_1.scala
+++ b/test/files/neg/macro-without-xmacros-a/Impls_1.scala
@@ -1,17 +1,17 @@
 import scala.reflect.makro.{Context => Ctx}
 
 object Impls {
-  def foo_impl(c: Ctx)(x: c.Expr[Int]): c.mirror.Tree = {
+  def foo_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
     import c.mirror._
     Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(1))))
   }
 
-  def bar_impl(c: Ctx)(x: c.Expr[Int]): c.mirror.Tree = {
+  def bar_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
     import c.mirror._
     Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(2))))
   }
 
-  def quux_impl(c: Ctx)(x: c.Expr[Int]): c.mirror.Tree = {
+  def quux_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
     import c.mirror._
     Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(3))))
   }
diff --git a/test/disabled/neg/macro-without-xmacros-a/Macros_2.scala b/test/files/neg/macro-without-xmacros-a/Macros_2.scala
index 62f9dcf505..62f9dcf505 100644
--- a/test/disabled/neg/macro-without-xmacros-a/Macros_2.scala
+++ b/test/files/neg/macro-without-xmacros-a/Macros_2.scala
diff --git a/test/disabled/neg/macro-without-xmacros-a/Test_3.scala b/test/files/neg/macro-without-xmacros-a/Test_3.scala
index e9a10e20c9..e9a10e20c9 100644
--- a/test/disabled/neg/macro-without-xmacros-a/Test_3.scala
+++ b/test/files/neg/macro-without-xmacros-a/Test_3.scala
diff --git a/test/files/neg/macro-without-xmacros-b.check b/test/files/neg/macro-without-xmacros-b.check
new file mode 100644
index 0000000000..2d675b8319
--- /dev/null
+++ b/test/files/neg/macro-without-xmacros-b.check
@@ -0,0 +1,17 @@
+Macros_2.scala:3: error: macro definition needs to be enabled
+by making the implicit value language.experimental.macros visible.
+This can be achieved by adding the import clause 'import language.experimental.macros'
+or by setting the compiler option -language:experimental.macros.
+See the Scala docs for value scala.language.experimental.macros for a discussion
+why the feature needs to be explicitly enabled.
+    def foo(x: Int): Int = macro Impls.foo_impl
+        ^
+Macros_2.scala:5: error: macro definition needs to be enabled
+by making the implicit value language.experimental.macros visible.
+  def bar(x: Int): Int = macro Impls.bar_impl
+      ^
+Macros_2.scala:9: error: macro definition needs to be enabled
+by making the implicit value language.experimental.macros visible.
+  def quux(x: Int): Int = macro Impls.quux_impl
+      ^
+three errors found
diff --git a/test/disabled/neg/macro-without-xmacros-b/Impls_1.scala b/test/files/neg/macro-without-xmacros-b/Impls_1.scala
index 2493c81c95..01daf12b1a 100644
--- a/test/disabled/neg/macro-without-xmacros-b/Impls_1.scala
+++ b/test/files/neg/macro-without-xmacros-b/Impls_1.scala
@@ -1,17 +1,17 @@
 import scala.reflect.makro.{Context => Ctx}
 
 object Impls {
-  def foo_impl(c: Ctx)(x: c.Expr[Int]): c.mirror.Tree = {
+  def foo_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
     import c.mirror._
     Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(1))))
   }
 
-  def bar_impl(c: Ctx)(x: c.Expr[Int]): c.mirror.Tree = {
+  def bar_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
     import c.mirror._
     Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(2))))
   }
 
-  def quux_impl(c: Ctx)(x: c.Expr[Int]): c.mirror.Tree = {
+  def quux_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
     import c.mirror._
     Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(3))))
   }
diff --git a/test/disabled/neg/macro-without-xmacros-b/Macros_2.scala b/test/files/neg/macro-without-xmacros-b/Macros_2.scala
index de7080c7e8..de7080c7e8 100644
--- a/test/disabled/neg/macro-without-xmacros-b/Macros_2.scala
+++ b/test/files/neg/macro-without-xmacros-b/Macros_2.scala
diff --git a/test/disabled/neg/macro-without-xmacros-b/Test_3.scala b/test/files/neg/macro-without-xmacros-b/Test_3.scala
index e9a10e20c9..e9a10e20c9 100644
--- a/test/disabled/neg/macro-without-xmacros-b/Test_3.scala
+++ b/test/files/neg/macro-without-xmacros-b/Test_3.scala
diff --git a/test/disabled/neg/macro-deprecate-dont-touch-backquotedidents.flags b/test/files/pos/macro-deprecate-dont-touch-backquotedidents.flags
index e8fb65d50c..e8fb65d50c 100644
--- a/test/disabled/neg/macro-deprecate-dont-touch-backquotedidents.flags
+++ b/test/files/pos/macro-deprecate-dont-touch-backquotedidents.flags
diff --git a/test/disabled/neg/macro-deprecate-dont-touch-backquotedidents.scala b/test/files/pos/macro-deprecate-dont-touch-backquotedidents.scala
index dee2f1de3b..69a7333011 100644
--- a/test/disabled/neg/macro-deprecate-dont-touch-backquotedidents.scala
+++ b/test/files/pos/macro-deprecate-dont-touch-backquotedidents.scala
@@ -44,12 +44,12 @@ package foo {
   }
 }
 
-object Test12 {
-  val Some(`macro`) = Some(42)
-  `macro` match {
-    case `macro` => println(`macro`)
-  }
-}
+//object Test12 {
+//  val Some(`macro`) = Some(42)
+//  `macro` match {
+//    case `macro` => println(`macro`)
+//  }
+//}
 
 object Test13 {
   def `macro` = 2
diff --git a/test/files/run/macro-reflective-mamd-normal-mi.check b/test/files/run/macro-reflective-mamd-normal-mi.check
new file mode 100644
index 0000000000..ac4213d6e9
--- /dev/null
+++ b/test/files/run/macro-reflective-mamd-normal-mi.check
@@ -0,0 +1 @@
+43
+\ No newline at end of file
diff --git a/test/disabled/run/macro-reflective-mamd-normal-mi/Impls_1.scala b/test/files/run/macro-reflective-mamd-normal-mi/Impls_1.scala
index dc7d42d23e..dc7d42d23e 100644
--- a/test/disabled/run/macro-reflective-mamd-normal-mi/Impls_1.scala
+++ b/test/files/run/macro-reflective-mamd-normal-mi/Impls_1.scala
diff --git a/test/disabled/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala b/test/files/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
index 7cbe425fc8..cf34f1685d 100644
--- a/test/disabled/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
+++ b/test/files/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
@@ -12,5 +12,6 @@ object Test extends App {
   val module = ModuleDef(NoMods, newTermName("Macros"), Template(Nil, emptyValDef, List(modulector, macrodef)))
   val macroapp = Apply(Select(Ident("Macros"), newTermName("foo")), List(Literal(Constant(42))))
   val tree = Block(macrodef, module, macroapp)
-  println(tree.eval)
+  val toolbox = mkToolBox(options = "-language:experimental.macros")
+  println(toolbox.runExpr(tree))
 }
diff --git a/test/files/run/t2886.check b/test/files/run/t2886.check
index 5fe1e73a45..8d97a82799 100644
--- a/test/files/run/t2886.check
+++ b/test/files/run/t2886.check
@@ -1,5 +1,5 @@
-((x: scala.Predef.String) => {
-  val x$1 = x;
-  val x$2 = x;
-  Test.test(x$2, x$1)
-})
+((x: String) => {
+  val x$1 = x;
+  val x$2 = x;
+  Test.this.test(x$2, x$1)
+})
diff --git a/test/files/run/t2886.scala b/test/files/run/t2886.scala
new file mode 100644
index 0000000000..e0835a0a44
--- /dev/null
+++ b/test/files/run/t2886.scala
@@ -0,0 +1,9 @@
+import scala.reflect.mirror._
+
+object Test {
+  def test(name: String, address: String) = null
+  def main(args: Array[String]) = {
+    val tree = reify((x:String) => test(address=x,name=x)).tree
+    println(tree)
+  }
+}
diff --git a/test/files/run/virtpatmat_stringinterp.check b/test/files/run/virtpatmat_stringinterp.check
new file mode 100644
index 0000000000..7927f4f2d9
--- /dev/null
+++ b/test/files/run/virtpatmat_stringinterp.check
@@ -0,0 +1 @@
+Node(1)
diff --git a/test/files/run/virtpatmat_stringinterp.flags b/test/files/run/virtpatmat_stringinterp.flags
new file mode 100644
index 0000000000..e1b37447c9
--- /dev/null
+++ b/test/files/run/virtpatmat_stringinterp.flags
@@ -0,0 +1 @@
+-Xexperimental
+\ No newline at end of file
diff --git a/test/files/run/virtpatmat_stringinterp.scala b/test/files/run/virtpatmat_stringinterp.scala
new file mode 100644
index 0000000000..213712f17a
--- /dev/null
+++ b/test/files/run/virtpatmat_stringinterp.scala
@@ -0,0 +1,13 @@
+object Test extends App {
+  case class Node(x: Int)
+
+  implicit def sc2xml(sc: StringContext): XMLContext = new XMLContext(sc)
+  class XMLContext(sc: StringContext) {
+    object xml {
+      def unapplySeq(xml: Node): Option[Seq[Node]] = Some(List(Node(1)))
+    }
+  }
+
+  val x: Node = Node(0)
+  x match { case xml"""<foo arg=$a/>""" => println(a) }
+}
+\ No newline at end of file