Skip to content

Commit 5c214eb

Browse files
authored
[Inline] Clone return range attribute on the callsite into inlined call (#92666)
1 parent e1aa8ad commit 5c214eb

File tree

3 files changed

+88
-4
lines changed

3 files changed

+88
-4
lines changed

clang/test/Headers/__clang_hip_math.hip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ extern "C" __device__ uint64_t test___make_mantissa(const char *p) {
231231

232232
// CHECK-LABEL: @test_abs(
233233
// CHECK-NEXT: entry:
234-
// CHECK-NEXT: [[TMP0:%.*]] = tail call noundef i32 @llvm.abs.i32(i32 [[X:%.*]], i1 true)
234+
// CHECK-NEXT: [[TMP0:%.*]] = tail call noundef range(i32 0, -2147483648) i32 @llvm.abs.i32(i32 [[X:%.*]], i1 true)
235235
// CHECK-NEXT: ret i32 [[TMP0]]
236236
//
237237
extern "C" __device__ int test_abs(int x) {
@@ -240,7 +240,7 @@ extern "C" __device__ int test_abs(int x) {
240240

241241
// CHECK-LABEL: @test_labs(
242242
// CHECK-NEXT: entry:
243-
// CHECK-NEXT: [[TMP0:%.*]] = tail call noundef i64 @llvm.abs.i64(i64 [[X:%.*]], i1 true)
243+
// CHECK-NEXT: [[TMP0:%.*]] = tail call noundef range(i64 0, -9223372036854775808) i64 @llvm.abs.i64(i64 [[X:%.*]], i1 true)
244244
// CHECK-NEXT: ret i64 [[TMP0]]
245245
//
246246
extern "C" __device__ long test_labs(long x) {
@@ -249,7 +249,7 @@ extern "C" __device__ long test_labs(long x) {
249249

250250
// CHECK-LABEL: @test_llabs(
251251
// CHECK-NEXT: entry:
252-
// CHECK-NEXT: [[TMP0:%.*]] = tail call noundef i64 @llvm.abs.i64(i64 [[X:%.*]], i1 true)
252+
// CHECK-NEXT: [[TMP0:%.*]] = tail call noundef range(i64 0, -9223372036854775808) i64 @llvm.abs.i64(i64 [[X:%.*]], i1 true)
253253
// CHECK-NEXT: ret i64 [[TMP0]]
254254
//
255255
extern "C" __device__ long long test_llabs(long x) {

llvm/lib/Transforms/Utils/InlineFunction.cpp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@
3030
#include "llvm/Analysis/ProfileSummaryInfo.h"
3131
#include "llvm/Analysis/ValueTracking.h"
3232
#include "llvm/Analysis/VectorUtils.h"
33-
#include "llvm/IR/AttributeMask.h"
3433
#include "llvm/IR/Argument.h"
34+
#include "llvm/IR/AttributeMask.h"
3535
#include "llvm/IR/BasicBlock.h"
3636
#include "llvm/IR/CFG.h"
3737
#include "llvm/IR/Constant.h"
38+
#include "llvm/IR/ConstantRange.h"
3839
#include "llvm/IR/Constants.h"
3940
#include "llvm/IR/DataLayout.h"
4041
#include "llvm/IR/DebugInfo.h"
@@ -1450,6 +1451,8 @@ static AttrBuilder IdentifyValidPoisonGeneratingAttributes(CallBase &CB) {
14501451
Valid.addAttribute(Attribute::NonNull);
14511452
if (CB.hasRetAttr(Attribute::Alignment))
14521453
Valid.addAlignmentAttr(CB.getRetAlign());
1454+
if (std::optional<ConstantRange> Range = CB.getRange())
1455+
Valid.addRangeAttr(*Range);
14531456
return Valid;
14541457
}
14551458

@@ -1541,6 +1544,14 @@ static void AddReturnAttributes(CallBase &CB, ValueToValueMapTy &VMap) {
15411544
if (ValidPG.getAlignment().valueOrOne() < AL.getRetAlignment().valueOrOne())
15421545
ValidPG.removeAttribute(Attribute::Alignment);
15431546
if (ValidPG.hasAttributes()) {
1547+
Attribute CBRange = ValidPG.getAttribute(Attribute::Range);
1548+
if (CBRange.isValid()) {
1549+
Attribute NewRange = AL.getRetAttr(Attribute::Range);
1550+
if (NewRange.isValid()) {
1551+
ValidPG.addRangeAttr(
1552+
CBRange.getRange().intersectWith(NewRange.getRange()));
1553+
}
1554+
}
15441555
// Three checks.
15451556
// If the callsite has `noundef`, then a poison due to violating the
15461557
// return attribute will create UB anyways so we can always propagate.

llvm/test/Transforms/Inline/ret_attr_align_and_noundef.ll

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55

66
declare ptr @foo()
77
declare void @use.ptr(ptr) willreturn nounwind
8+
declare void @use.val(i8) willreturn nounwind
89
declare void @bar()
910
declare void @baz()
1011
declare ptr @llvm.ptrmask.p0.i64(ptr, i64)
1112
declare i1 @val()
13+
declare i8 @val8()
1214

1315
define ptr @callee0123() {
1416
; CHECK-LABEL: define ptr @callee0123() {
@@ -337,3 +339,74 @@ define ptr @caller12_todo() {
337339
%r = call nonnull ptr @callee12()
338340
ret ptr %r
339341
}
342+
343+
define i8 @callee13() {
344+
; CHECK-LABEL: define i8 @callee13() {
345+
; CHECK-NEXT: [[R:%.*]] = call i8 @val8()
346+
; CHECK-NEXT: ret i8 [[R]]
347+
;
348+
%r = call i8 @val8()
349+
ret i8 %r
350+
}
351+
352+
define i8 @caller13_okay_use_after_poison_anyways() {
353+
; CHECK-LABEL: define i8 @caller13_okay_use_after_poison_anyways() {
354+
; CHECK-NEXT: [[R_I:%.*]] = call range(i8 0, 10) i8 @val8()
355+
; CHECK-NEXT: call void @use.val(i8 [[R_I]])
356+
; CHECK-NEXT: ret i8 [[R_I]]
357+
;
358+
%r = call range(i8 0, 10) i8 @callee13()
359+
call void @use.val(i8 %r)
360+
ret i8 %r
361+
}
362+
363+
define i8 @callee14() {
364+
; CHECK-LABEL: define i8 @callee14() {
365+
; CHECK-NEXT: [[R:%.*]] = call noundef i8 @val8()
366+
; CHECK-NEXT: ret i8 [[R]]
367+
;
368+
%r = call noundef i8 @val8()
369+
ret i8 %r
370+
}
371+
372+
define i8 @caller14_fail_creates_ub() {
373+
; CHECK-LABEL: define i8 @caller14_fail_creates_ub() {
374+
; CHECK-NEXT: [[R_I:%.*]] = call noundef i8 @val8()
375+
; CHECK-NEXT: call void @use.val(i8 [[R_I]])
376+
; CHECK-NEXT: ret i8 [[R_I]]
377+
;
378+
%r = call range(i8 0, 10) i8 @callee14()
379+
call void @use.val(i8 %r)
380+
ret i8 %r
381+
}
382+
383+
define i8 @caller14_okay_is_ub_anyways() {
384+
; CHECK-LABEL: define i8 @caller14_okay_is_ub_anyways() {
385+
; CHECK-NEXT: [[R_I:%.*]] = call noundef range(i8 0, 10) i8 @val8()
386+
; CHECK-NEXT: call void @use.val(i8 [[R_I]])
387+
; CHECK-NEXT: ret i8 [[R_I]]
388+
;
389+
%r = call noundef range(i8 0, 10) i8 @callee14()
390+
call void @use.val(i8 %r)
391+
ret i8 %r
392+
}
393+
394+
define i8 @callee15() {
395+
; CHECK-LABEL: define i8 @callee15() {
396+
; CHECK-NEXT: [[R:%.*]] = call range(i8 5, 10) i8 @val8()
397+
; CHECK-NEXT: ret i8 [[R]]
398+
;
399+
%r = call range(i8 5, 10) i8 @val8()
400+
ret i8 %r
401+
}
402+
403+
define i8 @caller15_okay_intersect_ranges() {
404+
; CHECK-LABEL: define i8 @caller15_okay_intersect_ranges() {
405+
; CHECK-NEXT: [[R_I:%.*]] = call range(i8 5, 7) i8 @val8()
406+
; CHECK-NEXT: call void @use.val(i8 [[R_I]])
407+
; CHECK-NEXT: ret i8 [[R_I]]
408+
;
409+
%r = call range(i8 0, 7) i8 @callee15()
410+
call void @use.val(i8 %r)
411+
ret i8 %r
412+
}

0 commit comments

Comments
 (0)