Skip to content

[Asan] Skip pre-split coroutine and noop coroutine frame #99415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 22, 2024
Merged

[Asan] Skip pre-split coroutine and noop coroutine frame #99415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7aab1b7
update
apolloww Jul 18, 2024
c319847
format
apolloww Jul 18, 2024
d073eb0
add nosan metadata to gv
apolloww Jul 18, 2024
d8e7bbd
fix typo in test
apolloww Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions llvm/lib/Transforms/Coroutines/CoroEarly.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ void Lowerer::lowerCoroNoop(IntrinsicInst *II) {
NoopCoro = new GlobalVariable(M, NoopCoroConst->getType(), /*isConstant=*/true,
GlobalVariable::PrivateLinkage, NoopCoroConst,
"NoopCoro.Frame.Const");
cast<GlobalVariable>(NoopCoro)->setNoSanitizeMetadata();
}

Builder.SetInsertPoint(II);
Expand Down
2 changes: 2 additions & 0 deletions llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2947,6 +2947,8 @@ bool AddressSanitizer::instrumentFunction(Function &F,
if (F.getLinkage() == GlobalValue::AvailableExternallyLinkage) return false;
if (!ClDebugFunc.empty() && ClDebugFunc == F.getName()) return false;
if (F.getName().starts_with("__asan_")) return false;
if (F.isPresplitCoroutine())
return false;
Comment on lines +2950 to +2951
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: for consistency with preceding lines:

Suggested change
if (F.isPresplitCoroutine())
return false;
if (F.isPresplitCoroutine()) return false;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They were on the same line, and I don't see a problem with that (see the first commit), but clang-format complained.


bool FunctionModified = false;

Expand Down
34 changes: 34 additions & 0 deletions llvm/test/Instrumentation/AddressSanitizer/skip-coro.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
; Tests that asan skips pre-split coroutine and NoopCoro.Frame
; RUN: opt < %s -S -passes=coro-early,asan | FileCheck %s

; CHECK: %NoopCoro.Frame = type { ptr, ptr }
; CHECK: @NoopCoro.Frame.Const = private constant %NoopCoro.Frame { ptr @__NoopCoro_ResumeDestroy, ptr @__NoopCoro_ResumeDestroy }
; CHECK-NOT: @0 = private alias { %NoopCoro.Frame,

%struct.Promise = type { %"struct.std::__n4861::coroutine_handle" }
%"struct.std::__n4861::coroutine_handle" = type { ptr }

; CHECK-LABEL: @foo(
define ptr @foo() #0 {
; CHECK-NEXT: entry
; CHECK-NOT: %asan_local_stack_base
entry:
%__promise = alloca %struct.Promise, align 8
%0 = call token @llvm.coro.id(i32 16, ptr nonnull %__promise, ptr null, ptr null)
%1 = call ptr @llvm.coro.noop()
ret ptr %1
}

declare token @llvm.coro.id(i32, ptr readnone, ptr nocapture readonly, ptr)
declare ptr @llvm.coro.noop()

attributes #0 = { sanitize_address presplitcoroutine }

!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!3, !4}

!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "hand-written", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
!1 = !DIFile(filename: "<stdin>", directory: "")
!2 = !{}
!3 = !{i32 2, !"Dwarf Version", i32 4}
!4 = !{i32 2, !"Debug Info Version", i32 3}
Loading