truffle: src/share/vm/opto/macro.cpp comparison

6802499: EA: assert(false,"unknown node on this path") Summary: Add missing checks for SCMemProj node in Escape analysis code. Reviewed-by: never

comparison

equal deleted inserted replaced

-:5d75ab5f6698
+:49a36a80b0c7
 return mem;
 } else {
 assert(adr_idx == Compile::AliasIdxRaw, "address must match or be raw");
 }
 mem = mem->in(MemNode::Memory);
+} else if (mem->Opcode() == Op_SCMemProj) {
+assert(mem->in(0)->is_LoadStore(), "sanity");
+const TypePtr* atype = mem->in(0)->in(MemNode::Address)->bottom_type()->is_ptr();
+int adr_idx = Compile::current()->get_alias_index(atype);
+if (adr_idx == alias_idx) {
+assert(false, "Object is not scalar replaceable if a LoadStore node access its field");
+return NULL;
+}
+mem = mem->in(0)->in(MemNode::Memory);
 } else {
 return mem;
 }
 assert(mem != orig_mem, "dead memory loop");
 }
 val = value_from_mem_phi(val, ft, phi_type, adr_t, alloc, value_phis, level-1);
 if (val == NULL) {
 return NULL;
 }
 values.at_put(j, val);
+} else if (val->Opcode() == Op_SCMemProj) {
+assert(val->in(0)->is_LoadStore(), "sanity");
+assert(false, "Object is not scalar replaceable if a LoadStore node access its field");
+return NULL;
 } else {
+#ifdef ASSERT
+val->dump();
 assert(false, "unknown node on this path");
+#endif
 return NULL;  // unknown node on this path
 }
 }
 }
 // Set Phi's inputs

Mercurial > hg > truffle