Fix code emission for conditional branches.

Patch by Collin Winter!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@70898 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/CppBackend/CPPBackend.cpp b/lib/Target/CppBackend/CPPBackend.cpp
index 6adb73ae259fd4b538bbbcef0eb656fc13a6bf59..bf9c885f37bf9730c4d683ea7e7d2f0728d4a202 100644 (file)
--- a/lib/Target/CppBackend/CPPBackend.cpp
+++ b/lib/Target/CppBackend/CPPBackend.cpp
@@ -1092,9 +1092,9 @@ namespace {
       const BranchInst* br = cast<BranchInst>(I);
       Out << "BranchInst::Create(" ;
       if (br->getNumOperands() == 3 ) {
-        Out << opNames[0] << ", "
+        Out << opNames[2] << ", "
             << opNames[1] << ", "
-            << opNames[2] << ", ";
+            << opNames[0] << ", ";
 
       } else if (br->getNumOperands() == 1) {
         Out << opNames[0] << ", ";

diff --git a/test/CodeGen/CPP/2009-05-04-CondBr.ll b/test/CodeGen/CPP/2009-05-04-CondBr.ll
new file mode 100644 (file)
index 0000000..6c3f984
--- /dev/null
+++ b/test/CodeGen/CPP/2009-05-04-CondBr.ll
@@ -0,0 +1,28 @@
+; RUN: llvm-as < %s | llc -march=cpp -cppgen=program -f -o %t
+; RUN: grep "BranchInst::Create(label_if_then, label_if_end, int1_cmp, label_entry);" %t
+
+define i32 @some_func(i32 %a) nounwind {
+entry:
+       %retval = alloca i32            ; <i32*> [#uses=2]
+       %a.addr = alloca i32            ; <i32*> [#uses=8]
+       store i32 %a, i32* %a.addr
+       %tmp = load i32* %a.addr                ; <i32> [#uses=1]
+       %inc = add i32 %tmp, 1          ; <i32> [#uses=1]
+       store i32 %inc, i32* %a.addr
+       %tmp1 = load i32* %a.addr               ; <i32> [#uses=1]
+       %cmp = icmp slt i32 %tmp1, 3            ; <i1> [#uses=1]
+       br i1 %cmp, label %if.then, label %if.end
+
+if.then:               ; preds = %entry
+       store i32 7, i32* %a.addr
+       br label %if.end
+
+if.end:                ; preds = %if.then, %entry
+       %tmp2 = load i32* %a.addr               ; <i32> [#uses=1]
+       %inc3 = add i32 %tmp2, 1                ; <i32> [#uses=1]
+       store i32 %inc3, i32* %a.addr
+       %tmp4 = load i32* %a.addr               ; <i32> [#uses=1]
+       store i32 %tmp4, i32* %retval
+       %0 = load i32* %retval          ; <i32> [#uses=1]
+       ret i32 %0
+}