src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java

rev 59189 : imported patch hotspot
rev 59190 : imported patch hotspot-01

*** 548,576 ****
              assert config.aescryptEncryptBlockStub != 0L;
              assert config.aescryptDecryptBlockStub != 0L;
              assert config.cipherBlockChainingEncryptAESCryptStub != 0L;
              assert config.cipherBlockChainingDecryptAESCryptStub != 0L;
              String arch = config.osArch;
-             String decryptSuffix = arch.equals("sparc") ? "WithOriginalKey" : "";
  
              Registration r = new Registration(plugins, "com.sun.crypto.provider.CipherBlockChaining", replacements);
  
              Pair<String, String> cbcEncryptName = selectIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implEncrypt", "encrypt");
              registerAndCheckMismatch(r, CipherBlockChainingSubstitutions.class, cbcEncryptName, Receiver.class, byte[].class, int.class, int.class,
                              byte[].class, int.class);
  
              Pair<String, String> cbcDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt");
!             registerAndCheckMismatch(r, CipherBlockChainingSubstitutions.class, cbcDecryptName, cbcDecryptName.getLeft() + decryptSuffix, Receiver.class, byte[].class, int.class, int.class,
                              byte[].class, int.class);
  
              r = new Registration(plugins, "com.sun.crypto.provider.AESCrypt", replacements);
  
              Pair<String, String> aesEncryptName = selectIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implEncryptBlock", "encryptBlock");
              registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesEncryptName, Receiver.class, byte[].class, int.class, byte[].class, int.class);
  
              Pair<String, String> aesDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock");
!             registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesDecryptName, aesDecryptName.getLeft() + decryptSuffix, Receiver.class, byte[].class, int.class, byte[].class, int.class);
          }
      }
  
      private static void registerAndCheckMismatch(Registration r, Class<?> substitutionClass, Pair<String, String> intrinsicNames, Type... argumentTypes) {
          try {
--- 548,575 ----
              assert config.aescryptEncryptBlockStub != 0L;
              assert config.aescryptDecryptBlockStub != 0L;
              assert config.cipherBlockChainingEncryptAESCryptStub != 0L;
              assert config.cipherBlockChainingDecryptAESCryptStub != 0L;
              String arch = config.osArch;
  
              Registration r = new Registration(plugins, "com.sun.crypto.provider.CipherBlockChaining", replacements);
  
              Pair<String, String> cbcEncryptName = selectIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implEncrypt", "encrypt");
              registerAndCheckMismatch(r, CipherBlockChainingSubstitutions.class, cbcEncryptName, Receiver.class, byte[].class, int.class, int.class,
                              byte[].class, int.class);
  
              Pair<String, String> cbcDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt");
!             registerAndCheckMismatch(r, CipherBlockChainingSubstitutions.class, cbcDecryptName, cbcDecryptName.getLeft(), Receiver.class, byte[].class, int.class, int.class,
                              byte[].class, int.class);
  
              r = new Registration(plugins, "com.sun.crypto.provider.AESCrypt", replacements);
  
              Pair<String, String> aesEncryptName = selectIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implEncryptBlock", "encryptBlock");
              registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesEncryptName, Receiver.class, byte[].class, int.class, byte[].class, int.class);
  
              Pair<String, String> aesDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock");
!             registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesDecryptName, aesDecryptName.getLeft(), Receiver.class, byte[].class, int.class, byte[].class, int.class);
          }
      }
  
      private static void registerAndCheckMismatch(Registration r, Class<?> substitutionClass, Pair<String, String> intrinsicNames, Type... argumentTypes) {
          try {