stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8217424: Remove the idempotent parameter to Method::sort_methods

Browse Source 
Reviewed-by: coleenp, shade
This commit is contained in:
Ioi Lam 2019-01-22 12:37:35 -08:00
parent 0623444ae5
commit f910adfb9f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/classfile/defaultMethods.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2019, 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
@ -988,7 +988,7 @@ static void create_default_methods( InstanceKlass* klass,
for (int index = 0; index < new_size; index++ ) {
total_default_methods->at_put(index, new_methods->at(index));
}
Method::sort_methods(total_default_methods, false, false);
Method::sort_methods(total_default_methods, /*set_idnums=*/false);
klass->set_default_methods(total_default_methods);
}

6
src/hotspot/share/oops/method.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, 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
@ -1604,12 +1604,12 @@ static int method_comparator(Method* a, Method* b) {
// This is only done during class loading, so it is OK to assume method_idnum matches the methods() array
// default_methods also uses this without the ordering for fast find_method
void Method::sort_methods(Array<Method*>* methods, bool idempotent, bool set_idnums) {
void Method::sort_methods(Array<Method*>* methods, bool set_idnums) {
int length = methods->length();
if (length > 1) {
{
NoSafepointVerifier nsv;
QuickSort::sort(methods->data(), length, method_comparator, idempotent);
QuickSort::sort(methods->data(), length, method_comparator, /*idempotent=*/false);
}
// Reset method ordering
if (set_idnums) {

2
src/hotspot/share/oops/method.hpp
View File

@ -969,7 +969,7 @@ class Method : public Metadata {
#endif
// Helper routine used for method sorting
static void sort_methods(Array<Method*>* methods, bool idempotent = false, bool set_idnums = true);
static void sort_methods(Array<Method*>* methods, bool set_idnums = true);
// Deallocation function for redefine classes or if an error occurs
void deallocate_contents(ClassLoaderData* loader_data);