# HG changeset patch
# User iveresov
# Date 1395776609 25200
# Node ID eb6b3ac64f0eb6c182e41b8051e5eb0ec347e284
# Parent  85b20fdf2d244918d49bbebf3cb9f7e3a5cabcbf# Parent  049414a5b5f668947e540a1a911454fcd64663c0
Merge

diff -r 85b20fdf2d24 -r eb6b3ac64f0e src/cpu/x86/vm/assembler_x86.cpp
--- a/src/cpu/x86/vm/assembler_x86.cpp	Tue Mar 25 11:38:48 2014 -0700
+++ b/src/cpu/x86/vm/assembler_x86.cpp	Tue Mar 25 12:43:29 2014 -0700
@@ -1112,7 +1112,6 @@
 }
 
 void Assembler::bsrl(Register dst, Register src) {
-  assert(!VM_Version::supports_lzcnt(), "encoding is treated as LZCNT");
   int encode = prefix_and_encode(dst->encoding(), src->encoding());
   emit_int8(0x0F);
   emit_int8((unsigned char)0xBD);
@@ -4977,7 +4976,6 @@
 }
 
 void Assembler::bsrq(Register dst, Register src) {
-  assert(!VM_Version::supports_lzcnt(), "encoding is treated as LZCNT");
   int encode = prefixq_and_encode(dst->encoding(), src->encoding());
   emit_int8(0x0F);
   emit_int8((unsigned char)0xBD);