Encode QuoteContext hashing directly in hashCode

This hash is used to detect scope extrusions across compiler instances and runs.

Author: nicolasstucki

compiler/src/dotty/tools/dotc/quoted/QuoteContextImpl.scala

@@ -85,7 +85,7 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
       extension [T](tree: Tree)
         def asExprOf(using scala.quoted.Type[T])(using QuoteContext): scala.quoted.Expr[T] =
           if tree.isExpr then
-            new scala.internal.quoted.Expr(tree, compilerId).asExprOf[T]
+            new scala.internal.quoted.Expr(tree, QuoteContextImpl.this.hashCode).asExprOf[T]
           else tree match
             case TermTypeTest(tree) => throw new Exception("Expected an expression. This is a partially applied Term. Try eta-expanding the term first.")
             case _ => throw new Exception("Expected a Term but was: " + tree)
@@ -300,11 +300,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
     object TermMethodsImpl extends TermMethods:
       extension (self: Term):
         def seal: scala.quoted.Expr[Any] =
-          if self.isExpr then new scala.internal.quoted.Expr(self, compilerId)
+          if self.isExpr then new scala.internal.quoted.Expr(self, QuoteContextImpl.this.hashCode)
           else throw new Exception("Cannot seal a partially applied Term. Try eta-expanding the term first.")
 
         def sealOpt: Option[scala.quoted.Expr[Any]] =
-          if self.isExpr then Some(new scala.internal.quoted.Expr(self, compilerId))
+          if self.isExpr then Some(new scala.internal.quoted.Expr(self, QuoteContextImpl.this.hashCode))
           else None
 
         def tpe: Type = self.tpe
@@ -1581,7 +1581,7 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
           new SourceCodePrinter[tasty.type](tasty)(syntaxHighlight).showType(self)
 
         def seal: scala.quoted.Type[_] =
-          new scala.internal.quoted.Type(Inferred(self), compilerId)
+          new scala.internal.quoted.Type(Inferred(self), QuoteContextImpl.this.hashCode)
 
         def =:=(that: Type): Boolean = self =:= that
         def <:<(that: Type): Boolean = self <:< that
@@ -2633,8 +2633,9 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
       rec(fn, identity)
     }
 
-    def compilerId: Int = rootContext.outersIterator.toList.last.hashCode()
 
   end tasty
 
+  override def hashCode: Int = QuoteContextImpl.scopeId(using ctx)
+
 end QuoteContextImpl

library/src-bootstrapped/scala/internal/quoted/Expr.scala

@@ -20,7 +20,7 @@ import scala.internal.tasty.CompilerInterface.quoteContextWithCompilerInterface
   }
 
   def unseal(using qctx: QuoteContext): qctx.tasty.Term =
-    if (quoteContextWithCompilerInterface(qctx).tasty.compilerId != scopeId)
+    if (qctx.hashCode != scopeId)
       throw new scala.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
     tree.asInstanceOf[qctx.tasty.Term]
 

library/src-bootstrapped/scala/internal/quoted/Type.scala

@@ -15,7 +15,7 @@ final class Type[Tree](val typeTree: Tree, val scopeId: Int) extends scala.quote
 
   /** View this expression `quoted.Type[T]` as a `TypeTree` */
   def unseal(using qctx: QuoteContext): qctx.tasty.TypeTree =
-    if (quoteContextWithCompilerInterface(qctx).tasty.compilerId != scopeId)
+    if (qctx.hashCode != scopeId)
       throw new scala.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
     typeTree.asInstanceOf[qctx.tasty.TypeTree]
 

library/src-bootstrapped/scala/internal/quoted/Unpickler.scala

@@ -15,14 +15,14 @@ object Unpickler {
   def unpickleExpr[T](repr: PickledQuote, args: PickledArgs): QuoteContext ?=> Expr[T] =
     val qctx = quoteContextWithCompilerInterface(summon[QuoteContext])
     val tree = qctx.tasty.unpickleExpr(repr, args)
-    new scala.internal.quoted.Expr(tree, qctx.tasty.compilerId).asInstanceOf[Expr[T]]
+    new scala.internal.quoted.Expr(tree, qctx.hashCode).asInstanceOf[Expr[T]]
 
   /** Unpickle `repr` which represents a pickled `Type` tree,
    *  replacing splice nodes with `args`
    */
   def unpickleType[T](repr: PickledQuote, args: PickledArgs): QuoteContext ?=> Type[T] =
     val qctx = quoteContextWithCompilerInterface(summon[QuoteContext])
     val tree = qctx.tasty.unpickleType(repr, args)
-    new scala.internal.quoted.Type(tree, qctx.tasty.compilerId).asInstanceOf[Type[T]]
+    new scala.internal.quoted.Type(tree, qctx.hashCode).asInstanceOf[Type[T]]
 
 }

library/src-non-bootstrapped/scala/internal/quoted/Expr.scala

@@ -20,7 +20,7 @@ import scala.internal.tasty.CompilerInterface.quoteContextWithCompilerInterface
   }
 
   def unseal(using qctx: QuoteContext): qctx.tasty.Term =
-    if (quoteContextWithCompilerInterface(qctx).tasty.compilerId != scopeId)
+    if (qctx.hashCode != scopeId)
       throw new scala.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
     tree.asInstanceOf[qctx.tasty.Term]
 

library/src-non-bootstrapped/scala/internal/quoted/Type.scala

@@ -15,7 +15,7 @@ final class Type[Tree](val typeTree: Tree, val scopeId: Int) extends scala.quote
 
   /** View this expression `quoted.Type[T]` as a `TypeTree` */
   def unseal(using qctx: QuoteContext): qctx.tasty.TypeTree =
-    if (quoteContextWithCompilerInterface(qctx).tasty.compilerId != scopeId)
+    if (qctx.hashCode != scopeId)
       throw new scala.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
     typeTree.asInstanceOf[qctx.tasty.TypeTree]
 

library/src/scala/internal/tasty/CompilerInterface.scala

@@ -66,8 +66,6 @@ trait CompilerInterface { self: scala.tasty.Reflection =>
 
   def lambdaExtractor(term: Term, paramTypes: List[Type]): Option[List[Term] => Term]
 
-  def compilerId: Int
-
 }