b9e695d254
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