Skip to content

8168304: Make all of DependencyContext_test available in product mode #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

8168304: Make all of DependencyContext_test available in product mode #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/hotspot/share/code/dependencyContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2022, 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
Expand Down Expand Up @@ -246,6 +246,7 @@ void DependencyContext::print_dependent_nmethods(bool verbose) {
}
}
}
#endif //PRODUCT

bool DependencyContext::is_dependent_nmethod(nmethod* nm) {
for (nmethodBucket* b = dependencies(); b != NULL; b = b->next()) {
Expand All @@ -267,8 +268,6 @@ bool DependencyContext::find_stale_entries() {
return false;
}

#endif //PRODUCT

int nmethodBucket::decrement() {
return Atomic::sub(1, &_count);
}
4 changes: 2 additions & 2 deletions src/hotspot/share/code/dependencyContext.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020, 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
Expand Down Expand Up @@ -147,8 +147,8 @@ class DependencyContext : public StackObj {

#ifndef PRODUCT
void print_dependent_nmethods(bool verbose);
#endif //PRODUCT
bool is_dependent_nmethod(nmethod* nm);
bool find_stale_entries();
#endif //PRODUCT
};
#endif // SHARE_VM_CODE_DEPENDENCYCONTEXT_HPP
14 changes: 6 additions & 8 deletions test/hotspot/gtest/code/test_dependencyContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2020, 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
Expand Down Expand Up @@ -58,32 +58,30 @@ class TestDependencyContext {
return ctx.has_stale_entries();
}

#ifndef PRODUCT
static bool find_stale_entries(DependencyContext ctx) {
return ctx.find_stale_entries();
}
#endif
};

static void test_remove_dependent_nmethod(int id, bool delete_immediately) {
TestDependencyContext c;
DependencyContext depContext = c.dependencies();
NOT_PRODUCT(ASSERT_FALSE(TestDependencyContext::find_stale_entries(depContext)));
ASSERT_FALSE(TestDependencyContext::find_stale_entries(depContext));
ASSERT_FALSE(TestDependencyContext::has_stale_entries(depContext));

nmethod* nm = c._nmethods[id];
depContext.remove_dependent_nmethod(nm, delete_immediately);

if (!delete_immediately) {
NOT_PRODUCT(ASSERT_TRUE(TestDependencyContext::find_stale_entries(depContext)));
ASSERT_TRUE(TestDependencyContext::find_stale_entries(depContext));
ASSERT_TRUE(TestDependencyContext::has_stale_entries(depContext));
NOT_PRODUCT(ASSERT_TRUE(depContext.is_dependent_nmethod(nm)));
ASSERT_TRUE(depContext.is_dependent_nmethod(nm));
depContext.expunge_stale_entries();
}

NOT_PRODUCT(ASSERT_FALSE(TestDependencyContext::find_stale_entries(depContext)));
ASSERT_FALSE(TestDependencyContext::find_stale_entries(depContext));
ASSERT_FALSE(TestDependencyContext::has_stale_entries(depContext));
NOT_PRODUCT(ASSERT_FALSE(depContext.is_dependent_nmethod(nm)));
ASSERT_FALSE(depContext.is_dependent_nmethod(nm));
}

TEST_VM(code, dependency_context) {
Expand Down