Skip to content

Commit

Permalink
Automatic merge of master into galahad
Browse files Browse the repository at this point in the history
  • Loading branch information
OracleLabsAutomation committed Jan 30, 2025
2 parents 8f91731 + 8b5c36f commit 48e7388
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2025, 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 @@ -96,7 +96,7 @@ public LogicNode canonical(ConstantReflectionProvider constantReflection, MetaAc
return result;
}
if (GraphUtil.unproxify(forX) == GraphUtil.unproxify(forY)) {
if (!unorderedIsTrue || (((FloatStamp) forX.stamp(view)).isNonNaN() && ((FloatStamp) forY.stamp(view)).isNonNaN())) {
if (!unorderedIsTrue || (forX.stamp(view) instanceof FloatStamp xStamp && xStamp.isNonNaN() && forY.stamp(view) instanceof FloatStamp yStamp && yStamp.isNonNaN())) {
/*
* If x is NaN and an unordered result is false, x < x is false. Otherwise, if x
* cannot be NaN, x < x is false too.
Expand Down

0 comments on commit 48e7388

Please sign in to comment.