Wed, 17 Jul 2019 21:18:57 +0100
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Wed Jul 17 20:41:54 2019 +0100 1.2 +++ b/.hgtags Wed Jul 17 21:18:57 2019 +0100 1.3 @@ -1271,3 +1271,6 @@ 1.4 75f4e02f1113bc353fc60df7330dd5456efc49a3 jdk8u222-b07 1.5 36a743eee6721b423b7c21a3ba28ac8d906a5386 jdk8u222-b08 1.6 1ec20e8a3d8a7a29e9113b14567abec9f0240e9d jdk8u232-b00 1.7 +55f693ba975d445d83a59cc32367ec4c2452b0c5 jdk8u222-b09 1.8 +adfdce09acc32a691145a67792d47ab637159776 jdk8u222-b10 1.9 +adfdce09acc32a691145a67792d47ab637159776 jdk8u222-ga
2.1 --- a/src/share/vm/classfile/vmSymbols.hpp Wed Jul 17 20:41:54 2019 +0100 2.2 +++ b/src/share/vm/classfile/vmSymbols.hpp Wed Jul 17 21:18:57 2019 +0100 2.3 @@ -832,21 +832,21 @@ 2.4 do_class(com_sun_crypto_provider_aescrypt, "com/sun/crypto/provider/AESCrypt") \ 2.5 do_intrinsic(_aescrypt_encryptBlock, com_sun_crypto_provider_aescrypt, encryptBlock_name, byteArray_int_byteArray_int_signature, F_R) \ 2.6 do_intrinsic(_aescrypt_decryptBlock, com_sun_crypto_provider_aescrypt, decryptBlock_name, byteArray_int_byteArray_int_signature, F_R) \ 2.7 - do_name( encryptBlock_name, "encryptBlock") \ 2.8 - do_name( decryptBlock_name, "decryptBlock") \ 2.9 + do_name( encryptBlock_name, "implEncryptBlock") \ 2.10 + do_name( decryptBlock_name, "implDecryptBlock") \ 2.11 do_signature(byteArray_int_byteArray_int_signature, "([BI[BI)V") \ 2.12 \ 2.13 do_class(com_sun_crypto_provider_cipherBlockChaining, "com/sun/crypto/provider/CipherBlockChaining") \ 2.14 do_intrinsic(_cipherBlockChaining_encryptAESCrypt, com_sun_crypto_provider_cipherBlockChaining, encrypt_name, byteArray_int_int_byteArray_int_signature, F_R) \ 2.15 do_intrinsic(_cipherBlockChaining_decryptAESCrypt, com_sun_crypto_provider_cipherBlockChaining, decrypt_name, byteArray_int_int_byteArray_int_signature, F_R) \ 2.16 - do_name( encrypt_name, "encrypt") \ 2.17 - do_name( decrypt_name, "decrypt") \ 2.18 + do_name( encrypt_name, "implEncrypt") \ 2.19 + do_name( decrypt_name, "implDecrypt") \ 2.20 do_signature(byteArray_int_int_byteArray_int_signature, "([BII[BI)I") \ 2.21 \ 2.22 /* support for sun.security.provider.SHA */ \ 2.23 do_class(sun_security_provider_sha, "sun/security/provider/SHA") \ 2.24 do_intrinsic(_sha_implCompress, sun_security_provider_sha, implCompress_name, implCompress_signature, F_R) \ 2.25 - do_name( implCompress_name, "implCompress") \ 2.26 + do_name( implCompress_name, "implCompress0") \ 2.27 do_signature(implCompress_signature, "([BI)V") \ 2.28 \ 2.29 /* support for sun.security.provider.SHA2 */ \ 2.30 @@ -860,7 +860,7 @@ 2.31 /* support for sun.security.provider.DigestBase */ \ 2.32 do_class(sun_security_provider_digestbase, "sun/security/provider/DigestBase") \ 2.33 do_intrinsic(_digestBase_implCompressMB, sun_security_provider_digestbase, implCompressMB_name, implCompressMB_signature, F_R) \ 2.34 - do_name( implCompressMB_name, "implCompressMultiBlock") \ 2.35 + do_name( implCompressMB_name, "implCompressMultiBlock0") \ 2.36 do_signature(implCompressMB_signature, "([BII)I") \ 2.37 \ 2.38 /* support for java.util.zip */ \