Mercurial > hg > graal-jvmci-8

diff src/share/vm/prims/jvmtiEnvBase.cpp @ 23614:32b682649973 jdk8u75-b04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8132051: Better byte behavior Reviewed-by: coleenp, roland
author kevinw
date Fri, 15 Jan 2016 22:33:15 +0000
parents ce8f6bb717c9
children b5f3a471e646 d109bda16490
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiEnvBase.cpp	Mon Jan 11 13:41:45 2016 -0800
+++ b/src/share/vm/prims/jvmtiEnvBase.cpp	Fri Jan 15 22:33:15 2016 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -1348,7 +1348,7 @@
   ResultTypeFinder rtf(signature);
   TosState fr_tos = as_TosState(rtf.type());
   if (fr_tos != tos) {
-    if (tos != itos || (fr_tos != btos && fr_tos != ctos && fr_tos != stos)) {
+    if (tos != itos || (fr_tos != btos && fr_tos != ztos && fr_tos != ctos && fr_tos != stos)) {
       return JVMTI_ERROR_TYPE_MISMATCH;
     }
   }