diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index 2faaa6f9ce6..f1c3175f6cc 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -1464,8 +1464,8 @@ void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) {
     Label* success_target = &done;
     Label* failure_target = stub->entry();
 
-    __ testptr(value, value);
     if (op->should_profile()) {
+      __ testptr(value, value);
       Label not_null;
       Register mdo  = klass_RInfo;
       __ mov_metadata(mdo, md->constant_encoding());
diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
index 30470e023c7..de8dea7dd8a 100644
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
@@ -275,7 +275,7 @@ void C1_MacroAssembler::step_random(Register state, Register temp) {
     /* CRC used as a pseudo-random-number generator */
     // In effect, the CRC instruction is being used here for its
     // linear feedback shift register.
-    movl(temp, 0);
+    xorl(temp, temp);
     crc32(state, temp, /*sizeInBytes*/2);
   } else {
     /* LCG by Marsaglia. From Karl Entacher,