Remove assert.h include from DxilPipelineStateValidation.h

include/dxc/DxilContainer/DxilPipelineStateValidation.h

@@ -12,20 +12,19 @@
 #ifndef __DXIL_PIPELINE_STATE_VALIDATION__H__
 #define __DXIL_PIPELINE_STATE_VALIDATION__H__
 
+// Don't include assert.h here.
+// Since this header is included from multiple environments,
+// it is necessary to define assert before this header is included.
+// #include <assert.h>
+
 #include "dxc/WinAdapter.h"
-#include <assert.h>
 #include <cstring>
 #include <stdint.h>
 
 namespace llvm {
 class raw_ostream;
 }
 
-// Don't include assert.h here.
-// Since this header is included from multiple environments,
-// it is necessary to define assert before this header is included.
-// #include <assert.h>
-
 #ifndef UINT_MAX
 #define UINT_MAX 0xffffffff
 #endif

lib/DxilContainer/DxilPipelineStateValidation.cpp

@@ -9,6 +9,8 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <assert.h> // Needed for DxilPipelineStateValidation.h
+
 #include "dxc/DxilContainer/DxilPipelineStateValidation.h"
 #include "dxc/DXIL/DxilModule.h"
 #include "dxc/DXIL/DxilResource.h"

lib/DxilContainer/DxilRDATBuilder.cpp

@@ -1,3 +1,5 @@
+#include <assert.h> // Needed for DxilPipelineStateValidation.h
+
 #include "dxc/DxilContainer/DxilRDATBuilder.h"
 #include "dxc/DxilContainer/DxilPipelineStateValidation.h"
 #include "dxc/Support/FileIOHelper.h"

lib/DxilValidation/DxilContainerValidation.cpp

@@ -31,6 +31,7 @@
 
 #include "DxilValidationUtils.h"
 
+#include <assert.h> // Needed for DxilPipelineStateValidation.h
 #include <memory>
 
 using std::unique_ptr;

lib/HLSL/DxcOptimizer.cpp

@@ -42,7 +42,8 @@
 #include "llvm/Transforms/IPO/PassManagerBuilder.h"
 
 #include <algorithm>
-#include <list> // should change this for string_table
+#include <assert.h> // Needed for DxilPipelineStateValidation.h
+#include <list>     // should change this for string_table
 #include <vector>
 
 #include "llvm/PassPrinters/PassPrinters.h"

tools/clang/tools/dxa/dxa.cpp

@@ -9,6 +9,8 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <assert.h> // Needed for DxilPipelineStateValidation.h
+
 #include "dxc/Support/Global.h"
 #include "dxc/Support/Unicode.h"
 #include "dxc/Support/WinIncludes.h"

tools/clang/unittests/HLSL/OptimizerTest.cpp

@@ -14,6 +14,7 @@
 #endif
 
 #include <algorithm>
+#include <assert.h> // Needed for DxilPipelineStateValidation.h
 #include <cassert>
 #include <map>
 #include <memory>