Fork Sync: Update from parent repository

.run/Procyon.CompilerTools Tests.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Procyon.CompilerTools Tests" type="JUnit" factoryName="JUnit">
+    <module name="Procyon.Procyon.CompilerTools.test" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/Procyon.Expressions Tests.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Procyon.Expressions Tests" type="JUnit" factoryName="JUnit">
+    <module name="Procyon.Procyon.Expressions.test" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

Procyon.CompilerTools/src/main/java/com/strobel/assembler/flowanalysis/ControlFlowGraph.java

@@ -21,7 +21,7 @@
 import com.strobel.core.ExceptionUtilities;
 import com.strobel.core.VerifyArgument;
 import com.strobel.decompiler.PlainTextOutput;
-import com.strobel.functions.Block;
+import com.strobel.functions.Consumer;
 import com.strobel.functions.Function;
 
 import java.io.File;
@@ -94,7 +94,7 @@ public final Iterable<ControlFlowNode> apply(final ControlFlowNode input) {
                         return input.getSuccessors();
                     }
                 },
-                new Block<ControlFlowNode>() {
+                new Consumer<ControlFlowNode>() {
                     @Override
                     public final void accept(final ControlFlowNode b) {
                         if (b == entryPoint) {
@@ -150,7 +150,7 @@ public final Iterable<ControlFlowNode> apply(final ControlFlowNode input) {
                     return input.getDominatorTreeChildren();
                 }
             },
-            new Block<ControlFlowNode>() {
+            new Consumer<ControlFlowNode>() {
                 @Override
                 public void accept(final ControlFlowNode n) {
                     final Set<ControlFlowNode> dominanceFrontier = n.getDominanceFrontier();

Procyon.CompilerTools/src/main/java/com/strobel/assembler/flowanalysis/ControlFlowNode.java

@@ -26,7 +26,7 @@
 import com.strobel.core.VerifyArgument;
 import com.strobel.decompiler.DecompilerHelpers;
 import com.strobel.decompiler.PlainTextOutput;
-import com.strobel.functions.Block;
+import com.strobel.functions.Consumer;
 import com.strobel.functions.Function;
 import com.strobel.util.ContractUtils;
 
@@ -240,7 +240,7 @@ public final Iterator<Instruction> iterator() {
 
     public final void traversePreOrder(
         final Function<ControlFlowNode, Iterable<ControlFlowNode>> children,
-        final Block<ControlFlowNode> visitAction) {
+        final Consumer<ControlFlowNode> visitAction) {
 
         if (_visited) {
             return;
@@ -256,7 +256,7 @@ public final void traversePreOrder(
 
     public final void traversePostOrder(
         final Function<ControlFlowNode, Iterable<ControlFlowNode>> children,
-        final Block<ControlFlowNode> visitAction) {
+        final Consumer<ControlFlowNode> visitAction) {
 
         if (_visited) {
             return;

Procyon.CompilerTools/src/main/java/com/strobel/assembler/ir/ConstantPool.java

@@ -403,9 +403,16 @@ public static ConstantPool read(final Buffer b) {
                 case MethodType:
                     new MethodTypeEntry(pool, b.readUnsignedShort());
                     break;
+                case DynamicConstant:
                 case InvokeDynamicInfo:
                     new InvokeDynamicInfoEntry(pool, b.readUnsignedShort(), b.readUnsignedShort());
                     break;
+                case Module:
+                    new ModuleEntry(pool, b.readUnsignedShort());
+                    break;
+                case Package:
+                    new PackageEntry(pool, b.readUnsignedShort());
+                    break;
             }
         }
 
@@ -520,7 +527,10 @@ public static enum Tag {
         NameAndTypeDescriptor(12),
         MethodHandle(15),
         MethodType(16),
-        InvokeDynamicInfo(18);
+        DynamicConstant(17),
+        InvokeDynamicInfo(18),
+        Module(19),
+        Package(20);
 
         public final int value;
 
@@ -529,16 +539,20 @@ public static enum Tag {
         }
 
         public static Tag fromValue(final int value) {
-            VerifyArgument.inRange(Tag.Utf8StringConstant.value, Tag.InvokeDynamicInfo.value, value, "value");
+            VerifyArgument.inRange(minTag.value, maxTag.value, value, "value");
             return lookup[value];
         }
 
+        private final static Tag minTag;
+        private final static Tag maxTag;
         private final static Tag[] lookup;
 
         static {
             final Tag[] values = Tag.values();
 
-            lookup = new Tag[Tag.InvokeDynamicInfo.value + 1];
+            minTag = values[0];
+            maxTag = values[values.length - 1];
+            lookup = new Tag[maxTag.value + 1];
 
             for (final Tag tag : values) {
                 lookup[tag.value] = tag;
@@ -566,6 +580,8 @@ public interface Visitor {
         void visitMethodType(MethodTypeEntry info);
         void visitStringConstant(StringConstantEntry info);
         void visitUtf8StringConstant(Utf8StringConstantEntry info);
+        void visitModule(ModuleEntry info);
+        void visitPackage(PackageEntry info);
         void visitEnd();
 
         // <editor-fold defaultstate="collapsed" desc="Empty Visitor (No-Op)">
@@ -631,6 +647,14 @@ public void visitStringConstant(final StringConstantEntry info) {
             public void visitUtf8StringConstant(final Utf8StringConstantEntry info) {
             }
 
+            @Override
+            public void visitModule(final ModuleEntry info) {
+            }
+
+            @Override
+            public void visitPackage(final PackageEntry info) {
+            }
+
             @Override
             public void visitEnd() {
             }
@@ -745,6 +769,18 @@ public void visitUtf8StringConstant(final Utf8StringConstantEntry info) {
             codeStream.writeUtf8(info.value);
         }
 
+        @Override
+        public void visitModule(final ModuleEntry info) {
+            codeStream.writeByte(info.getTag().value);
+            codeStream.writeShort(info.nameIndex);
+        }
+
+        @Override
+        public void visitPackage(final PackageEntry info) {
+            codeStream.writeByte(info.getTag().value);
+            codeStream.writeShort(info.nameIndex);
+        }
+
         @Override
         public void visitEnd() {
         }
@@ -1073,6 +1109,96 @@ public String toString() {
         }
     }
 
+    public static class ModuleEntry extends ConstantEntry {
+
+        public final int nameIndex;
+
+        public ModuleEntry(final ConstantPool owner, final int nameIndex) {
+            super(owner);
+
+            this.nameIndex = nameIndex;
+            owner._newKey.set(getTag(), nameIndex);
+            owner._entryMap.put(owner._newKey.clone(), this);
+            owner._newKey.clear();
+        }
+
+        @Override
+        void fixupKey(final Key key) {
+            key.set(Tag.Module, nameIndex);
+        }
+
+        public Tag getTag() {
+            return Tag.Module;
+        }
+
+        public int byteLength() {
+            return 3;
+        }
+
+        public String getName() {
+            return ((Utf8StringConstantEntry) owner.get(nameIndex, Tag.Utf8StringConstant)).value;
+        }
+
+        public void accept(final Visitor visitor) {
+            visitor.visitModule(this);
+        }
+
+        @Override
+        public String toString() {
+            return "ModuleEntry[nameIndex: " + nameIndex + "]";
+        }
+
+        @Override
+        public Object getConstantValue() {
+            return getName();
+        }
+    }
+
+    public static class PackageEntry extends ConstantEntry {
+
+        public final int nameIndex;
+
+        public PackageEntry(final ConstantPool owner, final int nameIndex) {
+            super(owner);
+
+            this.nameIndex = nameIndex;
+            owner._newKey.set(getTag(), nameIndex);
+            owner._entryMap.put(owner._newKey.clone(), this);
+            owner._newKey.clear();
+        }
+
+        @Override
+        void fixupKey(final Key key) {
+            key.set(Tag.Package, nameIndex);
+        }
+
+        public Tag getTag() {
+            return Tag.Package;
+        }
+
+        public int byteLength() {
+            return 3;
+        }
+
+        public String getName() {
+            return ((Utf8StringConstantEntry) owner.get(nameIndex, Tag.Utf8StringConstant)).value;
+        }
+
+        public void accept(final Visitor visitor) {
+            visitor.visitPackage(this);
+        }
+
+        @Override
+        public String toString() {
+            return "PackageEntry[nameIndex: " + nameIndex + "]";
+        }
+
+        @Override
+        public Object getConstantValue() {
+            return getName();
+        }
+    }
+
     public static final class DoubleConstantEntry extends ConstantEntry {
         public final double value;
 

Procyon.CompilerTools/src/main/java/com/strobel/assembler/ir/FrameValue.java

@@ -16,6 +16,7 @@
 
 package com.strobel.assembler.ir;
 
+import com.strobel.assembler.metadata.MethodHandle;
 import com.strobel.assembler.metadata.TypeReference;
 import com.strobel.core.Comparer;
 import com.strobel.core.VerifyArgument;
@@ -96,6 +97,10 @@ public static FrameValue makeReference(final TypeReference type) {
         return new FrameValue(FrameValueType.Reference, VerifyArgument.notNull(type, "type"));
     }
 
+    public static FrameValue makeMethodHandle(final MethodHandle handle) {
+        return new FrameValue(FrameValueType.Reference, VerifyArgument.notNull(handle, "handle"));
+    }
+
     public static FrameValue makeAddress(final Instruction target) {
         return new FrameValue(FrameValueType.Address, VerifyArgument.notNull(target, "target"));
     }

Procyon.CompilerTools/src/main/java/com/strobel/assembler/ir/Instruction.java

@@ -16,13 +16,7 @@
 
 package com.strobel.assembler.ir;
 
-import com.strobel.assembler.metadata.DynamicCallSite;
-import com.strobel.assembler.metadata.FieldReference;
-import com.strobel.assembler.metadata.Label;
-import com.strobel.assembler.metadata.MethodReference;
-import com.strobel.assembler.metadata.SwitchInfo;
-import com.strobel.assembler.metadata.TypeReference;
-import com.strobel.assembler.metadata.VariableReference;
+import com.strobel.assembler.metadata.*;
 import com.strobel.core.ArrayUtilities;
 import com.strobel.core.VerifyArgument;
 import com.strobel.decompiler.DecompilerHelpers;
@@ -530,6 +524,9 @@ public void accept(final InstructionVisitor visitor) {
                 else if (_operand instanceof TypeReference) {
                     visitor.visitConstant(_opCode, (TypeReference) _operand);
                 }
+                else if (_operand instanceof MethodHandle) {
+                    visitor.visitConstant(_opCode, (MethodHandle) _operand);
+                }
                 else {
                     final Number number = (Number) _operand;
 

Procyon.CompilerTools/src/main/java/com/strobel/assembler/ir/InstructionVisitor.java

@@ -28,6 +28,7 @@ public interface InstructionVisitor {
     void visit(final OpCode opCode);
 
     void visitConstant(final OpCode opCode, final TypeReference value);
+    void visitConstant(final OpCode opCode, final MethodHandle value);
     void visitConstant(final OpCode opCode, final int value);
     void visitConstant(final OpCode opCode, final long value);
     void visitConstant(final OpCode opCode, final float value);
@@ -63,6 +64,10 @@ public void visit(final OpCode opCode) {
         public void visitConstant(final OpCode opCode, final TypeReference value) {
         }
 
+        @Override
+        public void visitConstant(final OpCode opCode, final MethodHandle value) {
+        }
+
         @Override
         public void visitConstant(final OpCode opCode, final int value) {
         }

Procyon.CompilerTools/src/main/java/com/strobel/assembler/ir/MetadataReader.java

@@ -25,6 +25,8 @@
 
 import java.util.List;
 
+import static com.strobel.core.CollectionUtilities.lastOrDefault;
+
 /**
  * @author Mike Strobel
  */
@@ -265,14 +267,13 @@ protected SourceAttribute readAttributeCore(final String name, final Buffer buff
                     if (methodParameters != arguments.length + 3) {
                         final MethodDefinition resolved = bootstrapMethod.resolve();
 
-                        final int varArgsAdjustment;
-
-                        if(resolved == null || !resolved.isVarArgs()) {
-                            varArgsAdjustment = 0;
-                        }
-                        else {
-                            varArgsAdjustment = 1;
-                        }
+                        ParameterDefinition lastParameter;
+
+                        final boolean varArgs = resolved != null ? resolved.isVarArgs()
+                                                                 : ((lastParameter = lastOrDefault(parameters)) != null &&
+                                                                    lastParameter.getParameterType().isArray());
+
+                        final int varArgsAdjustment = varArgs ? 1 : 0;
 
                         final int varArgsAdjustedMethodParameters = methodParameters - varArgsAdjustment;