src/share/vm/classfile/packageEntry.hpp

@@ -68,11 +68,10 @@
   // indicates from which class path entry.
   s2 _classpath_index;
   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;
 
   // Initial size of a package entry's list of qualified exports.
   enum {QUAL_EXP_SIZE = 43};

@@ -82,11 +81,10 @@
     _module = NULL;
     _classpath_index = -1;
     _is_exported_unqualified = false;
     _is_exported_allUnnamed = false;
     _must_walk_exports = false;
-    _exported_pending_delete = NULL;
     _qualified_exports = NULL;
   }
 
   // package name
   Symbol*            name() const               { return literal(); }

@@ -104,33 +102,24 @@
   bool is_qual_exported() const {
     return (has_qual_exports_list() || is_exported_allUnnamed());
   }
   // 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);
 
   void set_is_exported_allUnnamed();