Revert of commit 2fc2d4de816e79070404497b0eaa6801c94accfc.

Change-Id: I33b4a06bba99fba39b89fffe947cb614787cc29b

Author: krystian-andrzejewski

IGC/Compiler/CodeGenPublic.h

@@ -280,8 +280,7 @@ namespace IGC
         SSimplePushInfo simplePushInfoArr[g_c_maxNumberOfBufferPushed];
 
         // Interesting constants for dynamic constant folding
-        SConstantAddrValue* m_pInterestingConstants = nullptr;
-        uint                m_InterestingConstantsSize = 0;
+        std::vector<SConstantAddrValue> m_pInterestingConstants;
     };
 
     struct SPixelShaderKernelProgram : SKernelProgram
@@ -864,11 +863,6 @@ namespace IGC
         {
         }
 
-        ~VertexShaderContext()
-        {
-            delete[] programOutput.gatherMap;
-            delete[] programOutput.m_pInterestingConstants;
-        }
     };
 
     class PixelShaderContext : public CodeGenContext
@@ -886,12 +880,6 @@ namespace IGC
             programOutput()
         {
         }
-
-        ~PixelShaderContext()
-        {
-            delete[] programOutput.gatherMap;
-            delete[] programOutput.m_pInterestingConstants;
-        }
     };
 
     class GeometryShaderContext : public CodeGenContext
@@ -909,12 +897,6 @@ namespace IGC
             programOutput()
         {
         }
-
-        ~GeometryShaderContext()
-        {
-            delete[] programOutput.gatherMap;
-            delete[] programOutput.m_pInterestingConstants;
-        }
     };
 
     struct SComputeShaderSecondCompileInput
@@ -958,12 +940,6 @@ namespace IGC
             m_slmSize = 0;
         }
 
-        ~ComputeShaderContext()
-        {
-            delete[] programOutput.gatherMap;
-            delete[] programOutput.m_pInterestingConstants;
-        }
-
         /** get shader's thread group size */
         unsigned GetThreadGroupSize();
         unsigned GetSlmSizePerSubslice();
@@ -991,12 +967,6 @@ namespace IGC
             programOutput()
         {
         }
-
-        ~HullShaderContext()
-        {
-            delete[] programOutput.gatherMap;
-            delete[] programOutput.m_pInterestingConstants;
-        }
     };
 
     class DomainShaderContext : public CodeGenContext
@@ -1014,12 +984,6 @@ namespace IGC
             programOutput()
         {
         }
-
-        ~DomainShaderContext()
-        {
-            delete[] programOutput.gatherMap;
-            delete[] programOutput.m_pInterestingConstants;
-        }
     };
     class OpenCLProgramContext : public CodeGenContext
     {

IGC/Compiler/FindInterestingConstants.cpp

@@ -368,18 +368,7 @@ void FindInterestingConstants::visitLoadInst(llvm::LoadInst& I)
 template<typename ContextT>
 void FindInterestingConstants::copyInterestingConstants(ContextT* pShaderCtx)
 {
-    assert(pShaderCtx->programOutput.m_pInterestingConstants == nullptr);
-    pShaderCtx->programOutput.m_InterestingConstantsSize = static_cast<uint>(m_InterestingConstants.size());
-    if (pShaderCtx->programOutput.m_InterestingConstantsSize == 0)
-    {
-        return;
-    }
-    pShaderCtx->programOutput.m_pInterestingConstants = new SConstantAddrValue[pShaderCtx->programOutput.m_InterestingConstantsSize];
-    memcpy_s(
-        pShaderCtx->programOutput.m_pInterestingConstants,
-        pShaderCtx->programOutput.m_InterestingConstantsSize * sizeof(SConstantAddrValue),
-        m_InterestingConstants.data(),
-        m_InterestingConstants.size() * sizeof(SConstantAddrValue));
+    pShaderCtx->programOutput.m_pInterestingConstants = m_InterestingConstants;
 }
 
 bool FindInterestingConstants::doFinalization(llvm::Module& M)