changeset 8988:be27fec0948c

8212709: Backout backport of JDK-8211394 from jdk 8u-dev Reviewed-by: dbuck
author igerasim
date Fri, 19 Oct 2018 20:42:34 -0700
parents fbc668a76c00
children e33aa14a0d8b
files src/share/vm/classfile/verificationType.cpp src/share/vm/utilities/exceptions.hpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/verificationType.cpp	Wed Oct 17 16:31:25 2018 -0400
+++ b/src/share/vm/classfile/verificationType.cpp	Fri Oct 19 20:42:34 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -99,7 +99,7 @@
     VerificationType comp_from = from.get_component(context, CHECK_false);
     if (!comp_this.is_bogus() && !comp_from.is_bogus()) {
       return comp_this.is_assignable_from(comp_from, context,
-                                          from_field_is_protected, TRAPS);
+                                          from_field_is_protected, CHECK_false);
     }
   }
   return false;
--- a/src/share/vm/utilities/exceptions.hpp	Wed Oct 17 16:31:25 2018 -0400
+++ b/src/share/vm/utilities/exceptions.hpp	Fri Oct 19 20:42:34 2018 -0700
@@ -201,7 +201,7 @@
 //
 // CAUTION: make sure that the function call using a CHECK macro is not the only statement of a
 // conditional branch w/o enclosing {} braces, since the CHECK macros expand into several state-
-// ments! Also make sure it is not used on a function call that is part of a return statement!
+// ments!
 
 #define PENDING_EXCEPTION                        (((ThreadShadow*)THREAD)->pending_exception())
 #define HAS_PENDING_EXCEPTION                    (((ThreadShadow*)THREAD)->has_pending_exception())