(original) (raw)

changeset: 78368:d3afe5d8a4da parent: 78367:029cde4e58c5 parent: 78366:2638ce032151 user: Martin v. Löwis martin@v.loewis.de date: Wed Aug 01 11:09:55 2012 +0200 files: Lib/test/test_list.py Lib/test/test_tuple.py Misc/NEWS PC/VS9.0/pginstrument.vsprops description: Issue #8847: Merge with 3.2 diff -r 029cde4e58c5 -r d3afe5d8a4da Lib/test/test_list.py --- a/Lib/test/test_list.py Wed Aug 01 11:06:53 2012 +0200 +++ b/Lib/test/test_list.py Wed Aug 01 11:09:55 2012 +0200 @@ -98,6 +98,14 @@ d = pickle.dumps(it) self.assertEqual(self.type2test(it), self.type2test(reversed(data))[1:]) + 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 -r 029cde4e58c5 -r d3afe5d8a4da Lib/test/test_tuple.py --- a/Lib/test/test_tuple.py Wed Aug 01 11:06:53 2012 +0200 +++ b/Lib/test/test_tuple.py Wed Aug 01 11:09:55 2012 +0200 @@ -193,6 +193,14 @@ d = pickle.dumps(it) self.assertEqual(self.type2test(it), self.type2test(reversed(data))[1:]) + 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) diff -r 029cde4e58c5 -r d3afe5d8a4da Misc/NEWS --- a/Misc/NEWS Wed Aug 01 11:06:53 2012 +0200 +++ b/Misc/NEWS Wed Aug 01 11:09:55 2012 +0200 @@ -276,6 +276,8 @@ Build ----- +- Issue #8847: Disable COMDAT folding in Windows PGO builds. + - Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. - Issue #15431: Add _freeze_importlib project to regenerate importlib.h diff -r 029cde4e58c5 -r d3afe5d8a4da PC/VS9.0/pginstrument.vsprops --- a/PC/VS9.0/pginstrument.vsprops Wed Aug 01 11:06:53 2012 +0200 +++ b/PC/VS9.0/pginstrument.vsprops Wed Aug 01 11:09:55 2012 +0200 @@ -22,7 +22,7 @@ /martin@v.loewis.de