Fix protobuf

Fix protobuf

Author: lwesiers

IGC/Metrics/IGCMetricImpl.cpp

@@ -46,9 +46,6 @@ namespace IGCMetrics
         }
         this->map_InstrLoc2Func.clear();
         this->map_Loops.clear();
-
-        // Optional:  Delete all global objects allocated by libprotobuf.
-        google::protobuf::ShutdownProtobufLibrary();
 #endif
     }
     bool IGCMetricImpl::Enable()
@@ -427,6 +424,13 @@ namespace IGCMetrics
                 if (instr_call != nullptr)
                 {
                     auto calledFunc = instr_call->getCalledFunction();
+
+                    if (calledFunc == nullptr)
+                    {
+                        // TODO: Handle function pointers
+                        continue;
+                    }
+
                     auto calledFuncName = calledFunc->getName();
                     auto funcCallType = IGC_METRICS::FuncCalls_FuncCallsType::FuncCalls_FuncCallsType_INLINE;
 

IGC/common/debug/Debug.cpp

@@ -45,6 +45,11 @@ using namespace llvm;
 #if defined _WIN32 || _WIN64
 //#if defined( _DEBUG )
 #include "psapi.h"
+
+#ifdef IGC_METRICS__PROTOBUF_ATTACHED
+#include <google/protobuf/message_lite.h>
+#endif
+
 int CatchAssert( int reportType, char *userMessage, int *retVal )
 {
     IGC_ASSERT(0);
@@ -78,6 +83,11 @@ BOOL WINAPI DllMain(
     switch(fdwReason) {
     case DLL_PROCESS_DETACH:
         llvm_shutdown();
+
+#ifdef IGC_METRICS__PROTOBUF_ATTACHED
+        // Optional:  Delete all global objects allocated by libprotobuf.
+        google::protobuf::ShutdownProtobufLibrary();
+#endif
         break;
 
     case DLL_PROCESS_ATTACH: