From c32f0ff92f024a8af438fc8d85906e441b5a2682 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Fri, 22 Nov 2019 13:02:18 -0800 Subject: [PATCH] [InstCombine] Fix call guard difference with dbg Patch by Chris Ye! Differential Revision: https://reviews.llvm.org/D68004 --- llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp | 8 ++++---- llvm/test/Transforms/InstCombine/call-guard.ll | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp index bd548eefdd77..23ca03ff68b0 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -4060,12 +4060,12 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) { // Is this guard followed by another guard? We scan forward over a small // fixed window of instructions to handle common cases with conditions // computed between guards. - Instruction *NextInst = II->getNextNode(); + Instruction *NextInst = II->getNextNonDebugInstruction(); for (unsigned i = 0; i < GuardWideningWindow; i++) { // Note: Using context-free form to avoid compile time blow up if (!isSafeToSpeculativelyExecute(NextInst)) break; - NextInst = NextInst->getNextNode(); + NextInst = NextInst->getNextNonDebugInstruction(); } Value *NextCond = nullptr; if (match(NextInst, @@ -4077,10 +4077,10 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) { return eraseInstFromFunction(*NextInst); // Otherwise canonicalize guard(a); guard(b) -> guard(a & b). - Instruction* MoveI = II->getNextNode(); + Instruction *MoveI = II->getNextNonDebugInstruction(); while (MoveI != NextInst) { auto *Temp = MoveI; - MoveI = MoveI->getNextNode(); + MoveI = MoveI->getNextNonDebugInstruction(); Temp->moveBefore(II); } II->setArgOperand(0, Builder.CreateAnd(CurrCond, NextCond)); diff --git a/llvm/test/Transforms/InstCombine/call-guard.ll b/llvm/test/Transforms/InstCombine/call-guard.ll index 8101f4571de9..f018832d691b 100644 --- a/llvm/test/Transforms/InstCombine/call-guard.ll +++ b/llvm/test/Transforms/InstCombine/call-guard.ll @@ -1,4 +1,5 @@ ; RUN: opt < %s -instcombine -S | FileCheck %s +; RUN: opt < %s -instcombine -S -debugify-each | FileCheck %s declare void @llvm.experimental.guard(i1, ...)