From: Valentin Clement <clementval@gmail.com>
Date: Tue, 15 Mar 2022 21:52:36 +0000 (+0100)
Subject: [flang] Move null entry at the correct place
X-Git-Tag: upstream/15.0.7~13537
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7783de7fe32ad852b1921a2d2d0ae49b160865b1;p=platform%2Fupstream%2Fllvm.git

[flang] Move null entry at the correct place

This is a fix for failing buildbot
https://lab.llvm.org/buildbot/#/builders/172/builds/9652
---

diff --git a/flang/lib/Lower/IntrinsicCall.cpp b/flang/lib/Lower/IntrinsicCall.cpp
index efdfe95..b04224e 100644
--- a/flang/lib/Lower/IntrinsicCall.cpp
+++ b/flang/lib/Lower/IntrinsicCall.cpp
@@ -590,8 +590,6 @@ static constexpr IntrinsicHandler handlers[]{
     {"lgt", &I::genCharacterCompare<mlir::arith::CmpIPredicate::sgt>},
     {"lle", &I::genCharacterCompare<mlir::arith::CmpIPredicate::sle>},
     {"llt", &I::genCharacterCompare<mlir::arith::CmpIPredicate::slt>},
-    {"min", &I::genExtremum<Extremum::Min, ExtremumBehavior::MinMaxss>},
-    {"null", &I::genNull, {{{"mold", asInquired}}}, /*isElemental=*/false},
     {"max", &I::genExtremum<Extremum::Max, ExtremumBehavior::MinMaxss>},
     {"maxloc",
      &I::genMaxloc,
@@ -622,6 +620,7 @@ static constexpr IntrinsicHandler handlers[]{
        {"dim", asValue},
        {"mask", asBox, handleDynamicOptional}}},
      /*isElemental=*/false},
+    {"null", &I::genNull, {{{"mold", asInquired}}}, /*isElemental=*/false},
     {"random_init",
      &I::genRandomInit,
      {{{"repeatable", asValue}, {"image_distinct", asValue}}},