P4 to Git Change 1055020 by asalmanp@asalmanp-opencl-stg1 on 2014/07/14 18:08:09

EPR #394069 - [CQE OCL][ISV][QR][G] Debugger CAL path no longer works due to OCL CL # 1003498. Fix ACL path to support debugger
	ReviewBoardURL=http://ocltc.amd.com/reviews/r/5245/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpubinary.cpp#57 edit

rocclr/runtime/device/gpu/gpubinary.cpp

@@ -183,8 +183,8 @@ ClBinary::loadKernels(NullProgram& program, bool* hasRecompiled)
         }
     }
 
+    std::string programil;
     if (usedebugil) {
-        std::string programil;
         char *section;
         size_t sz;
 
@@ -298,7 +298,7 @@ ClBinary::loadKernels(NullProgram& program, bool* hasRecompiled)
             // TODO:  global data recompilation as well.
             // 1) parse IL; 2) parse metadata to set up kernel header
             size_t pos;
-            if (!program.findAllILFuncs(ilSource, pos)) {
+            if (!program.findAllILFuncs((programil.size() ? programil : ilSource), pos)) {
                 program.freeAllILFuncs();
                 return false;
             }