From 1cf200107edd2a2d7f4775d236f03c8e1704932f Mon Sep 17 00:00:00 2001
From: Maksim Panchenko <maks@fb.com>
Date: Tue, 6 Sep 2016 13:19:26 -0700
Subject: [PATCH] Fix tail call conversion and test cases.

Summary:
A previous diff accidentally disabled tail call conversion.

Additionally some test cases relied on output of "-v=2". Fix those.

(cherry picked from FBD3823760)
---
 bolt/BinaryFunction.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bolt/BinaryFunction.cpp b/bolt/BinaryFunction.cpp
index 99e7454a8f4a..507f76b1ad8d 100644
--- a/bolt/BinaryFunction.cpp
+++ b/bolt/BinaryFunction.cpp
@@ -585,8 +585,8 @@ bool BinaryFunction::disassemble(ArrayRef<uint8_t> FunctionData) {
             // Assign proper opcode for tail calls, so that they could be
             // treated as calls.
             if (!IsCall) {
-              if (opts::Verbosity >= 2 &&
-                  !MIA->convertJmpToTailCall(Instruction)) {
+              if (!MIA->convertJmpToTailCall(Instruction) &&
+                  opts::Verbosity >= 2) {
                 assert(IsCondBranch && "unknown tail call instruction");
                 errs() << "BOLT-WARNING: conditional tail call detected in "
                        << "function " << *this << " at 0x"