From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Thu, 15 Jun 2023 16:27:27 +0000 (+0800)
Subject: Fix parameter ordering and value in gtNewColonNode (#87366)
X-Git-Tag: accepted/tizen/unified/riscv/20231226.055536~1617
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af19a79735ae8e21764896aba529ee1462bb3799;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fix parameter ordering and value in gtNewColonNode (#87366)
---

diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
index 753f484..685dbf8 100644
--- a/src/coreclr/jit/compiler.h
+++ b/src/coreclr/jit/compiler.h
@@ -2446,7 +2446,7 @@ public:
     GenTreeCC* gtNewCC(genTreeOps oper, var_types type, GenCondition cond);
     GenTreeOpCC* gtNewOperCC(genTreeOps oper, var_types type, GenCondition cond, GenTree* op1, GenTree* op2);
 
-    GenTreeColon* gtNewColonNode(var_types type, GenTree* elseNode, GenTree* thenNode);
+    GenTreeColon* gtNewColonNode(var_types type, GenTree* thenNode, GenTree* elseNode);
     GenTreeQmark* gtNewQmarkNode(var_types type, GenTree* cond, GenTreeColon* colon);
 
     GenTree* gtNewLargeOperNode(genTreeOps oper,
diff --git a/src/coreclr/jit/gentree.cpp b/src/coreclr/jit/gentree.cpp
index ea50cb2..8bbba70 100644
--- a/src/coreclr/jit/gentree.cpp
+++ b/src/coreclr/jit/gentree.cpp
@@ -7191,9 +7191,9 @@ GenTreeOpCC* Compiler::gtNewOperCC(genTreeOps oper, var_types type, GenCondition
     return node;
 }
 
-GenTreeColon* Compiler::gtNewColonNode(var_types type, GenTree* elseNode, GenTree* thenNode)
+GenTreeColon* Compiler::gtNewColonNode(var_types type, GenTree* thenNode, GenTree* elseNode)
 {
-    return new (this, GT_COLON) GenTreeColon(TYP_INT, elseNode, thenNode);
+    return new (this, GT_COLON) GenTreeColon(type, thenNode, elseNode);
 }
 
 GenTreeQmark* Compiler::gtNewQmarkNode(var_types type, GenTree* cond, GenTreeColon* colon)