Merge pull request #9943 from som-snytt/issue/12538

Avoid NPE for annotation arg
scala · Mar 4, 2022 · ce02613 · ce02613
2 parents 0ef047b + 3eb66a7
commit ce02613
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -3966,7 +3966,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
         }
 
         def isDefaultArg(tree: Tree) = tree match {
-          case treeInfo.Applied(fun, _, _) => fun.symbol.isDefaultGetter
+          case treeInfo.Applied(fun, _, _) => fun.symbol != null && fun.symbol.isDefaultGetter
           case _ => false
         }
 

diff --git a/src/compiler/scala/tools/reflect/FastTrack.scala b/src/compiler/scala/tools/reflect/FastTrack.scala
@@ -62,9 +62,9 @@ class FastTrack[MacrosAndAnalyzer <: Macros with Analyzer](val macros: MacrosAnd
       makeBlackbox(     materializeWeakTypeTag) { case Applied(_, ttag :: Nil, (u :: _) :: _)     => _.materializeTypeTag(u, EmptyTree, ttag.tpe, concrete = false) },
       makeBlackbox(         materializeTypeTag) { case Applied(_, ttag :: Nil, (u :: _) :: _)     => _.materializeTypeTag(u, EmptyTree, ttag.tpe, concrete = true) },
       makeBlackbox(           ApiUniverseReify) { case Applied(_, ttag :: Nil, (expr :: _) :: _)  => c => c.materializeExpr(c.prefix.tree, EmptyTree, expr) },
-      makeBlackbox(            StringContext_f) { case _                                          => _.interpolateF },
-      makeBlackbox(            StringContext_s) { case _                                          => _.interpolateS },
-      makeBlackbox(            StringContext_raw) { case _                                        => _.interpolateRaw },
+      makeWhitebox(            StringContext_f) { case _                                          => _.interpolateF },
+      makeWhitebox(            StringContext_s) { case _                                          => _.interpolateS },
+      makeWhitebox(            StringContext_raw) { case _                                        => _.interpolateRaw },
       makeBlackbox(ReflectRuntimeCurrentMirror) { case _                                          => c => currentMirror(c).tree },
       makeWhitebox(  QuasiquoteClass_api_apply) { case _                                          => _.expandQuasiquote },
       makeWhitebox(QuasiquoteClass_api_unapply) { case _                                          => _.expandQuasiquote }

diff --git a/src/partest/scala/tools/partest/DirectTest.scala b/src/partest/scala/tools/partest/DirectTest.scala
@@ -115,7 +115,7 @@ abstract class DirectTest {
     catch {
       case t: Exception =>
         println(t.getMessage)
-        t.printStackTrace
+        t.printStackTrace()
         sys.exit(1)
     }
 

diff --git a/test/files/pos/t12538.scala b/test/files/pos/t12538.scala
@@ -0,0 +1,6 @@
+
+// javaVersion: 17+
+
+class C {
+  @java.lang.Deprecated(since = s"test") var i = 4
+}