8212821: CHECK_ must be used in the rhs of an assignment statement within a block (round 2)

Summary: Correction of failed backport of JDK-8211394 via JDK-8212696.
Reviewed-by: dholmes, coffeys

src/share/vm/classfile/verificationType.cpp

 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -99,7 +99,7 @@ bool VerificationType::is_reference_assignable_from(
     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, CHECK_false);
+                                          from_field_is_protected, THREAD);
     }
   }
   return false;

src/share/vm/utilities/exceptions.hpp

@@ -201,7 +201,7 @@ class Exceptions {
 //
 // 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!
+// ments! Also make sure it is not used on a function call that is part of a return statement!
 
 #define PENDING_EXCEPTION                        (((ThreadShadow*)THREAD)->pending_exception())
 #define HAS_PENDING_EXCEPTION                    (((ThreadShadow*)THREAD)->has_pending_exception())