bundles now reject invalid context types

Vanilla macros only allow blackbox.Context, whitebox.Context and
PrefixType refinements thereof. Bundles should behave in the same way.

1 files changed, 5 insertions, 9 deletions

diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala
index 20f6d51fcf..f8f7673530 100644
--- a/src/reflect/scala/reflect/internal/Definitions.scala
+++ b/src/reflect/scala/reflect/internal/Definitions.scala
@@ -609,12 +609,8 @@ trait Definitions extends api.StandardDefinitions {
     private def macroBundleParamInfo(tp: Type) = {
       val ctor = tp.erasure.typeSymbol.primaryConstructor
       ctor.paramss match {
-        case List(List(c)) =>
-          val sym = c.info.typeSymbol
-          val isContextCompatible = sym.isNonBottomSubClass(BlackboxContextClass) || sym.isNonBottomSubClass(WhiteboxContextClass)
-          if (isContextCompatible) c.info else NoType
-        case _ =>
-          NoType
+        case List(List(c)) => if (isMacroContextType(c.info)) c.info else NoType
+        case _ => NoType
       }
     }
 
@@ -630,9 +626,9 @@ trait Definitions extends api.StandardDefinitions {
 
     def isBlackboxMacroBundleType(tp: Type) = {
       val isBundle = isMacroBundleType(tp)
-      val isBlackbox = (macroBundleParamInfo(tp) <:< BlackboxContextClass.tpe)
-      val notWhitebox = !(macroBundleParamInfo(tp) <:< WhiteboxContextClass.tpe)
-      isBundle && isBlackbox && notWhitebox
+      val unwrappedContext = MacroContextType.unapply(macroBundleParamInfo(tp)).getOrElse(NoType)
+      val isBlackbox = unwrappedContext =:= BlackboxContextClass.tpe
+      isBundle && isBlackbox
     }
 
     def isListType(tp: Type)     = tp <:< classExistentialType(ListClass)