# HG changeset patch
# User twisti
# Date 1346451625 25200
# Node ID 88b4c47901b6277c00b75197d2caaa6c6dae461e
# Parent  f40b6b113fabfbd5b9ef67d2e3f9684199303471# Parent  4009af23799cb21bf914c9ab2a7e121cdd23073d
Merge

diff -r f40b6b113fab -r 88b4c47901b6 jdk/src/share/classes/java/lang/invoke/MemberName.java
--- a/jdk/src/share/classes/java/lang/invoke/MemberName.java	Fri Aug 24 15:41:39 2012 -0700
+++ b/jdk/src/share/classes/java/lang/invoke/MemberName.java	Fri Aug 31 15:20:25 2012 -0700
@@ -306,12 +306,6 @@
         return this;
     }
 
-    private void setFlags(int flags) {
-        this.flags = flags;
-        assert(testAnyFlags(ALL_KINDS));
-        assert(referenceKindIsConsistent());
-    }
-
     private boolean testFlags(int mask, int value) {
         return (flags & mask) == value;
     }
@@ -452,8 +446,10 @@
         this.clazz = defClass;
         this.name = name;
         this.type = type;
-        setFlags(flags);
+        this.flags = flags;
+        assert(testAnyFlags(ALL_KINDS));
         assert(this.resolution == null);  // nobody should have touched this yet
+        //assert(referenceKindIsConsistent());  // do this after resolution
     }
 
     private void expandFromVM() {
diff -r f40b6b113fab -r 88b4c47901b6 jdk/test/java/lang/invoke/PermuteArgsTest.java
--- a/jdk/test/java/lang/invoke/PermuteArgsTest.java	Fri Aug 24 15:41:39 2012 -0700
+++ b/jdk/test/java/lang/invoke/PermuteArgsTest.java	Fri Aug 31 15:20:25 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 /* @test
  * @summary unit tests for method handles which permute their arguments
- * @run junit/othervm -ea -esa -DPermuteArgsTest.MAX_ARITY=8 test.java.lang.invoke.PermuteArgsTest
+ * @run junit/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies -ea -esa -DPermuteArgsTest.MAX_ARITY=8 test.java.lang.invoke.PermuteArgsTest
  */
 /* Examples of manual runs:
  * java -DPermuteArgsTest.{DRY_RUN=true,MAX_ARITY=253} test.java.lang.invoke.PermuteArgsTest