From 7be55b007698f6b6398cbbea69c327b5a971938a Mon Sep 17 00:00:00 2001 From: DianQK Date: Sat, 18 Feb 2023 23:09:07 +0800 Subject: [PATCH] [SimplifyCFG] Check if the return instruction causes undefined behavior This should fix https://github.com/rust-lang/rust/issues/107681. Return undefined to a noundef return value is undefined. Example: ``` define noundef i32 @test_ret_noundef(i1 %cond) { entry: br i1 %cond, label %bb1, label %bb2 bb1: br label %bb2 bb2: %r = phi i32 [ undef, %entry ], [ 1, %bb1 ] ret i32 %r } ``` Reviewed By: nikic Differential Revision: https://reviews.llvm.org/D144319 --- llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 14 +++ .../unreachable-eliminate-on-ret.ll | 86 +++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 llvm/test/Transforms/SimplifyCFG/unreachable-eliminate-on-ret.ll diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 372a6698ce8ac..f6d30222dcf29 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -7126,6 +7126,20 @@ static bool passingValueIsAlwaysUndefined(Value *V, Instruction *I, bool PtrValu return passingValueIsAlwaysUndefined(V, GEP, PtrValueMayBeModified); } + // Look through return. + if (ReturnInst *Ret = dyn_cast(Use)) { + bool HasNoUndefAttr = + Ret->getFunction()->hasRetAttribute(Attribute::NoUndef); + // Return undefined to a noundef return value is undefined. + if (isa(C) && HasNoUndefAttr) + return true; + // Return null to a nonnull+noundef return value is undefined. + if (C->isNullValue() && HasNoUndefAttr && + Ret->getFunction()->hasRetAttribute(Attribute::NonNull)) { + return true; + } + } + // Look through bitcasts. if (BitCastInst *BC = dyn_cast(Use)) return passingValueIsAlwaysUndefined(V, BC, PtrValueMayBeModified); diff --git a/llvm/test/Transforms/SimplifyCFG/unreachable-eliminate-on-ret.ll b/llvm/test/Transforms/SimplifyCFG/unreachable-eliminate-on-ret.ll new file mode 100644 index 0000000000000..cb3e066858fa5 --- /dev/null +++ b/llvm/test/Transforms/SimplifyCFG/unreachable-eliminate-on-ret.ll @@ -0,0 +1,86 @@ +; NOTE: Assertions have been autogenerated by utils/update_test_checks.py +; RUN: opt -passes=simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s + +define noundef i32 @test_ret_noundef(i1 %cond) { +; CHECK-LABEL: @test_ret_noundef( +; CHECK-NEXT: entry: +; CHECK-NEXT: ret i32 1 +; +entry: + br i1 %cond, label %bb1, label %bb2 + +bb1: + br label %bb2 + +bb2: + %r = phi i32 [ undef, %entry ], [ 1, %bb1 ] + ret i32 %r +} + +define i32 @test_ret(i1 %cond) { +; CHECK-LABEL: @test_ret( +; CHECK-NEXT: entry: +; CHECK-NEXT: [[SPEC_SELECT:%.*]] = select i1 [[COND:%.*]], i32 1, i32 undef +; CHECK-NEXT: ret i32 [[SPEC_SELECT]] +; +entry: + br i1 %cond, label %bb1, label %bb2 + +bb1: + br label %bb2 + +bb2: + %r = phi i32 [ undef, %entry ], [ 1, %bb1 ] + ret i32 %r +} + +define nonnull noundef ptr @test_ret_nonnull_noundef(i1 %cond, ptr %x) { +; CHECK-LABEL: @test_ret_nonnull_noundef( +; CHECK-NEXT: entry: +; CHECK-NEXT: call void @llvm.assume(i1 [[COND:%.*]]) +; CHECK-NEXT: ret ptr [[X:%.*]] +; +entry: + br i1 %cond, label %bb1, label %bb2 + +bb1: + br label %bb2 + +bb2: + %r = phi ptr [ null, %entry ], [ %x, %bb1 ] + ret ptr %r +} + +define nonnull ptr @test_ret_nonnull(i1 %cond, ptr %x) { +; CHECK-LABEL: @test_ret_nonnull( +; CHECK-NEXT: entry: +; CHECK-NEXT: [[SPEC_SELECT:%.*]] = select i1 [[COND:%.*]], ptr [[X:%.*]], ptr null +; CHECK-NEXT: ret ptr [[SPEC_SELECT]] +; +entry: + br i1 %cond, label %bb1, label %bb2 + +bb1: + br label %bb2 + +bb2: + %r = phi ptr [ null, %entry ], [ %x, %bb1 ] + ret ptr %r +} + +define ptr @test_ret_ptr(i1 %cond, ptr %x) { +; CHECK-LABEL: @test_ret_ptr( +; CHECK-NEXT: entry: +; CHECK-NEXT: [[SPEC_SELECT:%.*]] = select i1 [[COND:%.*]], ptr [[X:%.*]], ptr null +; CHECK-NEXT: ret ptr [[SPEC_SELECT]] +; +entry: + br i1 %cond, label %bb1, label %bb2 + +bb1: + br label %bb2 + +bb2: + %r = phi ptr [ null, %entry ], [ %x, %bb1 ] + ret ptr %r +}