Commit d7e8b4d
Fix OSS builds after 3.14 import
Summary:
3.14 upstream has changed `_Py_Instrumentation_GetLine` resulting in:
```
In file included from /home/runner/work/cinderx/cinderx/cinderx/UpstreamBorrow/borrowed-3.14.gen_cached.c:13:
/home/runner/work/cinderx/cinderx/cinderx/../cinderx/UpstreamBorrow/borrowed.h:83:37: error: conflicting types for ‘_Ci_Instrumentation_GetLine’; have ‘int(PyCodeObject *, _PyCoLineInstrumentationData *, int)’
83 | #define _Py_Instrumentation_GetLine _Ci_Instrumentation_GetLine
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/runner/work/cinderx/cinderx/cinderx/UpstreamBorrow/borrowed-3.14.gen_cached.c:4854:1: note: in expansion of macro ‘_Py_Instrumentation_GetLine’
4854 | _Py_Instrumentation_GetLine(PyCodeObject *code, _PyCoLineInstrumentationData *line_data, int index)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/runner/work/cinderx/cinderx/cinderx/../cinderx/UpstreamBorrow/borrowed.h:83:37: note: previous declaration of ‘_Ci_Instrumentation_GetLine’ with type ‘int(PyCodeObject *, int)’
83 | #define _Py_Instrumentation_GetLine _Ci_Instrumentation_GetLine
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
```
We don't actually call this externally, we just need it as a dependency to other instrumentation functions. Let's just put the redefine in the borrowed file so we don't hit errors.
Reviewed By: grantlouisherman
Differential Revision: D103439294
fbshipit-source-id: 4c65a1aa0870105590d906dd208345b950d9ba6f1 parent ea821f7 commit d7e8b4d
5 files changed
Lines changed: 8 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
479 | 479 | | |
480 | 480 | | |
481 | 481 | | |
| 482 | + | |
| 483 | + | |
482 | 484 | | |
483 | 485 | | |
484 | 486 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
425 | 425 | | |
426 | 426 | | |
427 | 427 | | |
| 428 | + | |
| 429 | + | |
428 | 430 | | |
429 | 431 | | |
430 | 432 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3832 | 3832 | | |
3833 | 3833 | | |
3834 | 3834 | | |
| 3835 | + | |
| 3836 | + | |
3835 | 3837 | | |
3836 | 3838 | | |
3837 | 3839 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3979 | 3979 | | |
3980 | 3980 | | |
3981 | 3981 | | |
| 3982 | + | |
| 3983 | + | |
3982 | 3984 | | |
3983 | 3985 | | |
3984 | 3986 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
83 | | - | |
84 | 83 | | |
85 | 84 | | |
86 | 85 | | |
| |||
0 commit comments