Final-ish cleanup

brandtbucher · brandtbucher · commit 0d358ef24fb3 · 2023-12-24T03:07:38.000-08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,6 @@ on:
     - '3.10'
     - '3.9'
     - '3.8'
-    - 'justin'  # XXX
   pull_request:
     branches:
     - 'main'
diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml
@@ -2,7 +2,8 @@ name: JIT
 on: push
 jobs:
   jit:
-    # if: false  # XXX
+    # Comment this line to run JIT CI:
+    # if: false  # XXX: Uncomment before merging.
     name: ${{ matrix.target }} (${{ matrix.debug && 'Debug' || 'Release' }})
     runs-on: ${{ matrix.runner }}
     strategy:
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
@@ -664,7 +664,7 @@
       <Filter>Include\cpython</Filter>
     </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_jit.h">
-      <Filter>Include\cpython</Filter>
+      <Filter>Include\internal</Filter>
     </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_list.h">
       <Filter>Include\internal</Filter>
diff --git a/Tools/jit/build.py b/Tools/jit/build.py
@@ -121,7 +121,7 @@ class StencilGroup:
     )
 
     def global_offset_table_lookup(self, symbol: str | None) -> int:
-        """when disabling position-independent-code, macOS insists on using the GOT."""
+        """Even when disabling PIC, macOS insists on using the global offset table."""
         if symbol is None:
             return len(self.data.body)
         default = 8 * len(self.global_offset_table)

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ class StencilGroup:`
`121`	`121`	`)`
`122`	`122`
`123`	`123`	`def global_offset_table_lookup(self, symbol: str \| None) -> int:`
`124`		`- """when disabling position-independent-code, macOS insists on using the GOT."""`
	`124`	`+ """Even when disabling PIC, macOS insists on using the global offset table."""`
`125`	`125`	`if symbol is None:`
`126`	`126`	`return len(self.data.body)`
`127`	`127`	`default = 8 * len(self.global_offset_table)`