Merge
authorjwilhelm
Thu, 08 Oct 2015 22:35:20 +0200
changeset 33145 eda79f89d495
parent 33144 c56850e328fc (current diff)
parent 33087 5945b51448e9 (diff)
child 33146 77349b58b4c0
Merge
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Mon Oct 05 14:56:19 2015 -0700
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Thu Oct 08 22:35:20 2015 +0200
@@ -849,7 +849,7 @@
     __ movl(end, Address(rsp, 4 + 0)); // end
     __ subl(len, Address(rsp, 4 + 1 * wordSize));  // end - offset == length
     // Calculate address of start element
-    if (kind == Interpreter::java_util_zip_CRC32_updateByteBuffer) {
+    if (kind == Interpreter::java_util_zip_CRC32C_updateDirectByteBuffer) {
       __ movptr(buf, Address(rsp, 4 + 2 * wordSize)); // long address
       __ addptr(buf, Address(rsp, 4 + 1 * wordSize)); // + offset
       __ movl(crc, Address(rsp, 4 + 4 * wordSize)); // Initial CRC