From d6f452059995b63fe5ab3955ab873d15a5034221 Mon Sep 17 00:00:00 2001 From: Jaroslaw Chodor Date: Mon, 27 Jan 2020 10:10:54 +0100 Subject: [PATCH] ProgramInfo cleanup - explicitly delete copying Change-Id: I2691d272b5248e62b2dd3eb1e5995f664e8a94a2 --- core/program/program_info.h | 2 ++ .../program_info_from_patchtokens_tests.cpp | 24 +++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/core/program/program_info.h b/core/program/program_info.h index 216c3f4add..226c611128 100644 --- a/core/program/program_info.h +++ b/core/program/program_info.h @@ -20,6 +20,8 @@ struct ProgramInfo { ProgramInfo() = default; ProgramInfo(ProgramInfo &&) = default; ProgramInfo &operator=(ProgramInfo &&) = default; + ProgramInfo(const ProgramInfo &) = delete; + ProgramInfo &operator=(const ProgramInfo &) = delete; ~ProgramInfo(); struct GlobalSurfaceInfo { diff --git a/core/unit_tests/program/program_info_from_patchtokens_tests.cpp b/core/unit_tests/program/program_info_from_patchtokens_tests.cpp index 728788f555..801d4bca6b 100644 --- a/core/unit_tests/program/program_info_from_patchtokens_tests.cpp +++ b/core/unit_tests/program/program_info_from_patchtokens_tests.cpp @@ -132,17 +132,21 @@ TEST(PopulateProgramInfoFromPatchtokensTests, WhenProgramRequiresMixedGlobalVarA TEST(PopulateProgramInfoFromPatchtokensTests, GivenProgramWithSpecificPointerSizeThenLinkerIsUpdatedToUseRequiredPointerSize) { PatchTokensTestData::ValidProgramWithMixedGlobalVarAndConstSurfacesAndPointers programFromTokens; - programFromTokens.headerMutable->GPUPointerSizeInBytes = 8; - NEO::ProgramInfo programInfo; - NEO::populateProgramInfo(programInfo, programFromTokens, {}); - ASSERT_NE(nullptr, programInfo.linkerInput); - EXPECT_EQ(NEO::LinkerInput::Traits::Ptr64bit, programInfo.linkerInput->getTraits().pointerSize); + { + programFromTokens.headerMutable->GPUPointerSizeInBytes = 8; + NEO::ProgramInfo programInfo; + NEO::populateProgramInfo(programInfo, programFromTokens, {}); + ASSERT_NE(nullptr, programInfo.linkerInput); + EXPECT_EQ(NEO::LinkerInput::Traits::Ptr64bit, programInfo.linkerInput->getTraits().pointerSize); + } - programFromTokens.headerMutable->GPUPointerSizeInBytes = 4; - programInfo = {}; - NEO::populateProgramInfo(programInfo, programFromTokens, {}); - ASSERT_NE(nullptr, programInfo.linkerInput); - EXPECT_EQ(NEO::LinkerInput::Traits::Ptr32bit, programInfo.linkerInput->getTraits().pointerSize); + { + programFromTokens.headerMutable->GPUPointerSizeInBytes = 4; + NEO::ProgramInfo programInfo; + NEO::populateProgramInfo(programInfo, programFromTokens, {}); + ASSERT_NE(nullptr, programInfo.linkerInput); + EXPECT_EQ(NEO::LinkerInput::Traits::Ptr32bit, programInfo.linkerInput->getTraits().pointerSize); + } } TEST(PopulateProgramInfoFromPatchtokensTests, GivenProgramWithProgramSymbolTableThenLinkerDecodesAllSymbolsCorrectly) {