graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReplacementsImpl.java

*** 59,69 ****
                  if (!config.usePopCountInstruction) {
                      return null;
                  }
              } else if (substituteMethod.getName().equals("numberOfLeadingZeros")) {
                  if (config.useCountLeadingZerosInstruction) {
!                     // bsr is lzcnt
                      return null;
                  }
              }
          } else if (substituteClass == CRC32Substitutions.class) {
              if (!config.useCRC32Intrinsics) {
--- 59,72 ----
                  if (!config.usePopCountInstruction) {
                      return null;
                  }
              } else if (substituteMethod.getName().equals("numberOfLeadingZeros")) {
                  if (config.useCountLeadingZerosInstruction) {
!                     return null;
!                 }
!             } else if (substituteMethod.getName().equals("numberOfTrailingZeros")) {
!                 if (config.useCountTrailingZerosInstruction) {
                      return null;
                  }
              }
          } else if (substituteClass == CRC32Substitutions.class) {
              if (!config.useCRC32Intrinsics) {