From bf7273357658a0ffdb91b8ff06695b8d12253294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Mon, 26 Feb 2018 05:05:01 -0500 Subject: [PATCH] tcg/optimize: move default return out of if statement This is to appease sanitizer builds which complain that: "error: control reaches end of non-void function" Backports commit 550276ae0a88851edda2cb7fcdd64256dbb8e314 from qemu --- qemu/tcg/optimize.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qemu/tcg/optimize.c b/qemu/tcg/optimize.c index 58e88717..a6abef65 100644 --- a/qemu/tcg/optimize.c +++ b/qemu/tcg/optimize.c @@ -474,9 +474,8 @@ static TCGArg do_constant_folding_cond(TCGContext *s, TCGOpcode op, TCGArg x, default: return 2; } - } else { - return 2; } + return 2; } /* Return 2 if the condition can't be simplified, and the result