# HG changeset patch
# User amurillo
# Date 1424451939 0
# Node ID 34f0c0e9df2188def1dac7d9b0d5bd95dc2b4303
# Parent  e84a77e479662bce804882cfd147d0d8c34d1109# Parent  415762d044e48a64d37827a61ce50c068f2d04a8
Merge

diff -r 415762d044e4 -r 34f0c0e9df21 src/share/vm/classfile/verifier.cpp
--- a/src/share/vm/classfile/verifier.cpp	Fri Feb 20 06:24:08 2015 -0800
+++ b/src/share/vm/classfile/verifier.cpp	Fri Feb 20 17:05:39 2015 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, 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
@@ -2488,8 +2488,7 @@
     // of the current class.
     VerificationType objectref_type = new_class_type;
     if (name_in_supers(ref_class_type.name(), current_class())) {
-      Klass* ref_klass = load_class(
-        ref_class_type.name(), CHECK_VERIFY(this));
+      Klass* ref_klass = load_class(ref_class_type.name(), CHECK);
       Method* m = InstanceKlass::cast(ref_klass)->uncached_lookup_method(
         vmSymbols::object_initializer_name(),
         cp->signature_ref_at(bcs->get_index_u2()), Klass::normal);