Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/prims/jvmtiEnvBase.cpp	Tue Mar 29 23:01:10 2016 +0100
     1.2 +++ b/src/share/vm/prims/jvmtiEnvBase.cpp	Tue Apr 05 08:55:39 2016 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -1348,7 +1348,7 @@
    1.11    ResultTypeFinder rtf(signature);
    1.12    TosState fr_tos = as_TosState(rtf.type());
    1.13    if (fr_tos != tos) {
    1.14 -    if (tos != itos || (fr_tos != btos && fr_tos != ctos && fr_tos != stos)) {
    1.15 +    if (tos != itos || (fr_tos != btos && fr_tos != ztos && fr_tos != ctos && fr_tos != stos)) {
    1.16        return JVMTI_ERROR_TYPE_MISMATCH;
    1.17      }
    1.18    }