--- old/src/hotspot/cpu/x86/templateTable_x86.cpp	2018-12-03 14:35:27.974995481 +0100
+++ new/src/hotspot/cpu/x86/templateTable_x86.cpp	2018-12-03 14:35:27.658998604 +0100
@@ -2774,7 +2774,7 @@
     __ narrow(rax);
   }
 
-  __ remove_activation(state, rbcp, true, true, true, /*state == qtos*/ false && ValueTypeReturnedAsFields);
+  __ remove_activation(state, rbcp, true, true, true, state == atos && ValueTypeReturnedAsFields);
 
   __ jmp(rbcp);
 }