src/hotspot/cpu/x86/templateTable_x86.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.
*** 446,468 ****
    __ cmpl(rdx, JVM_CONSTANT_UnresolvedClassInError);
    __ jccb(Assembler::equal, call_ldc);
  
    // resolved class - need to call vm to get java mirror of the class
    __ cmpl(rdx, JVM_CONSTANT_Class);
-   __ jcc(Assembler::equal, call_ldc);
- 
-   // unresolved value type - get the resolved class
-   __ cmpl(rdx, JVM_CONSTANT_UnresolvedValue);
-   __ jccb(Assembler::equal, call_ldc);
- 
-   // unresolved value type in error state - call into runtime to throw the error
-   // from the first resolution attempt
-   __ cmpl(rdx, JVM_CONSTANT_UnresolvedValueInError);
-   __ jccb(Assembler::equal, call_ldc);
- 
-   // resolved value type - need to call vm to get java mirror
-   __ cmpl(rdx, JVM_CONSTANT_Value);
    __ jcc(Assembler::notEqual, notClass);
  
    __ bind(call_ldc);
  
    __ movl(rarg, wide);
--- 446,455 ----
*** 2783,2793 ****
    if (state == itos) {
      __ narrow(rax);
    }
  
  #ifdef ASSERT
!   if (EnableMVT || EnableValhalla) {
      if (state == atos) {
        const Register thread1 = NOT_LP64(rcx) LP64_ONLY(r15_thread);
        __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::check_areturn), rax);
        NOT_LP64(__ get_thread(thread1));
        __ get_vm_result(rax, thread1);
--- 2770,2780 ----
    if (state == itos) {
      __ narrow(rax);
    }
  
  #ifdef ASSERT
!   if (EnableValhalla) {
      if (state == atos) {
        const Register thread1 = NOT_LP64(rcx) LP64_ONLY(r15_thread);
        __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::check_areturn), rax);
        NOT_LP64(__ get_thread(thread1));
        __ get_vm_result(rax, thread1);