diff --git a/src/share/classes/java/lang/invoke/MemberName.java b/src/share/classes/java/lang/invoke/MemberName.java index e38b6594e608f195d0e37657ebcd13703ff8ccec..595b1145fe1df51c3ef847592c743c01357156b1 100644 --- a/src/share/classes/java/lang/invoke/MemberName.java +++ b/src/share/classes/java/lang/invoke/MemberName.java @@ -306,12 +306,6 @@ import java.util.Objects; 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 @@ import java.util.Objects; 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 --git a/test/java/lang/invoke/PermuteArgsTest.java b/test/java/lang/invoke/PermuteArgsTest.java index 96607ed6ee2a484a6378c1f3f3462ffca6353578..2e319210148472415dc0807c7d1abcefeea8a848 100644 --- a/test/java/lang/invoke/PermuteArgsTest.java +++ b/test/java/lang/invoke/PermuteArgsTest.java @@ -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