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

Jump to bottom

Fix javac memory leak #309

Merged
merged 3 commits into from
Oct 26, 2023
Merged

Fix javac memory leak #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01e93cc
Support jdk 21
gnodet Oct 25, 2023
7e10b92
Fix javac memory leak
gnodet Oct 23, 2023
acd9517
Merge branch 'master' into fix-memory-leak
gnodet Oct 26, 2023
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
5 changes: 5 additions & 0 deletions ...plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,11 @@ else if ( !suppressSource( config ) )
args.add( value );
}

if ( !config.isFork() )
{
args.add( "-XDuseUnsharedTable=true" );
}

return args.toArray( new String[0] );
}

Expand Down
29 changes: 26 additions & 3 deletions ...ler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,9 @@ public void testJRuntimeArguments()
expectedArguments.add( "-source" );
expectedArguments.add( "1.3" );

// unshared table
expectedArguments.add( "-XDuseUnsharedTable=true" );

// customCompilerArguments
Map<String, String> customCompilerArguments = new LinkedHashMap<>();
customCompilerArguments.put( "-J-Duser.language=en_us", null );
Expand Down Expand Up @@ -367,6 +370,9 @@ public void testModulePathAnnotations() throws Exception
expectedArguments.add( "--release" );
expectedArguments.add( "9" );

// unshared table
expectedArguments.add( "-XDuseUnsharedTable=true" );

internalTest( compilerConfiguration, expectedArguments, source);
}

Expand Down Expand Up @@ -395,6 +401,9 @@ public void testModulePath() throws Exception
expectedArguments.add( "-source" );
expectedArguments.add( "1.3" );

// unshared table
expectedArguments.add( "-XDuseUnsharedTable=true" );

internalTest( compilerConfiguration, expectedArguments );
}

Expand All @@ -421,6 +430,9 @@ public void testModuleVersion()
expectedArguments.add( "--module-version" );
expectedArguments.add( "1.2.0-SNAPSHOT" );

// unshared table
expectedArguments.add( "-XDuseUnsharedTable=true" );

internalTest( compilerConfiguration, expectedArguments );
}

Expand All @@ -440,7 +452,10 @@ public void testReleaseVersion()
compilerConfiguration.setReleaseVersion( "6" );
expectedArguments.add( "--release" );
expectedArguments.add( "6" );


// unshared table
expectedArguments.add( "-XDuseUnsharedTable=true" );

internalTest( compilerConfiguration, expectedArguments );
}

Expand All @@ -465,7 +480,10 @@ public void testFailOnWarning()
expectedArguments.add( "1.1" );
expectedArguments.add( "-source" );
expectedArguments.add( "1.3" );


// unshared table
expectedArguments.add( "-XDuseUnsharedTable=true" );

internalTest( compilerConfiguration, expectedArguments );
}

Expand Down Expand Up @@ -494,7 +512,10 @@ public void testMultipleAddExports()
compilerConfiguration.addCompilerCustomArgument( "--add-exports", "FROM-MOD/package2=OTHER-MOD" );
expectedArguments.add( "--add-exports" );
expectedArguments.add( "FROM-MOD/package2=OTHER-MOD" );


// unshared table
expectedArguments.add( "-XDuseUnsharedTable=true" );

internalTest( compilerConfiguration, expectedArguments );
}

Expand Down Expand Up @@ -639,5 +660,7 @@ private void populateArguments( CompilerConfiguration compilerConfiguration, Lis
expectedArguments.add( "foo" );

expectedArguments.add( "bar" );

expectedArguments.add( "-XDuseUnsharedTable=true" );
}
}