fix breakages after rebase

Author: bishabosha

src/compiler/scala/tools/nsc/tasty/TastyFlags.scala

@@ -25,11 +25,12 @@ object TastyFlags {
     def |(other: TastyFlagSet): TastyFlagSet                  = TastyFlagSet(flags | other.flags)
     def &(mask: TastyFlagSet): TastyFlagSet                   = TastyFlagSet(flags & mask.flags)
     def &~(mask: TastyFlagSet): TastyFlagSet                  = TastyFlagSet(flags & ~mask.flags)
-    def unary_! : Boolean                                     = this == EmptyTastyFlags
-    def is(mask: TastyFlagSet): Boolean                       = (this & mask).hasFlags
+    def unary_! : Boolean                                     = this.flags == 0
+    def is(mask: TastyFlagSet): Boolean                       = (this & mask) == mask
+    def isOneOf(mask: TastyFlagSet): Boolean                  = (this & mask).hasFlags
     def is(mask: TastyFlagSet, butNot: TastyFlagSet): Boolean = if (!butNot) is(mask) else is(mask) && not(butNot)
-    def not(mask: TastyFlagSet): Boolean                      = !is(mask)
-    def hasFlags: Boolean                                     = !(!this)
+    def not(mask: TastyFlagSet): Boolean                      = !isOneOf(mask)
+    def hasFlags: Boolean                                     = this.flags != 0
     def except(mask: TastyFlagSet): (Boolean, TastyFlagSet)   = is(mask) -> (this &~ mask)
   }
 

src/compiler/scala/tools/nsc/tasty/bridge/TastyKernel.scala

@@ -148,10 +148,7 @@ trait TastyKernel { self: TastyUniverse =>
   def showRaw(flags: Long): String = symbolTable.showRaw(flags)
   def showRaw(any: Product): String = symbolTable.showRaw(any)
 
-  def mkTermName(str: String): TermName = {
-    import symbolTable._
-    str
-  }
+  def mkTermName(str: String): TermName = symbolTable.TermName(str)
 
   type Tree = symbolTable.Tree
 

src/tastytest/scala/tools/tastytest/TastyTest.scala

@@ -171,7 +171,8 @@ object TastyTest {
         "-d", out,
         "-classpath", classpaths(out, dottyLibrary),
         "-deprecation",
-        "-Xfatal-warnings"
+        "-Xfatal-warnings",
+        "-usejavacp"
       ) ++ sources
       Try(nsc.Main.process(args)).getOrElse(false)
     }

test/tasty/neg-false/src-2/NewJVMEnv.check

@@ -1,4 +1,4 @@
 /Users/jamie/workspace/scala/test/tasty/neg-false/src-2/NewJVMEnv_fail.scala:9: error: class type required but tastytest.printing#AnyHash with tastytest.printing#AnyClassName found
   new Env.JVMEnv {} // error: class type required but tastytest.printing#AnyHash with tastytest.printing#AnyClassName found
           ^
-one error found
+1 error

test/tasty/neg/src-2/SColourOps.check

@@ -3,5 +3,5 @@ It would fail on the following inputs: Blue, CMYK(_, _, _, _), Green, RGB(_, _,
     def red: Int = c match { // error: non-exhaustive
                    ^
 error: No warnings can be incurred under -Werror.
-one warning found
-one error found
+1 warning
+1 error

test/tasty/neg/src-2/SColourOpsUnreachable.check

@@ -2,5 +2,5 @@
       case SColour.Blue => -1 // error: unreachable
                            ^
 error: No warnings can be incurred under -Werror.
-one warning found
-one error found
+1 warning
+1 error

test/tasty/neg/src-2/TestDeprecations.check

@@ -5,5 +5,5 @@
   def test2 = new Deprecations.Old().completelyUseless() // error: completelyUseless is deprecated: this is useless
                                      ^
 error: No warnings can be incurred under -Werror.
-two warnings found
-one error found
+2 warnings
+1 error

test/tasty/neg/src-2/TestHello.check

@@ -4,4 +4,4 @@ error: Scala 2 incompatible TASTy signature of HelloWorld.tasty in object HelloW
  required: helloworld.HelloWorld.msg1.type
   HelloWorld.acceptsOnlyMsg1(helloworld)
                              ^
-two errors found
+2 errors

test/tasty/neg/src-2/TestIntent.check

@@ -1,2 +1,2 @@
 error: Scala 2 incompatible TASTy signature of Position.tasty in object Position: unsupported Scala 3 flags on method here: inline | <tastymacro>
-one error found
+1 error