--- a/hotspot/src/share/vm/opto/library_call.cpp	Fri Mar 09 13:34:45 2012 -0800
+++ b/hotspot/src/share/vm/opto/library_call.cpp	Mon Mar 12 15:28:07 2012 -0700
@@ -338,11 +338,11 @@
     break;
 
   case vmIntrinsics::_bitCount_i:
-    if (!Matcher::has_match_rule(Op_PopCountI)) return NULL;
+    if (!Matcher::match_rule_supported(Op_PopCountI)) return NULL;
     break;
 
   case vmIntrinsics::_bitCount_l:
-    if (!Matcher::has_match_rule(Op_PopCountL)) return NULL;
+    if (!Matcher::match_rule_supported(Op_PopCountL)) return NULL;
     break;
 
   case vmIntrinsics::_numberOfLeadingZeros_i: