Add isQuotable attribute to LambdaOp

Reviewed-by: psandoz

Author: Mourad Abbay

src/jdk.incubator.code/share/classes/jdk/incubator/code/bytecode/BytecodeGenerator.java

@@ -884,7 +884,7 @@ private void generate() {
                             ClassDesc[] captureTypes = op.capturedValues().stream()
                                     .map(Value::type).map(BytecodeGenerator::toClassDesc).toArray(ClassDesc[]::new);
                             int lambdaIndex = lambdaSink.size();
-                            if (Quotable.class.isAssignableFrom(intfClass)) {
+                            if (op.isQuotable()) {
                                 cob.invokedynamic(DynamicCallSiteDesc.of(
                                         DMHD_LAMBDA_ALT_METAFACTORY,
                                         funcIntfMethodName(intfClass),

src/jdk.incubator.code/share/classes/jdk/incubator/code/bytecode/BytecodeLift.java

@@ -51,6 +51,7 @@
 import java.lang.constant.DynamicConstantDesc;
 import java.lang.constant.MethodTypeDesc;
 import java.lang.invoke.CallSite;
+import java.lang.invoke.LambdaMetafactory;
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.AccessFlag;
 import jdk.incubator.code.Block;
@@ -474,6 +475,17 @@ yield op(JavaOp.invoke(JavaOp.InvokeOp.InvokeKind.SUPER, false,
                         JavaOp.LambdaOp.Builder lambda = JavaOp.lambda(currentBlock.parentBody(),
                                                                        lambdaFunc,
                                                                        JavaType.type(inst.typeSymbol().returnType()));
+                        // if FLAG_QUOTABLE is set, the lambda is quotable
+                        if (bsm.methodName().equals("altMetafactory")) {
+                            assert inst.bootstrapArgs().size() > 3;
+                            assert inst.bootstrapArgs().get(3) instanceof Integer;
+
+                            if (inst.bootstrapArgs().get(3) instanceof Integer flags
+                                    && (flags & LambdaMetafactory.FLAG_QUOTABLE) != 0) {
+                                lambda = lambda.quotable();
+                            }
+                        }
+
                         if (dmhd.methodName().startsWith("lambda$") && dmhd.owner().equals(classModel.thisClass().asSymbol())) {
                             // inline lambda impl method
                             MethodModel implMethod = classModel.methods().stream().filter(m -> m.methodName().equalsString(dmhd.methodName())).findFirst().orElseThrow();

src/jdk.incubator.code/share/classes/jdk/incubator/code/dialect/java/JavaOp.java

@@ -158,47 +158,70 @@ public static class Builder {
             final Body.Builder ancestorBody;
             final FunctionType funcType;
             final TypeElement functionalInterface;
+            final boolean isQuotable;
 
             Builder(Body.Builder ancestorBody, FunctionType funcType, TypeElement functionalInterface) {
                 this.ancestorBody = ancestorBody;
                 this.funcType = funcType;
                 this.functionalInterface = functionalInterface;
+                this.isQuotable = false;
+            }
+
+            Builder(Body.Builder ancestorBody, FunctionType funcType, TypeElement functionalInterface,
+                    boolean isQuotable) {
+                this.ancestorBody = ancestorBody;
+                this.funcType = funcType;
+                this.functionalInterface = functionalInterface;
+                this.isQuotable = isQuotable;
             }
 
             public LambdaOp body(Consumer<Block.Builder> c) {
                 Body.Builder body = Body.Builder.of(ancestorBody, funcType);
                 c.accept(body.entryBlock());
-                return new LambdaOp(functionalInterface, body);
+                return new LambdaOp(functionalInterface, body, isQuotable);
+            }
+
+            public Builder quotable() {
+                return new Builder(ancestorBody, funcType, functionalInterface, true);
             }
         }
 
         static final String NAME = "lambda";
+        static final String ATTRIBUTE_LAMBDA_IS_QUOTABLE = NAME + ".isQuotable";
 
         final TypeElement functionalInterface;
         final Body body;
+        final boolean isQuotable;
 
-        LambdaOp(ExternalizedOp def) {
-            this(def.resultType(), def.bodyDefinitions().get(0));
+        static LambdaOp create(ExternalizedOp def) {
+            boolean isQuotable = def.extractAttributeValue(ATTRIBUTE_LAMBDA_IS_QUOTABLE,
+                    false, v -> switch (v) {
+                        case Boolean b -> b;
+                        case null, default -> false;
+                    });
+            return new LambdaOp(def.resultType(), def.bodyDefinitions().get(0), isQuotable);
         }
 
         LambdaOp(LambdaOp that, CopyContext cc, OpTransformer ot) {
             super(that, cc);
 
             this.functionalInterface = that.functionalInterface;
             this.body = that.body.transform(cc, ot).build(this);
+            this.isQuotable = that.isQuotable;
         }
 
         @Override
         public LambdaOp transform(CopyContext cc, OpTransformer ot) {
             return new LambdaOp(this, cc, ot);
         }
 
-        LambdaOp(TypeElement functionalInterface, Body.Builder bodyC) {
+        LambdaOp(TypeElement functionalInterface, Body.Builder bodyC, boolean isQuotable) {
             super(NAME,
                     List.of());
 
             this.functionalInterface = functionalInterface;
             this.body = bodyC.build(this);
+            this.isQuotable = isQuotable;
         }
 
         @Override
@@ -237,6 +260,15 @@ public TypeElement resultType() {
             return functionalInterface();
         }
 
+        public boolean isQuotable() {
+            return isQuotable;
+        }
+
+        @Override
+        public Map<String, Object> externalize() {
+            return Map.of(ATTRIBUTE_LAMBDA_IS_QUOTABLE, isQuotable);
+        }
+
         /**
          * Determines if this lambda operation could have originated from a
          * method reference declared in Java source code.
@@ -4975,7 +5007,7 @@ static Op createOp(ExternalizedOp def) {
             case "java.try" -> TryOp.create(def);
             case "java.while" -> new WhileOp(def);
             case "java.yield" -> new YieldOp(def);
-            case "lambda" -> new LambdaOp(def);
+            case "lambda" -> LambdaOp.create(def);
             case "le" -> new LeOp(def);
             case "lshl" -> new LshlOp(def);
             case "lshr" -> new LshrOp(def);
@@ -5039,7 +5071,19 @@ public static LambdaOp.Builder lambda(Body.Builder ancestorBody,
      * @return the lambda operation
      */
     public static LambdaOp lambda(TypeElement functionalInterface, Body.Builder body) {
-        return new LambdaOp(functionalInterface, body);
+        return new LambdaOp(functionalInterface, body, false);
+    }
+
+    /**
+     * Creates a lambda operation.
+     *
+     * @param functionalInterface the lambda operation's functional interface type
+     * @param body                the body of the lambda operation
+     * @param isQuotable          true if the lambda is quotable
+     * @return the lambda operation
+     */
+    public static LambdaOp lambda(TypeElement functionalInterface, Body.Builder body, boolean isQuotable) {
+        return new LambdaOp(functionalInterface, body, isQuotable);
     }
 
     /**

src/jdk.incubator.code/share/classes/jdk/incubator/code/internal/ReflectMethods.java

@@ -1520,7 +1520,7 @@ public void visitLambda(JCTree.JCLambda tree) {
                     // Get the functional interface type
                     JavaType fiType = typeToTypeElement(tree.target);
                     // build functional lambda
-                    yield JavaOp.lambda(fiType, stack.body);
+                    yield JavaOp.lambda(fiType, stack.body, kind == FunctionalExpressionKind.QUOTABLE);
                 }
             };
 

src/jdk.incubator.code/share/classes/jdk/incubator/code/interpreter/Interpreter.java

@@ -499,7 +499,7 @@ static Object interpretOp(MethodHandles.Lookup l, OpContext oc, Op o) {
             Object fiInstance = MethodHandleProxies.asInterfaceInstance(fi, fProxy);
 
             // If a quotable lambda proxy again to add method Quoted quoted()
-            if (Quotable.class.isAssignableFrom(fi)) {
+            if (lo.isQuotable()) {
                 return Proxy.newProxyInstance(l.lookupClass().getClassLoader(), new Class<?>[]{fi},
                         new InvocationHandler() {
                             private final Quoted quoted = new Quoted(lo, capturedValuesAndArguments);

test/langtools/tools/javac/reflect/QuotableIntersectionTest.java

@@ -40,7 +40,7 @@
 public class QuotableIntersectionTest {
     @IR("""
             func @"f" ()java.type:"void" -> {
-                %0 : java.type:"jdk.incubator.code.Quotable" = lambda ()java.type:"void" -> {
+                %0 : java.type:"jdk.incubator.code.Quotable" = lambda @lambda.isQuotable=true ()java.type:"void" -> {
                     return;
                 };
                 return;
@@ -51,7 +51,7 @@ public class QuotableIntersectionTest {
 
     @IR("""
             func @"f" ()java.type:"void" -> {
-                %0 : java.type:"jdk.incubator.code.Quotable" = lambda ()java.type:"int" -> {
+                %0 : java.type:"jdk.incubator.code.Quotable" = lambda @lambda.isQuotable=true ()java.type:"int" -> {
                     %1 : java.type:"int" = constant @1;
                     return %1;
                 };
@@ -62,7 +62,7 @@ public class QuotableIntersectionTest {
 
     @IR("""
             func @"f" ()java.type:"void" -> {
-                %0 : java.type:"jdk.incubator.code.Quotable" = lambda (%1 : java.type:"int")java.type:"int" -> {
+                %0 : java.type:"jdk.incubator.code.Quotable" = lambda @lambda.isQuotable=true (%1 : java.type:"int")java.type:"int" -> {
                     %2 : Var<java.type:"int"> = var %1 @"x";
                     %3 : java.type:"int" = var.load %2;
                     return %3;
@@ -74,7 +74,7 @@ public class QuotableIntersectionTest {
 
     @IR("""
             func @"f" ()java.type:"void" -> {
-                %0 : java.type:"jdk.incubator.code.Quotable" = lambda (%1 : java.type:"int", %2 : java.type:"int")java.type:"int" -> {
+                %0 : java.type:"jdk.incubator.code.Quotable" = lambda @lambda.isQuotable=true (%1 : java.type:"int", %2 : java.type:"int")java.type:"int" -> {
                     %3 : Var<java.type:"int"> = var %1 @"x";
                     %4 : Var<java.type:"int"> = var %2 @"y";
                     %5 : java.type:"int" = var.load %3;
@@ -89,7 +89,7 @@ public class QuotableIntersectionTest {
 
     @IR("""
             func @"f" ()java.type:"void" -> {
-                %0 : java.type:"jdk.incubator.code.Quotable" = lambda ()java.type:"void" -> {
+                %0 : java.type:"jdk.incubator.code.Quotable" = lambda @lambda.isQuotable=true ()java.type:"void" -> {
                     %1 : java.type:"java.lang.AssertionError" = new @java.ref:"java.lang.AssertionError::()";
                     throw %1;
                 };
@@ -102,7 +102,7 @@ public class QuotableIntersectionTest {
 
     @IR("""
             func @"f" (%0 : Var<java.type:"int">)java.type:"void" -> {
-                %1 : java.type:"jdk.incubator.code.Quotable" = lambda (%2 : java.type:"int")java.type:"int" -> {
+                %1 : java.type:"jdk.incubator.code.Quotable" = lambda @lambda.isQuotable=true (%2 : java.type:"int")java.type:"int" -> {
                     %3 : Var<java.type:"int"> = var %2 @"y";
                     %4 : java.type:"int" = var.load %0;
                     %5 : java.type:"int" = var.load %3;
@@ -128,7 +128,7 @@ Quotable capture() {
 
     @IR("""
             func @"f" (%0 : java.type:"QuotableIntersectionTest$Context")java.type:"void" -> {
-                %1 : java.type:"jdk.incubator.code.Quotable" = lambda (%2 : java.type:"int")java.type:"int" -> {
+                %1 : java.type:"jdk.incubator.code.Quotable" = lambda @lambda.isQuotable=true (%2 : java.type:"int")java.type:"int" -> {
                     %3 : Var<java.type:"int"> = var %2 @"z";
                     %4 : java.type:"int" = field.load %0 @java.ref:"QuotableIntersectionTest$Context::x:int";
                     %5 : java.type:"int" = field.load %0 @java.ref:"QuotableIntersectionTest$Context::y:int";
@@ -146,7 +146,7 @@ Quotable capture() {
     @IR("""
             func @"captureParam" (%0 : java.type:"int")java.type:"void" -> {
                 %1 : Var<java.type:"int"> = var %0 @"x";
-                %2 : java.type:"java.util.function.IntUnaryOperator" = lambda (%3 : java.type:"int")java.type:"int" -> {
+                %2 : java.type:"java.util.function.IntUnaryOperator" = lambda @lambda.isQuotable=true (%3 : java.type:"int")java.type:"int" -> {
                     %4 : Var<java.type:"int"> = var %3 @"y";
                     %5 : java.type:"int" = var.load %1;
                     %6 : java.type:"int" = var.load %4;
@@ -166,7 +166,7 @@ static void captureParam(int x) {
     @CodeReflection
     @IR("""
             func @"captureField" (%0 : java.type:"QuotableIntersectionTest")java.type:"void" -> {
-                %1 : java.type:"java.util.function.IntUnaryOperator" = lambda (%2 : java.type:"int")java.type:"int" -> {
+                %1 : java.type:"java.util.function.IntUnaryOperator" = lambda @lambda.isQuotable=true (%2 : java.type:"int")java.type:"int" -> {
                     %3 : Var<java.type:"int"> = var %2 @"z";
                     %4 : java.type:"int" = field.load %0 @java.ref:"QuotableIntersectionTest::x:int";
                     %5 : java.type:"int" = field.load %0 @java.ref:"QuotableIntersectionTest::y:int";
@@ -188,7 +188,7 @@ static void m() {
 
     @IR("""
             func @"f" ()java.type:"void" -> {
-                %0 : java.type:"jdk.incubator.code.Quotable" = lambda ()java.type:"void" -> {
+                %0 : java.type:"jdk.incubator.code.Quotable" = lambda @lambda.isQuotable=true ()java.type:"void" -> {
                     invoke @java.ref:"QuotableIntersectionTest::m():void";
                     return;
                 };
@@ -203,7 +203,7 @@ static int g(int i) {
 
     @IR("""
             func @"f" ()java.type:"void" -> {
-                %0 : java.type:"jdk.incubator.code.Quotable" = lambda (%1 : java.type:"int")java.type:"int" -> {
+                %0 : java.type:"jdk.incubator.code.Quotable" = lambda @lambda.isQuotable=true (%1 : java.type:"int")java.type:"int" -> {
                     %2 : Var<java.type:"int"> = var %1 @"x$0";
                     %3 : java.type:"int" = var.load %2;
                     %4 : java.type:"int" = invoke %3 @java.ref:"QuotableIntersectionTest::g(int):int";
@@ -216,7 +216,7 @@ static int g(int i) {
 
     @IR("""
             func @"f" ()java.type:"void" -> {
-                %0 : java.type:"jdk.incubator.code.Quotable" = lambda (%1 : java.type:"int")java.type:"int[]" -> {
+                %0 : java.type:"jdk.incubator.code.Quotable" = lambda @lambda.isQuotable=true (%1 : java.type:"int")java.type:"int[]" -> {
                     %2 : Var<java.type:"int"> = var %1 @"x$0";
                     %3 : java.type:"int" = var.load %2;
                     %4 : java.type:"int[]" = new %3 @java.ref:"int[]::(int)";
@@ -239,7 +239,7 @@ Quotable capture() {
 
     @IR("""
             func @"f" (%0 : java.type:"QuotableIntersectionTest$ContextRef")java.type:"void" -> {
-                %1 : java.type:"jdk.incubator.code.Quotable" = lambda (%2 : java.type:"int")java.type:"int" -> {
+                %1 : java.type:"jdk.incubator.code.Quotable" = lambda @lambda.isQuotable=true (%2 : java.type:"int")java.type:"int" -> {
                     %3 : Var<java.type:"int"> = var %2 @"x$0";
                     %4 : java.type:"int" = var.load %3;
                     %5 : java.type:"int" = invoke %0 %4 @java.ref:"QuotableIntersectionTest$ContextRef::g(int):int";