From: Alex Bennée <alex.bennee@linaro.org>
Date: Fri, 30 Sep 2016 21:30:55 +0000 (+0100)
Subject: tcg/optimize: move default return out of if statement
X-Git-Tag: qemu-xen-4.9.0-rc1~148^2~27
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=550276ae0a88851edda2cb7fcdd64256dbb8e314;p=qemu-xen.git

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"

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20160930213106.20186-5-alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/tcg/optimize.c b/tcg/optimize.c
index 9998ac7413..0f1349086b 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -468,9 +468,8 @@ static TCGArg do_constant_folding_cond(TCGOpcode op, TCGArg x,
         default:
             return 2;
         }
-    } else {
-        return 2;
     }
+    return 2;
 }
 
 /* Return 2 if the condition can't be simplified, and the result