[PATCH] D63148: [MIR] Skip hoisting to throwable or return machine basic blocks

[Anton Afanasyev via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL363164: [MIR] Skip hoisting to basic block which may throw exception or return (authored by anton-afanasyev, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D63148?vs=204123&id=204279#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D63148/new/

https://reviews.llvm.org/D63148

Files:
  llvm/trunk/lib/CodeGen/MachineCSE.cpp
  llvm/trunk/test/CodeGen/AArch64/machine_cse_illegal_hoist.ll


Index: llvm/trunk/test/CodeGen/AArch64/machine_cse_illegal_hoist.ll
===================================================================
--- llvm/trunk/test/CodeGen/AArch64/machine_cse_illegal_hoist.ll
+++ llvm/trunk/test/CodeGen/AArch64/machine_cse_illegal_hoist.ll
@@ -0,0 +1,52 @@
+; RUN: llc -O3 < %s | FileCheck %s
+;
+;  Check ADRP instr is not hoisted to entry basic block
+;  which may throw exception.
+;
+; CHECK: adrp
+; CHECK: adrp
+; CHECK: adrp
+
+target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
+target triple = "aarch64-arm-none-eabi"
+
+ at var = hidden local_unnamed_addr global i32 0, align 4
+ at _ZTIi = external dso_local constant i8*
+declare dso_local void @_Z2fnv() local_unnamed_addr #1
+declare dso_local i32 @__gxx_personality_v0(...)
+declare i32 @llvm.eh.typeid.for(i8*) #2
+declare dso_local i8* @__cxa_begin_catch(i8*) local_unnamed_addr
+declare dso_local void @__cxa_end_catch() local_unnamed_addr
+
+define hidden i32 @_Z7examplev() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
+entry:
+  invoke void @_Z2fnv() to label %try.cont unwind label %lpad
+
+lpad:                                             ; preds = %entry
+  %0 = landingpad { i8*, i32 }
+          catch i8* bitcast (i8** @_ZTIi to i8*)
+          catch i8* null
+  %1 = extractvalue { i8*, i32 } %0, 0
+  %2 = extractvalue { i8*, i32 } %0, 1
+  %3 = tail call i32 @llvm.eh.typeid.for(i8* bitcast (i8** @_ZTIi to i8*))
+  %matches = icmp eq i32 %2, %3
+  %4 = tail call i8* @__cxa_begin_catch(i8* %1)
+  %5 = load i32, i32* @var, align 4
+  br i1 %matches, label %catch1, label %catch
+
+catch1:                                           ; preds = %lpad
+  %or3 = or i32 %5, 4
+  store i32 %or3, i32* @var, align 4
+  tail call void @__cxa_end_catch()
+  br label %try.cont
+
+try.cont:                                         ; preds = %entry, %catch1, %catch
+  %6 = load i32, i32* @var, align 4
+  ret i32 %6
+
+catch:                                            ; preds = %lpad
+  %or = or i32 %5, 8
+  store i32 %or, i32* @var, align 4
+  tail call void @__cxa_end_catch()
+  br label %try.cont
+}
Index: llvm/trunk/lib/CodeGen/MachineCSE.cpp
===================================================================
--- llvm/trunk/lib/CodeGen/MachineCSE.cpp
+++ llvm/trunk/lib/CodeGen/MachineCSE.cpp
@@ -799,6 +799,8 @@
         !DT->properlyDominates(MBB, MBB1) &&
         "MBB cannot properly dominate MBB1 while DFS through dominators tree!");
     auto CMBB = DT->findNearestCommonDominator(MBB, MBB1);
+    if (!CMBB->isLegalToHoistInto())
+      continue;
 
     // Two instrs are partial redundant if their basic blocks are reachable
     // from one to another but one doesn't dominate another.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D63148.204279.patch
Type: text/x-patch
Size: 2744 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190612/7ce680f0/attachment.bin>