--- old/src/share/vm/classfile/packageEntry.hpp	2016-12-21 08:14:00.565631527 -0500
+++ new/src/share/vm/classfile/packageEntry.hpp	2016-12-21 08:13:59.522757025 -0500
@@ -70,7 +70,6 @@
   bool _is_exported_unqualified;
   bool _is_exported_allUnnamed;
   bool _must_walk_exports;
-  GrowableArray<ModuleEntry*>* _exported_pending_delete; // transitioned from qualified to unqualified, delete at safepoint
   GrowableArray<ModuleEntry*>* _qualified_exports;
   TRACE_DEFINE_TRACE_ID_FIELD;
 
@@ -84,7 +83,6 @@
     _is_exported_unqualified = false;
     _is_exported_allUnnamed = false;
     _must_walk_exports = false;
-    _exported_pending_delete = NULL;
     _qualified_exports = NULL;
   }
 
@@ -106,29 +104,20 @@
   }
   // Returns true if there are any explicit qualified exports
   bool has_qual_exports_list() const {
-    assert(!(_qualified_exports != NULL && _is_exported_unqualified),
-           "_qualified_exports set at same time as _is_exported_unqualified");
-    return (_qualified_exports != NULL);
+    return (!is_unqual_exported() && _qualified_exports != NULL);
   }
   bool is_exported_allUnnamed() const {
-    assert(!(_is_exported_allUnnamed && _is_exported_unqualified),
-           "_is_exported_allUnnamed set at same time as _is_exported_unqualified");
-    return _is_exported_allUnnamed;
+    return (!is_unqual_exported() && _is_exported_allUnnamed);
   }
   bool is_unqual_exported() const {
-    assert(!(_qualified_exports != NULL && _is_exported_unqualified),
-           "_qualified_exports set at same time as _is_exported_unqualified");
-    assert(!(_is_exported_allUnnamed && _is_exported_unqualified),
-           "_is_exported_allUnnamed set at same time as _is_exported_unqualified");
     return _is_exported_unqualified;
   }
   void set_unqual_exported() {
     assert(Module_lock->owned_by_self(), "should have the Module_lock");
     _is_exported_unqualified = true;
     _is_exported_allUnnamed = false;
-    _qualified_exports = NULL;
   }
-  bool exported_pending_delete() const     { return (_exported_pending_delete != NULL); }
+  bool exported_pending_delete() const { return (is_unqual_exported() && _qualified_exports != NULL); }
 
   void set_exported(ModuleEntry* m);