Merge pull request #107 from lrytz/pr8865

Fix JavaUniverseForce
scala · Jul 10, 2020 · bb9f327 · bb9f327
2 parents 0721788 + 0104ffe
commit bb9f327
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala
@@ -1280,8 +1280,8 @@ trait Definitions extends api.StandardDefinitions {
     lazy val uncheckedVarianceClass     = requiredClass[scala.annotation.unchecked.uncheckedVariance]
 
     // Tasty Unpickling Helpers - only access when Scala 3 library is expected to be available
-    lazy val ChildAnnotationClass       = getRequiredClass("scala.annotation.internal.Child")
-    lazy val RepeatedAnnotationClass    = getRequiredClass("scala.annotation.internal.Repeated")
+    lazy val ChildAnnotationClass       = getClassIfDefined("scala.annotation.internal.Child")
+    lazy val RepeatedAnnotationClass    = getClassIfDefined("scala.annotation.internal.Repeated")
 
     lazy val BeanPropertyAttr           = requiredClass[scala.beans.BeanProperty]
     lazy val BooleanBeanPropertyAttr    = requiredClass[scala.beans.BooleanBeanProperty]

diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
@@ -425,6 +425,8 @@ trait JavaUniverseForce { self: runtime.JavaUniverse  =>
     definitions.NowarnClass
     definitions.uncheckedStableClass
     definitions.uncheckedVarianceClass
+    definitions.ChildAnnotationClass
+    definitions.RepeatedAnnotationClass
     definitions.BeanPropertyAttr
     definitions.BooleanBeanPropertyAttr
     definitions.CompileTimeOnlyAttr