Commit 3c18c27
committed
[lldb] Make sure triple and SDK always match.
This is particularly important in simulator processes, when stopped in
a symbol context that has no Swift, or no debug info, for example in
libsystem_kernel. In that case we used to take the precise triple from
the dylib (which would be macosx, not ios-simulator). Since we don’t
find debug info in the current dylib we would select the SDK from the
first dylib with debug info, which is ios-simulator.
This patch avoids this situation by
1. preferring the target triple if there is no Swift debug info
2. ensuring that the SDK always matches the triple
rdar://141173613
(cherry picked from commit 9bc04d3)1 parent 24cca7a commit 3c18c27
File tree
7 files changed
+95
-27
lines changed- lldb
- source/Plugins/TypeSystem/Swift
- test/API/lang/swift/expression/no_debuginfo
7 files changed
+95
-27
lines changedLines changed: 45 additions & 25 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2812 | 2812 | | |
2813 | 2813 | | |
2814 | 2814 | | |
2815 | | - | |
| 2815 | + | |
2816 | 2816 | | |
2817 | 2817 | | |
2818 | 2818 | | |
| |||
2826 | 2826 | | |
2827 | 2827 | | |
2828 | 2828 | | |
2829 | | - | |
| 2829 | + | |
2830 | 2830 | | |
2831 | 2831 | | |
2832 | 2832 | | |
| 2833 | + | |
2833 | 2834 | | |
2834 | 2835 | | |
2835 | 2836 | | |
2836 | 2837 | | |
2837 | 2838 | | |
2838 | 2839 | | |
2839 | 2840 | | |
2840 | | - | |
2841 | | - | |
2842 | | - | |
2843 | | - | |
2844 | | - | |
2845 | | - | |
2846 | | - | |
| 2841 | + | |
| 2842 | + | |
| 2843 | + | |
2847 | 2844 | | |
2848 | 2845 | | |
2849 | 2846 | | |
2850 | | - | |
2851 | | - | |
2852 | | - | |
2853 | | - | |
2854 | | - | |
2855 | | - | |
2856 | | - | |
2857 | | - | |
2858 | | - | |
2859 | | - | |
2860 | | - | |
2861 | | - | |
2862 | | - | |
2863 | | - | |
2864 | | - | |
2865 | | - | |
| 2847 | + | |
2866 | 2848 | | |
2867 | 2849 | | |
2868 | 2850 | | |
| |||
2907 | 2889 | | |
2908 | 2890 | | |
2909 | 2891 | | |
| 2892 | + | |
| 2893 | + | |
| 2894 | + | |
| 2895 | + | |
| 2896 | + | |
| 2897 | + | |
| 2898 | + | |
| 2899 | + | |
| 2900 | + | |
| 2901 | + | |
| 2902 | + | |
| 2903 | + | |
| 2904 | + | |
2910 | 2905 | | |
2911 | 2906 | | |
2912 | 2907 | | |
2913 | 2908 | | |
| 2909 | + | |
| 2910 | + | |
2914 | 2911 | | |
2915 | 2912 | | |
2916 | 2913 | | |
| 2914 | + | |
| 2915 | + | |
2917 | 2916 | | |
2918 | 2917 | | |
2919 | 2918 | | |
| |||
2993 | 2992 | | |
2994 | 2993 | | |
2995 | 2994 | | |
| 2995 | + | |
| 2996 | + | |
| 2997 | + | |
| 2998 | + | |
| 2999 | + | |
| 3000 | + | |
| 3001 | + | |
| 3002 | + | |
| 3003 | + | |
| 3004 | + | |
| 3005 | + | |
| 3006 | + | |
| 3007 | + | |
| 3008 | + | |
| 3009 | + | |
| 3010 | + | |
| 3011 | + | |
| 3012 | + | |
| 3013 | + | |
| 3014 | + | |
| 3015 | + | |
2996 | 3016 | | |
2997 | 3017 | | |
2998 | 3018 | | |
| |||
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1775 | 1775 | | |
1776 | 1776 | | |
1777 | 1777 | | |
1778 | | - | |
1779 | | - | |
| 1778 | + | |
| 1779 | + | |
| 1780 | + | |
| 1781 | + | |
| 1782 | + | |
1780 | 1783 | | |
1781 | 1784 | | |
1782 | 1785 | | |
| |||
Lines changed: 20 additions & 0 deletions
| 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 | + | |
| 19 | + | |
| 20 | + | |
Lines changed: 22 additions & 0 deletions
| 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 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
0 commit comments