--- a/hotspot/src/cpu/x86/vm/x86_32.ad	Fri Mar 09 13:34:45 2012 -0800
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad	Mon Mar 12 15:28:07 2012 -0700
@@ -1293,6 +1293,14 @@
   if (!has_match_rule(opcode))
     return false;
 
+  switch (opcode) {
+    case Op_PopCountI:
+    case Op_PopCountL:
+      if (!UsePopCountInstruction)
+        return false;
+    break;
+  }
+  
   return true;  // Per default match rules are supported.
 }