While doing more testing I found that I had to make some changes in src/share/vm/adlc/formssel.cpp as well. Here is an updated webrev: http://cr.openjdk.java.net/~roland/membar/webrev.03/ Roland.