Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 11 additions & 1 deletion src/hotspot/share/opto/gcm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,17 @@ Block* PhaseCFG::insert_anti_dependences(Block* LCA, Node* load, bool verify) {
worklist_def_use_mem_states.pop();

uint op = use_mem_state->Opcode();
assert(!use_mem_state->needs_anti_dependence_check(), "no loads");

#ifdef ASSERT
// CacheWB nodes are peculiar in a sense that they both are anti-dependent and produce memory.
// Allow them to be treated as a store.
bool is_cache_wb = false;
if (use_mem_state->is_Mach()) {
int ideal_op = use_mem_state->as_Mach()->ideal_Opcode();
is_cache_wb = (ideal_op == Op_CacheWB);
}
assert(!use_mem_state->needs_anti_dependence_check() || is_cache_wb, "no loads");
#endif

// MergeMems do not directly have anti-deps.
// Treat them as internal nodes in a forward tree of memory states,
Expand Down
2 changes: 0 additions & 2 deletions test/hotspot/jtreg/ProblemList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@

# :hotspot_compiler

applications/ctw/modules/java_base_2.java 8341831 linux-x64

compiler/ciReplay/TestSAServer.java 8029528 generic-all
compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8225370 generic-all

Expand Down