Skip to content

[GR-62119] Remove AccessAdvisor assertions with data races. #10683

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

[GR-62119] Remove AccessAdvisor assertions with data races. #10683

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
12 changes: 10 additions & 2 deletions ...ratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/AccessAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,11 @@ public boolean matches(String otherJniFunction, String otherDeclaringClass, Stri
public boolean shouldIgnoreJniLookup(String jniFunction, LazyValue<String> queriedClass, LazyValue<String> name, LazyValue<String> signature, LazyValue<String> callerClass,
EconomicMap<String, Object> entry) {
if (shouldIgnore(queriedClass, callerClass, entry)) {
throw new AssertionError("Must check shouldIgnore before shouldIgnoreJniLookup");
// The live phase could have been changed concurrently after we checked shouldIgnore (we
// don't synchronize). If so, don't throw, and let logic below decide whether to ignore.
if (isInLivePhase) {
throw new AssertionError("Must check shouldIgnore before shouldIgnoreJniLookup");
}
}
if (!heuristicsEnabled || launchPhase >= JNI_STARTUP_COMPLETE) {
// Startup sequence completed (or we're not using the startup heuristics).
Expand Down Expand Up @@ -307,7 +311,11 @@ public boolean shouldIgnoreResourceLookup(LazyValue<String> resource, EconomicMa

public boolean shouldIgnoreLoadClass(LazyValue<String> queriedClass, LazyValue<String> callerClass, EconomicMap<String, Object> entry) {
if (shouldIgnore(queriedClass, callerClass, entry)) {
throw new AssertionError("Must check shouldIgnore before shouldIgnoreLoadClass");
// The live phase could have been changed concurrently after we checked shouldIgnore (we
// don't synchronize). If so, don't throw, and let logic below decide whether to ignore.
if (isInLivePhase) {
throw new AssertionError("Must check shouldIgnore before shouldIgnoreLoadClass");
}
}
if (!heuristicsEnabled) {
return false;
Expand Down
Loading