File tree 2 files changed +12
-3
lines changed
compiler/src/dotty/tools/backend/sjs 2 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -398,8 +398,17 @@ object JSEncoding {
398
398
paramAndResultTypeNames.mkString(SignatureSep , SignatureSep , " " )
399
399
400
400
/** Computes the internal name for a type. */
401
- private def internalName (tpe : Type )(implicit ctx : Context ): String =
402
- encodeTypeRef(toTypeRef(tpe))
401
+ private def internalName (tpe : Type )(implicit ctx : Context ): String = {
402
+ val typeRef = toTypeRef(tpe)
403
+
404
+ val safeTypeRef : jstpe.TypeRef = typeRef match {
405
+ case jstpe.ClassRef (" sr_Null" | " s_Null" ) => jstpe.ClassRef (ir.Definitions .NullClass )
406
+ case jstpe.ClassRef (" sr_Nothing" | " s_Nothing" ) => jstpe.ClassRef (ir.Definitions .NothingClass )
407
+ case otherTypeRef => otherTypeRef
408
+ }
409
+
410
+ encodeTypeRef(safeTypeRef)
411
+ }
403
412
404
413
/** Encodes a [[Types.TypeRef ]], such as in an encoded method signature.
405
414
*/
Original file line number Diff line number Diff line change @@ -981,7 +981,7 @@ object Build {
981
981
++ (dir / " shared/src/test/scala/org/scalajs/testsuite/javalib/lang" ** ((" *.scala" : FileFilter ) -- " ClassTest.scala" -- " StringTest.scala" )).get
982
982
++ (dir / " shared/src/test/scala/org/scalajs/testsuite/javalib/io" ** ((" *.scala" : FileFilter ) -- " ByteArrayInputStreamTest.scala" -- " ByteArrayOutputStreamTest.scala" -- " DataInputStreamTest.scala" -- " DataOutputStreamTest.scala" -- " InputStreamTest.scala" -- " OutputStreamWriterTest.scala" -- " PrintStreamTest.scala" -- " ReadersTest.scala" -- " CommonStreamsTests.scala" )).get
983
983
++ (dir / " shared/src/test/scala/org/scalajs/testsuite/javalib/math" ** " *.scala" ).get
984
- ++ (dir / " shared/src/test/scala/org/scalajs/testsuite/javalib/net" ** (( " *.scala" : FileFilter ) -- " URITest.scala " ) ).get
984
+ ++ (dir / " shared/src/test/scala/org/scalajs/testsuite/javalib/net" ** " *.scala" ).get
985
985
++ (dir / " shared/src/test/scala/org/scalajs/testsuite/javalib/security" ** " *.scala" ).get
986
986
++ (dir / " shared/src/test/scala/org/scalajs/testsuite/javalib/util/regex" ** " *.scala" ).get
987
987
++ (dir / " shared/src/test/scala/org/scalajs/testsuite/javalib/util/concurrent" ** ((" *.scala" : FileFilter ) -- " ConcurrentHashMapTest.scala" -- " ConcurrentLinkedQueueTest.scala" -- " ConcurrentMapTest.scala" -- " ConcurrentSkipListSetTest.scala" -- " CopyOnWriteArrayListTest.scala" )).get
You can’t perform that action at this time.
0 commit comments