--- a/src/hotspot/share/oops/klass.cpp Wed May 02 15:29:55 2018 +0100
+++ b/src/hotspot/share/oops/klass.cpp Wed May 02 09:26:10 2018 -0700
@@ -224,7 +224,7 @@
return true;
}
-void Klass::initialize_supers(Klass* k, TRAPS) {
+void Klass::initialize_supers(Klass* k, Array<Klass*>* transitive_interfaces, TRAPS) {
if (FastSuperclassLimit == 0) {
// None of the other machinery matters.
set_super(k);
@@ -292,7 +292,7 @@
ResourceMark rm(THREAD); // need to reclaim GrowableArrays allocated below
// Compute the "real" non-extra secondaries.
- GrowableArray<Klass*>* secondaries = compute_secondary_supers(extras);
+ GrowableArray<Klass*>* secondaries = compute_secondary_supers(extras, transitive_interfaces);
if (secondaries == NULL) {
// secondary_supers set by compute_secondary_supers
return;
@@ -342,8 +342,10 @@
}
}
-GrowableArray<Klass*>* Klass::compute_secondary_supers(int num_extra_slots) {
+GrowableArray<Klass*>* Klass::compute_secondary_supers(int num_extra_slots,
+ Array<Klass*>* transitive_interfaces) {
assert(num_extra_slots == 0, "override for complex klasses");
+ assert(transitive_interfaces == NULL, "sanity");
set_secondary_supers(Universe::the_empty_klass_array());
return NULL;
}