Skip to content

Commit 4bce5c7

Browse files
committed
Factor out compilingArray
1 parent 5385a82 commit 4bce5c7

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
231231

232232
private def assertClassNotArray(sym: Symbol): Unit = {
233233
assert(sym.isClass, sym)
234-
assert(sym != defn.ArrayClass || ctx.compilationUnit.source.file.name == "Array.scala", sym)
234+
assert(sym != defn.ArrayClass || compilingArray, sym)
235235
}
236236

237237
private def assertClassNotArrayNotPrimitive(sym: Symbol): Unit = {
@@ -795,7 +795,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
795795
*/
796796
def primitiveOrClassToBType(sym: Symbol): BType = {
797797
assert(sym.isClass, sym)
798-
assert(sym != defn.ArrayClass || ctx.compilationUnit.source.file.name == "Array.scala", sym)
798+
assert(sym != defn.ArrayClass || compilingArray, sym)
799799
primitiveTypeMap.getOrElse(sym,
800800
storage.getClassBTypeAndRegisterInnerClass(sym)).asInstanceOf[BType]
801801
}
@@ -805,7 +805,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
805805
* signatures, e.g. `def apply(i: Int): T`. A TyperRef to T is replaced by ObjectReference.
806806
*/
807807
def nonClassTypeRefToBType(sym: Symbol): ClassBType = {
808-
assert(sym.isType && ctx.compilationUnit.source.file.name == "Array.scala", sym)
808+
assert(sym.isType && compilingArray, sym)
809809
ObjectReference.asInstanceOf[ct.bTypes.ClassBType]
810810
}
811811

@@ -957,4 +957,7 @@ object BCodeHelpers {
957957
val Special = new InvokeStyle(2) // InvokeSpecial (private methods, constructors)
958958
val Super = new InvokeStyle(3) // InvokeSpecial (super calls)
959959
}
960+
961+
private def compilingArray(using qctx: Context) =
962+
ctx.compilationUnit.source.file.name == "Array.scala"
960963
}

0 commit comments

Comments
 (0)