partitioning based on constructor parameters

Author: lexicalscope

.gitignore

@@ -1 +1,4 @@
 /README.md~
+/svm-classloading/
+/svm-jinstruction/
+/svm-jvm-conc/

svm-partition-trace-spec/src/main/java/com/lexicalscope/svm/partition/spec/Invocation.java

@@ -4,6 +4,6 @@ public interface Invocation {
    String callerMethodName();
    Receiver receiver();
    Value parameter(String path);
-   Value callerParameter(int index);
+   Value local(int index);
    Value calleeParameter(int index);
 }

svm-partition-trace-spec/src/main/java/com/lexicalscope/svm/partition/spec/MatchersSpec.java

@@ -64,7 +64,7 @@ public static Matcher<CallContext> calledBy(final Matcher<String> matcher) {
     public static Matcher<Invocation> callerParameter(final int index, final Matcher<Value> matcher) {
        return new FeatureMatcher<Invocation, Value>(matcher, "caller parameter " + index, "parameter") {
           @Override protected Value featureValueOf(final Invocation actual) {
-             return actual.callerParameter(index);
+             return actual.local(index);
           }
        };
     }

svm-partition-trace/src/main/java/com/lexicalscope/svm/partition/trace/ops/JStateCallContext.java

@@ -13,14 +13,23 @@
 import com.lexicalscope.svm.vm.j.JState;
 import com.lexicalscope.svm.vm.j.KlassInternalName;
 import com.lexicalscope.svm.vm.j.klass.SClass;
+import com.lexicalscope.svm.vm.j.klass.SMethodDescriptor;
 
 class JStateCallContext implements CallContext {
    private final JState ctx;
    private final KlassInternalName klassDesc;
+   private final SMethodDescriptor targetMethod;
+   private final Object[] args;
 
-   public JStateCallContext(final JState ctx, final KlassInternalName klassDesc) {
+   public JStateCallContext(
+         final JState ctx,
+         final KlassInternalName klassDesc,
+         final SMethodDescriptor targetMethod,
+         final Object[] args) {
       this.ctx = ctx;
       this.klassDesc = klassDesc;
+      this.targetMethod = targetMethod;
+      this.args = args;
    }
 
    @Override public String callerMethodName() {
@@ -53,7 +62,7 @@ public JStateCallContext(final JState ctx, final KlassInternalName klassDesc) {
       throw new UnsupportedOperationException();
    }
 
-   @Override public Value callerParameter(final int index) {
+   @Override public Value local(final int index) {
       return new Local(){
          @Override public Object value() {
             return ctx.currentFrame().local(index);
@@ -63,7 +72,7 @@ public JStateCallContext(final JState ctx, final KlassInternalName klassDesc) {
    @Override public Value calleeParameter(final int index) {
       return new Local(){
          @Override public Object value() {
-            throw new UnsupportedOperationException("we don't know the constructor params because we have to tag the object before its constructor is invoked");
+            return args[index];
          }};
    }
 

svm-partition-trace/src/main/java/com/lexicalscope/svm/partition/trace/ops/MatcherPartition.java

@@ -7,6 +7,7 @@
 import com.lexicalscope.svm.partition.spec.CallContext;
 import com.lexicalscope.svm.vm.j.JState;
 import com.lexicalscope.svm.vm.j.KlassInternalName;
+import com.lexicalscope.svm.vm.j.klass.SMethodDescriptor;
 
 class MatcherPartition {
    private final Matcher<? super CallContext> aMatcher;
@@ -25,8 +26,12 @@ public MatcherPartition(
       this.uPartitionTag = uPartitionTag;
    }
 
-   public Object tagForConstructionOf(final JState ctx, final KlassInternalName klassDesc) {
-      final CallContext callContext = new JStateCallContext(ctx, klassDesc);
+   public Object tagForConstructionOf(
+         final JState ctx,
+         final KlassInternalName klassDesc,
+         final SMethodDescriptor targetMethod,
+         final Object[] args) {
+      final CallContext callContext = new JStateCallContext(ctx, klassDesc, targetMethod, args);
       Object partitionTag;
       if (aMatcher.matches(callContext)) {
          partitionTag = aPartitionTag;

svm-partition-trace/src/main/java/com/lexicalscope/svm/partition/trace/ops/TagConstructorRecieverWithPartition.java

@@ -28,7 +28,7 @@ public TagConstructorRecieverWithPartition(
       ctx.put(
             (ObjectRef) args[0],
             SClass.OBJECT_TAG_OFFSET,
-            partition.tagForConstructionOf(ctx, targetMethod.klassName()));
+            partition.tagForConstructionOf(ctx, targetMethod.klassName(), targetMethod, args));
    }
 
    @Override public <T> T query(final InstructionQuery<T> instructionQuery) {

svm-partition-trace/src/main/java/com/lexicalscope/svm/partition/trace/ops/TagNewInstanceWithPartitionOp.java

@@ -11,7 +11,6 @@
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.core.CombinableMatcher.both;
 
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -23,7 +22,8 @@ public class TestMethodParametersCanBeUsedForPartitioning {
    {
       instrumentPartition(
             receiverClass(ClassOutsidePartition.class),
-            both(receiverClass(ClassSometimesInsidePartition.class)).and(calleeParameter(1, value(equalTo((Object) 2)))),
+            both(receiverClass(ClassSometimesInsidePartition.class)).
+               and(calleeParameter(1, value(equalTo((Object) 2)))),
             vm);
       vm.builder().initialState().meta(TRACE, trace().build());
    }
@@ -47,14 +47,18 @@ public int entry(final int x1, final int x2) {
       new ClassOutsidePartition().entry(3, 4);
    }
 
-   @Test @Ignore("need to instrument constructor calls instead of new instructions for this to work") public void collectArgumentsInTrace() throws Exception {
+   @Test public void collectArgumentsInTrace() throws Exception {
       vm.execute();
 
       assertThat(
             vm.result().getMeta(TRACE),
-            has(methodCallOf(ClassSometimesInsidePartition.class, INIT, "(I)V"),
-                methodReturnOf(ClassSometimesInsidePartition.class, INIT, "(I)V"),
-                methodCallOf(ClassSometimesInsidePartition.class, "myMethod", "(I)I", any(Object.class), equalTo((Object) 4)),
-                methodReturnOf(ClassSometimesInsidePartition.class, "myMethod", "(I)I", equalTo((Object) 11))).only().inOrder());
+            has(methodCallOf(ClassSometimesInsidePartition.class,
+                     INIT, "(I)V", any(Object.class), equalTo((Object) 2)),
+                methodReturnOf(ClassSometimesInsidePartition.class,
+                      INIT, "(I)V"),
+                methodCallOf(ClassSometimesInsidePartition.class,
+                      "myMethod", "(I)I", any(Object.class), equalTo((Object) 4)),
+                methodReturnOf(ClassSometimesInsidePartition.class,
+                      "myMethod", "(I)I", equalTo((Object) 8))).only().inOrder());
    }
 }