--- old/src/hotspot/share/classfile/classFileParser.cpp	2018-04-04 11:55:25.034385653 -0400
+++ new/src/hotspot/share/classfile/classFileParser.cpp	2018-04-04 11:55:24.383488713 -0400
@@ -5424,6 +5424,8 @@
   // has to be changed accordingly.
   ik->set_initial_method_idnum(ik->methods()->length());
 
+  ik->set_this_class_index(_this_class_index);
+
   if (is_anonymous()) {
     // _this_class_index is a CONSTANT_Class entry that refers to this
     // anonymous class itself. If this class needs to refer to its own methods or