src/hotspot/share/classfile/bytecodeAssembler.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 185,197 ****
      case T_SHORT:
      case T_INT:     iload(index); break;
      case T_FLOAT:   fload(index); break;
      case T_DOUBLE:  dload(index); break;
      case T_LONG:    lload(index); break;
-     case T_OBJECT:
-     case T_ARRAY:   aload(index); break;
      default:
        ShouldNotReachHere();
    }
  }
  
  void BytecodeAssembler::checkcast(Symbol* sym) {
--- 185,199 ----
      case T_SHORT:
      case T_INT:     iload(index); break;
      case T_FLOAT:   fload(index); break;
      case T_DOUBLE:  dload(index); break;
      case T_LONG:    lload(index); break;
      default:
+       if (is_reference_type(bt)) {
+                     aload(index);
+                     break;
+       }
        ShouldNotReachHere();
    }
  }
  
  void BytecodeAssembler::checkcast(Symbol* sym) {
*** 252,263 ****
      case T_SHORT:
      case T_INT:     ireturn(); break;
      case T_FLOAT:   freturn(); break;
      case T_DOUBLE:  dreturn(); break;
      case T_LONG:    lreturn(); break;
-     case T_OBJECT:
-     case T_ARRAY:   areturn(); break;
      case T_VOID:    _return(); break;
      default:
        ShouldNotReachHere();
    }
  }
--- 254,267 ----
      case T_SHORT:
      case T_INT:     ireturn(); break;
      case T_FLOAT:   freturn(); break;
      case T_DOUBLE:  dreturn(); break;
      case T_LONG:    lreturn(); break;
      case T_VOID:    _return(); break;
      default:
+       if (is_reference_type(bt)) {
+                     areturn(); 
+                     break;
+       }
        ShouldNotReachHere();
    }
  }