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

Simplify code generation for quotable lambdas not to require duplicate capture argument lists #249

Closed
wants to merge 10 commits into from
+149 −110
Closed

Simplify code generation for quotable lambdas not to require duplicate capture argument lists #249

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
75f85a6
Initial push
mcimadamore Oct 4, 2024
f7ddd67
Cleanup code
mcimadamore Oct 4, 2024
fda0e9a
Simplify functional expression trees
mcimadamore Oct 4, 2024
1398731
Simplify metafactory not to required duplicate captured args
mcimadamore Oct 4, 2024
29ab3b7
Remove dead code
mcimadamore Oct 4, 2024
fdf2cc2
Disable unsupported quotable lambdas
mcimadamore Oct 4, 2024
b011526
Drop spurious reference to `LambdaToMethod`
mcimadamore Oct 7, 2024
fd8a9c2
Address review comments
mcimadamore Oct 7, 2024
1ae6a58
Update src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Reflec…
mcimadamore Oct 7, 2024
d2d35a3
Fix typo
mcimadamore Oct 7, 2024
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
4 changes: 2 additions & 2 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ReflectMethods.java
View file
Original file line number Diff line number Diff line change
@@ -529,7 +529,7 @@ class BodyScanner extends FilterScanner {
ListBuffer<Type> capturedTypes = new ListBuffer<>();
if (lambdaCaptureScanner.capturesThis) {
capturedTypes.add(currentClassSym.type);
blockArgOffset++;
blockParamOffset++;
}
for (Symbol s : capturedSymbols) {
capturedTypes.add(s.type);
@@ -544,7 +544,7 @@ class BodyScanner extends FilterScanner {

// add captured variables mappings
for (int i = 0 ; i < capturedSymbols.size() ; i++) {
var capturedArg = top.block.parameters().get(blockArgOffset + i);
var capturedArg = top.block.parameters().get(blockParamOffset + i);
Symbol capturedSymbol = capturedSymbols.get(i);
top.localToOp.put(capturedSymbol,
append(CoreOp.var(capturedSymbol.name.toString(), capturedArg)));