diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2012-08-01 08:32:11 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2012-08-01 08:32:11 (GMT) |
| commit | 4c1730db7c8735d2424471e63a2fa7d690192899 (patch) | |
| tree | 81354d949ddcf62efee2d38b5104a84fcb603c67 | |
| parent | 06c5c6d694481a3c1e09420756f8ad6ca1762d0f (diff) | |
| download | cpython-4c1730db7c8735d2424471e63a2fa7d690192899.zip cpython-4c1730db7c8735d2424471e63a2fa7d690192899.tar.gz cpython-4c1730db7c8735d2424471e63a2fa7d690192899.tar.bz2 | |
Issue #8847: Disable COMDAT folding in Windows PGO builds.
Analysis by Victor Stinner. Patch by Stefan Krah.
| -rw-r--r-- | Lib/test/test_list.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_tuple.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PCbuild/pginstrument.vsprops | 2 |
4 files changed, 19 insertions, 1 deletions
diff --git a/Lib/test/test_list.py b/Lib/test/test_list.py index d7e6629..84b8afe 100644 --- a/Lib/test/test_list.py +++ b/Lib/test/test_list.py @@ -70,6 +70,14 @@ class ListTest(list_tests.CommonTest): check(1000000) + def test_no_comdat_folding(self): + # Issue 8847: In the PGO build, the MSVC linker's COMDAT folding + # optimization causes failures in code that relies on distinct + # function addresses. + class L(list): pass + with self.assertRaises(TypeError): + (3,) + L([1,2]) + def test_main(verbose=None): support.run_unittest(ListTest) diff --git a/Lib/test/test_tuple.py b/Lib/test/test_tuple.py index 1464a0e..6e934fb 100644 --- a/Lib/test/test_tuple.py +++ b/Lib/test/test_tuple.py @@ -164,6 +164,14 @@ class TupleTest(seq_tests.CommonTest): check(10) # check our checking code check(1000000) + def test_no_comdat_folding(self): + # Issue 8847: In the PGO build, the MSVC linker's COMDAT folding + # optimization causes failures in code that relies on distinct + # function addresses. + class T(tuple): pass + with self.assertRaises(TypeError): + [3,] + T((1,2)) + def test_main(): support.run_unittest(TupleTest) @@ -425,6 +425,8 @@ Tests Build ----- +- Issue #8847: Disable COMDAT folding in Windows PGO builds. + - Issue #14197: For OS X framework builds, ensure links to the shared library are created with the proper ABI suffix. diff --git a/PCbuild/pginstrument.vsprops b/PCbuild/pginstrument.vsprops index 38c5f18..99c117b 100644 --- a/PCbuild/pginstrument.vsprops +++ b/PCbuild/pginstrument.vsprops @@ -22,7 +22,7 @@ <Tool
Name="VCLinkerTool"
OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ EnableCOMDATFolding="1"
LinkTimeCodeGeneration="2"
ProfileGuidedDatabase="$(SolutionDir)$(PlatformName)-pgi\$(TargetName).pgd"
ImportLibrary="$(OutDirPGI)\$(TargetName).lib"
|