From 88e0bc07f7a23a6739fe7d60d292e25fea978dbb Mon Sep 17 00:00:00 2001
From: dan sinclair <dsinclair@chromium.org>
Date: Mon, 19 Oct 2020 11:59:16 -0400
Subject: [PATCH] Fixup build errors.

When building in Release mode there are several build errors due to use
`-Wall -Werror` and having undefined variables. This CL wraps the
various variables which are only used in `assert` calls to be behind
`#if !defined(NDEBUG)` preprocessor checks.
---
 VulkanHppGenerator.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index dc2579b..b7d73ed 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -1443,8 +1443,10 @@ void VulkanHppGenerator::appendCommand( std::string &       str,
 
   // and then the same for the Unique* versions (a deleteCommand is available for the commandData's class, and the
   // function starts with 'allocate' or 'create')
+#if !defined( NDEBUG )
   auto handleIt = m_handles.find( commandData.handle );
   assert( handleIt != m_handles.end() );
+#endif
 
   std::string enter, leave;
   std::tie( enter, leave ) = generateProtection( commandData.feature, commandData.extensions );
@@ -2944,7 +2946,7 @@ bool VulkanHppGenerator::appendFunctionHeaderArgumentStandard( std::string &
 
 void VulkanHppGenerator::appendFunctionHeaderReturnType( std::string &       str,
                                                          CommandData const & commandData,
-                                                         size_t              returnParamIndex,
+                                                         size_t              /*returnParamIndex*/,
                                                          std::string const & enhancedReturnType,
                                                          bool                enhanced,
                                                          bool                twoStep,
@@ -4392,10 +4394,13 @@ std::string
   std::string str;
 
   auto firstVectorParamIt  = vectorParamIndices.begin();
-  auto secondVectorParamIt = std::next( firstVectorParamIt );
 
   assert( commandData.params[0].type.type == commandData.handle );
+
+#if !defined( NDEBUG )
+  auto secondVectorParamIt = std::next( firstVectorParamIt );
   assert( firstVectorParamIt->second == secondVectorParamIt->second );
+#endif
 
   std::set<size_t> skippedParameters = { 0, firstVectorParamIt->second };
 
@@ -7114,12 +7119,13 @@ std::string VulkanHppGenerator::determineEnhancedReturnType( CommandData const &
                                                              bool                             isStructureChain ) const
 {
   assert( ( returnParamIndex == INVALID_INDEX ) || ( returnParamIndex < commandData.params.size() ) );
+#if !defined( NDEBUG )
   for ( auto vpi : vectorParamIndices )
   {
     assert( ( vpi.first != vpi.second ) && ( vpi.first < commandData.params.size() ) &&
             ( ( vpi.second == INVALID_INDEX ) || ( vpi.second < commandData.params.size() ) ) );
   }
-
+#endif
   std::string enhancedReturnType;
   if ( returnParamIndex != INVALID_INDEX )
   {
@@ -7163,11 +7169,13 @@ size_t VulkanHppGenerator::determineReturnParamIndex( CommandData const &
                                                       std::map<size_t, size_t> const & vectorParamIndices,
                                                       bool                             twoStep ) const
 {
+#if !defined( NDEBUG )
   for ( auto vpi : vectorParamIndices )
   {
     assert( ( vpi.first != vpi.second ) && ( vpi.first < commandData.params.size() ) &&
             ( ( vpi.second == INVALID_INDEX ) || ( vpi.second < commandData.params.size() ) ) );
   }
+#endif
 
   size_t returnParamIndex = INVALID_INDEX;
   // for return types of type VkResult or void, we can determine a parameter to return
@@ -7693,12 +7701,14 @@ bool VulkanHppGenerator::isParamIndirect( std::string const & name, std::vector<
       params.begin(), params.end(), [&n = nameParts[0]]( ParamData const & pd ) { return pd.name == n; } );
     if ( paramIt != params.end() )
     {
+#if !defined( NDEBUG )
       auto structureIt = m_structures.find( paramIt->type.type );
       assert( structureIt != m_structures.end() );
       assert( std::find_if( structureIt->second.members.begin(),
                             structureIt->second.members.end(),
                             [&n = nameParts[1]]( MemberData const & md ) { return md.name == n; } ) !=
               structureIt->second.members.end() );
+#endif
       return true;
     }
   }
@@ -7716,12 +7726,14 @@ bool VulkanHppGenerator::isParamIndirect( std::string const & name, ParamData co
   }
   if ( ( nameParts.size() == 2 ) && ( nameParts[0] == param.name ) )
   {
+#if !defined( NDEBUG )
     auto structureIt = m_structures.find( param.type.type );
     assert( structureIt != m_structures.end() );
     assert( std::find_if( structureIt->second.members.begin(),
                           structureIt->second.members.end(),
                           [&n = nameParts[1]]( MemberData const & md ) { return md.name == n; } ) !=
             structureIt->second.members.end() );
+#endif
     return true;
   }
   return false;