[PATCH] D20462: Functions with differing phis should not be merged.

[Mark Lacey via llvm-commits]

rudkx created this revision.
rudkx added reviewers: aschwaighofer, nlewycky.
rudkx added a subscriber: llvm-commits.
Herald added a subscriber: jfb.

Check that the incoming blocks of phi nodes are identical, and block function merging if they are not.
    
rdar://problem/26255167

http://reviews.llvm.org/D20462

Files:
  lib/Transforms/IPO/MergeFunctions.cpp
  test/Transforms/MergeFunc/phi-check-blocks.ll

Index: test/Transforms/MergeFunc/phi-check-blocks.ll
===================================================================
--- /dev/null
+++ test/Transforms/MergeFunc/phi-check-blocks.ll
@@ -0,0 +1,42 @@
+; REQUIRES: asserts
+; RUN: opt < %s -mergefunc -stats -disable-output 2>&1 | not grep "functions merged"
+
+define linkonce_odr hidden i1 @first(i2) {
+entry:
+  switch i2 %0, label %default [
+    i2 0, label %L1
+    i2 1, label %L2
+    i2 -2, label %L3
+  ]
+default:
+  unreachable
+L1:
+  br label %done
+L2:
+  br label %done
+L3:
+  br label %done
+done:
+  %result = phi i1 [ true, %L1 ], [ false, %L2 ], [ false, %L3 ]
+  ret i1 %result
+}
+
+define linkonce_odr hidden i1 @second(i2) {
+entry:
+  switch i2 %0, label %default [
+    i2 0, label %L1
+    i2 1, label %L2
+    i2 -2, label %L3
+  ]
+default:
+  unreachable
+L1:
+  br label %done
+L2:
+  br label %done
+L3:
+  br label %done
+done:
+  %result = phi i1 [ true, %L3 ], [ false, %L2 ], [ false, %L1 ]
+  ret i1 %result
+}
Index: lib/Transforms/IPO/MergeFunctions.cpp
===================================================================
--- lib/Transforms/IPO/MergeFunctions.cpp
+++ lib/Transforms/IPO/MergeFunctions.cpp
@@ -1050,6 +1050,17 @@
     return cmpNumbers(RMWI->getSynchScope(),
                       cast<AtomicRMWInst>(R)->getSynchScope());
   }
+  if (const PHINode *PNL = dyn_cast<PHINode>(L)) {
+    const PHINode *PNR = cast<PHINode>(R);
+    // Ensure that in addition to the incoming values being identical
+    // (checked by the caller of this function), the incoming blocks
+    // are also identical.
+    for (unsigned i = 0, e = PNL->getNumIncomingValues(); i != e; ++i) {
+      if (int Res =
+              cmpValues(PNL->getIncomingBlock(i), PNR->getIncomingBlock(i)))
+        return Res;
+    }
+  }
   return 0;
 }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D20462.57900.patch
Type: text/x-patch
Size: 1825 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160520/e3f6d0cb/attachment.bin>