From: Po Lu <luangruo@yahoo.com>
Date: Sat, 16 Mar 2024 01:50:58 +0000 (+0800)
Subject: ; Circumvent miscompilations on Sun C 5.12 (148917-07)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=80451b04fa184bc0e927bf86fb85bae7ceda2136;p=emacs.git

; Circumvent miscompilations on Sun C 5.12 (148917-07)

* src/minibuf.c (Ftry_completion, Fall_completions): Transform
ternary expressions after open-ended if statements into proper
if/else statements.

(cherry picked from commit 6461854f47d0b768e0550b46317045811a8cbe80)
---

diff --git a/src/minibuf.c b/src/minibuf.c
index daa3c3ffa94..16b32824088 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1667,11 +1667,12 @@ or from one of the possible completions.  */)
 		tem = Fcommandp (elt, Qnil);
 	      else
 		{
-		  tem = (type == hash_table
-			 ? call2 (predicate, elt,
-				  HASH_VALUE (XHASH_TABLE (collection),
-					      idx - 1))
-			 : call1 (predicate, elt));
+		  if (type == hash_table)
+		    tem = call2 (predicate, elt,
+				 HASH_VALUE (XHASH_TABLE (collection),
+					     idx - 1));
+		  else
+		    tem = call1 (predicate, elt);
 		}
 	      if (NILP (tem)) continue;
 	    }
@@ -1807,9 +1808,12 @@ with a space are ignored unless STRING itself starts with a space.  */)
   Lisp_Object allmatches;
   if (VECTORP (collection))
     collection = check_obarray (collection);
-  int type = HASH_TABLE_P (collection) ? 3
-    : OBARRAYP (collection) ? 2
-    : NILP (collection) || (CONSP (collection) && !FUNCTIONP (collection));
+  int type = (HASH_TABLE_P (collection)
+	      ? 3 : (OBARRAYP (collection)
+		     ? 2 : ((NILP (collection)
+			     || (CONSP (collection)
+				 && !FUNCTIONP (collection)))
+			    ? 1 : 0)));
   ptrdiff_t idx = 0;
   Lisp_Object bucket, tem, zero;
 
@@ -1888,10 +1892,12 @@ with a space are ignored unless STRING itself starts with a space.  */)
 		tem = Fcommandp (elt, Qnil);
 	      else
 		{
-		  tem = type == 3
-		    ? call2 (predicate, elt,
-			     HASH_VALUE (XHASH_TABLE (collection), idx - 1))
-		    : call1 (predicate, elt);
+		  if (type == 3)
+		    tem = call2 (predicate, elt,
+				 HASH_VALUE (XHASH_TABLE (collection),
+					     idx - 1));
+		  else
+		    tem = call1 (predicate, elt);
 		}
 	      if (NILP (tem)) continue;
 	    }