# HG changeset patch
# User iveresov
# Date 1395774465 25200
# Node ID 049414a5b5f668947e540a1a911454fcd64663c0
# Parent  bf20bec37f2463a18525acc07b6a67d848ea0d00# Parent  794399f4f5d91883076aeb2746ca924018df3a08
Merge

diff -r 794399f4f5d9 -r 049414a5b5f6 src/cpu/x86/vm/assembler_x86.cpp
--- a/src/cpu/x86/vm/assembler_x86.cpp	Thu Mar 20 15:53:17 2014 +0100
+++ b/src/cpu/x86/vm/assembler_x86.cpp	Tue Mar 25 12:07:45 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);
@@ -4938,7 +4937,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);