P4 to Git Change 1129634 by jsjodin@jsjodin_linux_avx_hsa2 on 2015/03/11 12:04:50

ECR #304775 - Fix failure in TC. Allocation and deallocation cannot be done by different DLLs.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/frontend.cpp#32 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/options.cpp#31 edit

rocclr/compiler/lib/backends/common/frontend.cpp

@@ -276,7 +276,7 @@ amdcl::OCLFrontend::compileCommand(const std::string& singleSrc)
   amd::Os::unlink(logFile.c_str());
   if (isCpuTarget(Elf()->target)
       && Options()->oVariables->EnableDebug) {
-    Options()->sourceFileName_ = clFile;
+    Options()->sourceFileName_.assign(clFile);
   } else {
     amd::Os::unlink(clFile.c_str());
   }

rocclr/compiler/lib/utils/options.cpp

@@ -1270,6 +1270,8 @@ Options::Options() :
     WorkGroupSize[2] = -1;
     UseDefaultWGS = true;
     NumAvailGPRs = -1;
+
+    sourceFileName_.reserve(1024);
 }
 
 Options::~Options()