src/hotspot/share/opto/compile.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 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) 1997, 2018, 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.
*** 4149,4159 ****
  int Compile::static_subtype_check(ciKlass* superk, ciKlass* subk) {
    if (StressReflectiveCode || superk == NULL || subk == NULL) {
      return SSC_full_test;       // Let caller generate the general case.
    }
  
!   if (!EnableMVT && !EnableValhalla && superk == env()->Object_klass()) {
      return SSC_always_true;     // (0) this test cannot fail
    }
  
    ciType* superelem = superk;
    if (superelem->is_array_klass())
--- 4149,4159 ----
  int Compile::static_subtype_check(ciKlass* superk, ciKlass* subk) {
    if (StressReflectiveCode || superk == NULL || subk == NULL) {
      return SSC_full_test;       // Let caller generate the general case.
    }
  
!   if (!EnableValhalla && superk == env()->Object_klass()) {
      return SSC_always_true;     // (0) this test cannot fail
    }
  
    ciType* superelem = superk;
    if (superelem->is_array_klass())