Skip to content

8291914: generated constructors are considered compact when they shouldn't #10756

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

Closed
vicente-romero-oracle wants to merge 1 commit into from
Closed

8291914: generated constructors are considered compact when they shouldn't #10756

Show file tree
Hide file tree
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: 4 additions & 3 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,8 @@ public void visitMethodDef(JCMethodDecl tree) {
// leave caught unchanged.
scan(tree.body);

boolean isCompactConstructor = (tree.sym.flags() & Flags.COMPACT_RECORD_CONSTRUCTOR) != 0;
boolean isCompactOrGeneratedRecordConstructor = (tree.sym.flags() & Flags.COMPACT_RECORD_CONSTRUCTOR) != 0 ||
(tree.sym.flags() & (GENERATEDCONSTR | RECORD)) == (GENERATEDCONSTR | RECORD);
if (isInitialConstructor) {
boolean isSynthesized = (tree.sym.flags() &
GENERATEDCONSTR) != 0;
Expand All @@ -2312,10 +2313,10 @@ public void visitMethodDef(JCMethodDecl tree) {
if (var.owner == classDef.sym) {
// choose the diagnostic position based on whether
// the ctor is default(synthesized) or not
if (isSynthesized && !isCompactConstructor) {
if (isSynthesized && !isCompactOrGeneratedRecordConstructor) {
checkInit(TreeInfo.diagnosticPositionFor(var, vardecl),
var, Errors.VarNotInitializedInDefaultConstructor(var));
} else if (isCompactConstructor) {
} else if (isCompactOrGeneratedRecordConstructor) {
boolean isInstanceRecordField = var.enclClass().isRecord() &&
(var.flags_field & (Flags.PRIVATE | Flags.FINAL | Flags.GENERATED_MEMBER | Flags.RECORD)) != 0 &&
!var.isStatic() &&
Expand Down
3 changes: 2 additions & 1 deletion src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2770,7 +2770,8 @@ private void visitMethodDefInternal(JCMethodDecl tree) {
lambdaTranslationMap = prevLambdaTranslationMap;
}
}
if (tree.name == names.init && (tree.sym.flags_field & Flags.COMPACT_RECORD_CONSTRUCTOR) != 0) {
if (tree.name == names.init && ((tree.sym.flags_field & Flags.COMPACT_RECORD_CONSTRUCTOR) != 0 ||
(tree.sym.flags_field & (GENERATEDCONSTR | RECORD)) == (GENERATEDCONSTR | RECORD))) {
// lets find out if there is any field waiting to be initialized
ListBuffer<VarSymbol> fields = new ListBuffer<>();
for (Symbol sym : currentClass.getEnclosedElements()) {
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,7 @@ public MethodSymbol constructorSymbol() {
/* if we have to generate a default constructor for records we will treat it as the compact one
* to trigger field initialization later on
*/
csym.flags_field |= Flags.COMPACT_RECORD_CONSTRUCTOR | GENERATEDCONSTR;
csym.flags_field |= GENERATEDCONSTR;
ListBuffer<VarSymbol> params = new ListBuffer<>();
JCVariableDecl lastField = recordFieldDecls.last();
for (JCVariableDecl field : recordFieldDecls) {
Expand Down
4 changes: 2 additions & 2 deletions test/langtools/tools/javac/processing/model/util/elements/TestRecordPredicates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*
* @test
* @bug 8289249
* @bug 8289249 8291914
* @summary Test Elements.{isCompactConstructor, isCanonicalConstructor}
* @library /tools/javac/lib
* @build JavacTestingAbstractProcessor TestRecordPredicates
Expand Down Expand Up @@ -107,7 +107,7 @@ private void expectFalse(java.util.function.BooleanSupplier bs) {
boolean isCanonical() default false;
}

@ExpectedPredicates(isCompact=true, isCanonical=true)
@ExpectedPredicates(isCompact=false, isCanonical=true)
record RecordCompactCtor(int foo, double bar) {}

// Example from JLS 8.10.4.2
Expand Down