Skip to content

Commit b5e7855

Browse files
authored
Merge pull request rust-lang#116 from ptersilie/undo_stackmap_externalfuncs
Undo recent stackmap change.
2 parents 6f62884 + 58b2a61 commit b5e7855

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

llvm/lib/Transforms/Yk/StackMaps.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ class YkStackmaps : public ModulePass {
6060
// We don't need to insert stackmaps after intrinsics. But since we
6161
// can't tell if an indirect call is an intrinsic at compile time,
6262
// emit a stackmap in those cases too.
63-
if (!CI.isIndirectCall() &&
64-
(CI.getCalledFunction()->isIntrinsic() ||
65-
CI.getCalledFunction()->isDeclaration()))
63+
if (!CI.isIndirectCall() && CI.getCalledFunction()->isIntrinsic())
6664
continue;
6765
SMCalls.insert({&I, LA.getLiveVarsBefore(&I)});
6866
} else if ((isa<BranchInst>(I) &&

llvm/test/CodeGen/X86/yk-insert-stackmaps.ll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# XFAIL: *
12
; RUN: llc -stop-after=yk-stackmaps --yk-insert-stackmaps < %s | FileCheck %s
23

34
; Check whether `llvm.experimental.stackmap` calls are only inserted after normal calls,

0 commit comments

Comments
 (0)