diff --git a/src/vpux_compiler/src/conversion/passes/VPUIP2VPUMI40XX/convert_VPUIP_to_VPUMI40XX.cpp b/src/vpux_compiler/src/conversion/passes/VPUIP2VPUMI40XX/convert_VPUIP_to_VPUMI40XX.cpp
index e7f69caa74..b722c83c2d 100644
--- a/src/vpux_compiler/src/conversion/passes/VPUIP2VPUMI40XX/convert_VPUIP_to_VPUMI40XX.cpp
+++ b/src/vpux_compiler/src/conversion/passes/VPUIP2VPUMI40XX/convert_VPUIP_to_VPUMI40XX.cpp
@@ -746,8 +746,10 @@ class ConvertVPUIP2VPUMI40XXPass final : public ConvertVPUIP2VPUMI40XXBase<Conve
         return std::pair<mlir::Value, mlir::Value>(kernelRangeOp.getResult(), kernelInvocationOp.getResult());
     }
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
     void replaceVPURTTaskOpWithKernelOps(mlir::MLIRContext* ctx, mlir::ModuleOp& moduleOp, mlir::func::FuncOp& funcOp,
                                          Logger& _log) {
         _log.info("VPUIP_VPUMI40XX pass: replaceVPURTTaskOpWithKernelOps()");
@@ -1037,7 +1039,9 @@ class ConvertVPUIP2VPUMI40XXPass final : public ConvertVPUIP2VPUMI40XXBase<Conve
             }
         }
     }
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif
 
     void setBarrierIndexValues(mlir::MLIRContext* ctx, mlir::func::FuncOp& funcOp, Logger _log) {
         auto barrierCount = 0;
diff --git a/src/vpux_compiler/src/dialect/const/utils/constant_folding_cache.cpp b/src/vpux_compiler/src/dialect/const/utils/constant_folding_cache.cpp
index 9e96737a16..a4218dcacc 100644
--- a/src/vpux_compiler/src/dialect/const/utils/constant_folding_cache.cpp
+++ b/src/vpux_compiler/src/dialect/const/utils/constant_folding_cache.cpp
@@ -23,10 +23,14 @@ void Const::ConstantFoldingCache::enqueueRequest(const Const::FoldingRequest& fo
 
 Const::FoldingRequest Const::ConstantFoldingCache::getRequest() {
     Const::FoldingRequest result;
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstringop-overflow"
-     _requestQueue.pop(result);
+#endif
+    _requestQueue.pop(result);
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif
     return result;
 }