P4 to Git Change 1074077 by jatang@jatang-ocl-lnx1 on 2014/09/05 16:58:30

EPR #405458 - clinfo segfaults when ENABLE_CAL_SHUTDOWN=1.

	For the global variables of:

	std::map <std::string, int> OptionNameMap[2];
	std::map <std::string, int> NoneSeparatorOptionMap[2];
	std::map <std::string, int> FOptionMap;
	std::map <std::string, int> MOptionMap;

	We don't need to call the clear() method explicitly, since the std::map destructor will clean things up (valgrind mem-check doesn't report any leak related to these global variables after this change). Besides, on Linux amd::option::teardown() is called after the global variables' destructors are called, and it will cause segfault.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/options.cpp#29 edit


[ROCm/clr commit: b9e695d254]

projects/clr/rocclr/compiler/lib/utils/options.cpp

@@ -1237,12 +1237,6 @@ init()
 bool
 teardown()
 {
-    OptionNameMap[0].clear();
-    OptionNameMap[1].clear();
-    NoneSeparatorOptionMap[0].clear();
-    NoneSeparatorOptionMap[1].clear();
-    FOptionMap.clear();
-    MOptionMap.clear();
     return true;
 }