Skip to content
Permalink
Browse files
Merge lworld
  • Loading branch information
David Simms committed May 10, 2021
2 parents ab997be + c8d7c82 commit 4de6a4848e4c1852b0bbe085f757903967d48a1e
Showing 3 changed files with 3 additions and 6 deletions.
@@ -1144,7 +1144,7 @@ Node* MemNode::can_see_stored_value(Node* st, PhaseTransform* phase) const {
// LoadVector/StoreVector needs additional check to ensure the types match.
if (store_Opcode() == Op_StoreVector) {
const TypeVect* in_vt = st->as_StoreVector()->vect_type();
const TypeVect* out_vt = as_LoadVector()->vect_type();
const TypeVect* out_vt = is_Load() ? as_LoadVector()->vect_type() : as_StoreVector()->vect_type();
if (in_vt != out_vt) {
return NULL;
}
@@ -1610,7 +1610,7 @@ public void visitForeachLoop(JCEnhancedForLoop tree) {
// This is the bare minimum we need to verify to make sure code generation doesn't crash.
Symbol iterSymbol = rs.resolveInternalMethod(tree.pos(),
loopEnv, exprType, names.iterator, List.nil(), List.nil());
if (types.asSuper(iterSymbol.type.getReturnType(), syms.iteratorType.tsym) == null) {
if (types.asSuper(iterSymbol.type.getReturnType().referenceProjectionOrSelf(), syms.iteratorType.tsym) == null) {
log.error(tree.pos(),
Errors.ForeachNotApplicableToType(exprType, Fragments.TypeReqArrayOrIterable));
}
@@ -108,10 +108,7 @@
public abstract class InlineTypeTest {
protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();

protected static final int COMP_LEVEL_ANY = -2;
protected static final int COMP_LEVEL_ALL = -2;
protected static final int COMP_LEVEL_AOT = -1;
protected static final int COMP_LEVEL_NONE = 0;
protected static final int COMP_LEVEL_ANY = -1;
protected static final int COMP_LEVEL_SIMPLE = 1; // C1
protected static final int COMP_LEVEL_LIMITED_PROFILE = 2; // C1, invocation & backedge counters
protected static final int COMP_LEVEL_FULL_PROFILE = 3; // C1, invocation & backedge counters + mdo

0 comments on commit 4de6a48

Please sign in to comment.