Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8340027: [lw5] the ACC_STRICT flag is not being set for non-nullable static fields #1244

Closed
wants to merge 1 commit into from
+48 −4
Closed

8340027: [lw5] the ACC_STRICT flag is not being set for non-nullable static fields #1244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
View file
Original file line number Diff line number Diff line change
@@ -1321,12 +1321,11 @@ else if ((sym.owner.flags_field & INTERFACE) != 0)
else {
boolean isInstanceFieldOfValueClass =
(sym.owner.type.isValueClass() && (flags & STATIC) == 0);
boolean isNonNullableInstanceFieldOfNonValueClass =
(!sym.owner.type.isValueClass() && (flags & STATIC) == 0) && types.isNonNullable(sym.type);
mask = isInstanceFieldOfValueClass || isNonNullableInstanceFieldOfNonValueClass ? ExtendedVarFlags : VarFlags;
boolean isNonNullableFieldOfNonValueClass = !sym.owner.type.isValueClass() && types.isNonNullable(sym.type);
mask = isInstanceFieldOfValueClass || isNonNullableFieldOfNonValueClass ? ExtendedVarFlags : VarFlags;
if (isInstanceFieldOfValueClass) {
implicit |= FINAL | STRICT;
} else if (isNonNullableInstanceFieldOfNonValueClass) {
} else if (isNonNullableFieldOfNonValueClass) {
implicit |= STRICT;
}
}
45 changes: 45 additions & 0 deletions test/langtools/tools/javac/nullability/NullabilityCompilationTests.java
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
* NullabilityCompilationTests
*
* @test
* @bug 8339357 8340027
* @enablePreview
* @summary compilation tests for bang types
* @library /lib/combo /tools/lib /tools/javac/lib
@@ -875,6 +876,14 @@ class Test {
""",
Result.Error,
"compiler.err.cant.ref.after.ctor.called"),
new DiagAndCode(
"""
class Test {
Object! o;
}
""",
Result.Error,
"compiler.err.non.nullable.should.be.initialized"),
new DiagAndCode(
"""
class Test {
@@ -903,6 +912,34 @@ class Test {
}
""",
Result.Clean,
""),
// static fields
new DiagAndCode(
"""
class Test {
static Object! o;
}
""",
Result.Error,
"compiler.err.non.nullable.should.be.initialized"),
new DiagAndCode(
"""
class Test {
static Object! o = new Object();
}
""",
Result.Clean,
""),
new DiagAndCode(
"""
class Test {
static Object! o;
static {
o = new Object();
}
}
""",
Result.Clean,
"")
)
);
@@ -912,6 +949,11 @@ class Test {
class Test {
Object! o = new Object();
}
""",
"""
class Test {
static Object! o = new Object();
}
"""
)) {
File dir = assertOK(true, source);
@@ -921,6 +963,9 @@ class Test {
if (!field.access_flags.is(Flags.STATIC)) {
Set<String> fieldFlags = field.access_flags.getFieldFlags();
Assert.check(fieldFlags.size() == 1 && fieldFlags.contains("ACC_STRICT"));
} else {
Set<String> fieldFlags = field.access_flags.getFieldFlags();
Assert.check(fieldFlags.size() == 2 && fieldFlags.contains("ACC_STRICT") && fieldFlags.contains("ACC_STATIC"));
}
}
}