P4 to Git Change 1195730 by smekhano@stas-rampitec-hsa on 2015/09/29 20:53:01

SWDEV-77584 - HSA HLC: fixed reflection metadata generation on HSAIL OCL 1.2 path
	We are producing 6 extra arguments, but metadata was produced only for 3.
	Removed KE_OCL12_NUM_ARGS define to avoid confusion.

	Testing: smoke, precheckin
	Reviewed by Yaxun Liu

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/AMDOpenCLKernenv.h#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/Scalar/AMDInsertOpenCLKernenv.cpp#10 edit

rocclr/compiler/lib/utils/options.cpp

@@ -1255,6 +1255,7 @@ Options::Options() :
     oVariables(NULL),
     clcOptions(),
     llvmOptions(),
+    kernelArgAlign(0),
     basename_max(0),
     OptionsLog(),
     flagsSize (((OID_LAST + 31)/32) * 32),
@@ -1264,7 +1265,8 @@ Options::Options() :
     dumpFileRoot(),
     currKernelName(NULL),
     encryptCode(0),
-    MemoryHandles()
+    MemoryHandles(),
+    libraryType_(amd::LibraryUndefined)
 {
     oVariables = new OptionVariables();
     ::memset(flags, 0, sizeof(flags));