Commit a9b6aee
committed
[Asan] Add "funclet" OpBundle to Asan calls, when needed by EH Personality
Previously, when ASan instrumentation introduced runtime calls into EH pads, the appropriate funclet token expected by WinEHPrepare were missing.
The BB is then seen as invalid and discard by WinEHPrepare, leading to invalid code that crashes.
Also fixed localescape test, switching its EH personality to match code without funclets.
This PR is based on the Phabricator patch https://reviews.llvm.org/D143108
Fixes #649901 parent 5d59fa9 commit a9b6aee
File tree
4 files changed
+402
-208
lines changed- compiler-rt/test/asan/TestCases/Windows
- llvm
- lib/Transforms/Instrumentation
- test/Instrumentation/AddressSanitizer
4 files changed
+402
-208
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| 46 | + | |
46 | 47 | | |
47 | 48 | | |
48 | 49 | | |
| |||
643 | 644 | | |
644 | 645 | | |
645 | 646 | | |
646 | | - | |
647 | | - | |
648 | | - | |
| 647 | + | |
| 648 | + | |
649 | 649 | | |
650 | 650 | | |
| 651 | + | |
| 652 | + | |
651 | 653 | | |
652 | 654 | | |
653 | | - | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
| 686 | + | |
| 687 | + | |
| 688 | + | |
| 689 | + | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
654 | 701 | | |
655 | 702 | | |
656 | 703 | | |
657 | 704 | | |
658 | 705 | | |
659 | | - | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
660 | 711 | | |
661 | 712 | | |
662 | 713 | | |
| |||
0 commit comments