Move isSynthetic up to MemberData and implement it for AsmFieldData

hypo-asm/hypo-asm-test-data/build.gradle.kts

@@ -11,3 +11,7 @@ tasks.compileScenario01Java {
 tasks.compileScenario02Java {
     options.release.set(16)
 }
+
+tasks.compileScenario03Java {
+    options.release.set(16)
+}

hypo-asm/hypo-asm-test-data/src/scenario-03/java/scenario03/TestClass.java

@@ -0,0 +1,16 @@
+package scenario03;
+
+import java.util.function.IntSupplier;
+
+// Compiled with JDK 16
+public class TestClass {
+
+    public IntSupplier intSupplier(Inner inner) {
+        return () -> inner.notSynthetic;
+    }
+
+    @SuppressWarnings("InnerClassMayBeStatic")
+    private class Inner {
+        private int notSynthetic;
+    }
+}

hypo-asm/src/main/java/dev/denwav/hypo/asm/AsmFieldData.java

@@ -75,6 +75,11 @@ public boolean isFinal() {
         return (this.node.access & Opcodes.ACC_FINAL) != 0;
     }
 
+    @Override
+    public boolean isSynthetic() {
+        return (this.node.access & Opcodes.ACC_SYNTHETIC) != 0;
+    }
+
     @Override
     public @NotNull String name() {
         return this.node.name;

hypo-asm/src/test/java/dev/denwav/hypo/asm/scenarios/Scenario03.java

@@ -0,0 +1,76 @@
+/*
+ * Hypo, an extensible and pluggable Java bytecode analytical model.
+ *
+ * Copyright (C) 2021  Kyle Wood (DenWav)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Lesser GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License only.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package dev.denwav.hypo.asm.scenarios;
+
+import dev.denwav.hypo.model.data.FieldData;
+import dev.denwav.hypo.model.data.MethodData;
+import dev.denwav.hypo.model.data.MethodDescriptor;
+import dev.denwav.hypo.model.data.types.ClassType;
+import dev.denwav.hypo.model.data.types.PrimitiveType;
+import dev.denwav.hypo.test.framework.TestScenarioBase;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@DisplayName("[asm] Scenario 03 - Synthetic members (Java 16)")
+public class Scenario03 extends TestScenarioBase {
+
+    @Override
+    public @NotNull Env env() {
+        return () -> "scenario-03";
+    }
+
+    @Test
+    @DisplayName("Test expected synthetic members are synthetic")
+    public void testSyntheticMembers() throws Exception {
+        final var testClass = this.context().getProvider().findClass("scenario03/TestClass");
+        assertNotNull(testClass);
+        final var inner = this.context().getProvider().findClass("scenario03/TestClass$Inner");
+        assertNotNull(inner);
+
+        final MethodData intSupplierSynth = testClass.method("lambda$intSupplier$0", MethodDescriptor.parseDescriptor("(Lscenario03/TestClass$Inner;)I"));
+        assertNotNull(intSupplierSynth, "Did not find expected lambda$intSupplier$0 synthetic member in TestClass");
+        assertTrue(intSupplierSynth.isSynthetic());
+
+        final FieldData innerSyntheticOuterThisField = inner.field("this$0", new ClassType("scenario03.TestClass"));
+        assertNotNull(innerSyntheticOuterThisField, "Did not find expected this$0 synthetic member in TestClass$Inner");
+        assertTrue(innerSyntheticOuterThisField.isSynthetic());
+    }
+
+    @Test
+    @DisplayName("Test declared members are not synthetic")
+    public void testNonSyntheticMembers() throws Exception {
+        final var testClass = this.context().getProvider().findClass("scenario03/TestClass");
+        assertNotNull(testClass);
+        final var inner = this.context().getProvider().findClass("scenario03/TestClass$Inner");
+        assertNotNull(inner);
+
+        final MethodData intSupplier = testClass.method("intSupplier", MethodDescriptor.parseDescriptor("(Lscenario03/TestClass$Inner;)Ljava/util/function/IntSupplier;"));
+        assertNotNull(intSupplier, "Did not find expected method intSupplier in TestClass");
+        assertFalse(intSupplier.isSynthetic());
+
+        final FieldData innerDeclaredField = inner.field("notSynthetic", PrimitiveType.INT);
+        assertNotNull(innerDeclaredField, "Did not find expected field notSynthetic in TestClass$Inner");
+        assertFalse(innerDeclaredField.isSynthetic());
+    }
+}

hypo-model/src/main/java/dev/denwav/hypo/model/data/MemberData.java

@@ -61,4 +61,11 @@ public interface MemberData extends HypoData {
      * @return {@code true} if this member data is a {@code final} member.
      */
     boolean isFinal();
+
+    /**
+     * Returns {@code true} if this member data is synthetic.
+     *
+     * @return {@code true} if this member data is a synthetic member.
+     */
+    boolean isSynthetic();
 }

hypo-model/src/main/java/dev/denwav/hypo/model/data/MethodData.java

@@ -59,12 +59,6 @@ public interface MethodData extends MemberData {
      */
     boolean isAbstract();
 
-    /**
-     * Returns {@code true} if this method is synthetic.
-     * @return {@code true} if this method is synthetic.
-     */
-    boolean isSynthetic();
-
     /**
      * Returns {@code true} if this is a bridge method.
      * @return {@code true} if this is a bridge method.