Skip to content

Commit 6e1b4ce

Browse files
committed
Address review
1 parent 32e43f7 commit 6e1b4ce

File tree

1 file changed

+21
-8
lines changed

1 file changed

+21
-8
lines changed

compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -711,9 +711,14 @@ class TestBCode extends DottyBytecodeTest {
711711
checkBCode(source) { dir =>
712712
val clsIn = dir.lookupName("Base.class", directory = false).input
713713
val clsNode = loadClassNode(clsIn)
714-
getMethod(clsNode, "f")
715-
getField(clsNode, "x")
716-
getField(clsNode, "y")
714+
val f = getMethod(clsNode, "f")
715+
val x = getField(clsNode, "x")
716+
val y = getField(clsNode, "y")
717+
assert((f.access & Opcodes.ACC_STATIC) != 0)
718+
List(x, y).foreach { node =>
719+
assert((node.access & Opcodes.ACC_STATIC) != 0)
720+
assert((node.access & Opcodes.ACC_STATIC) != 0)
721+
}
717722
}
718723
}
719724

@@ -734,11 +739,19 @@ class TestBCode extends DottyBytecodeTest {
734739
checkBCode(source) { dir =>
735740
val clsIn = dir.lookupName("Base.class", directory = false).input
736741
val clsNode = loadClassNode(clsIn)
737-
getMethod(clsNode, "f")
738-
getField(clsNode, "x")
739-
getField(clsNode, "y")
740-
getField(clsNode, "a")
741-
getField(clsNode, "b")
742+
val f = getMethod(clsNode, "f")
743+
val x = getField(clsNode, "x")
744+
val y = getField(clsNode, "y")
745+
val a = getField(clsNode, "a")
746+
val b = getField(clsNode, "b")
747+
assert((f.access & Opcodes.ACC_STATIC) != 0)
748+
List(x, y).foreach { node =>
749+
assert((node.access & Opcodes.ACC_STATIC) != 0)
750+
assert((node.access & Opcodes.ACC_FINAL) != 0)
751+
}
752+
List(a, b).foreach { node =>
753+
assert((node.access & Opcodes.ACC_STATIC) != 0)
754+
}
742755
}
743756
}
744757
}

0 commit comments

Comments
 (0)