Fix build issues

MikePopoloski · Sep 24, 2023 · 6b7d194 · 6b7d194
1 parent efc9937
commit 6b7d194
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/include/slang/numeric/ConstantValue.h b/include/slang/numeric/ConstantValue.h
@@ -311,6 +311,8 @@ struct SLANG_EXPORT ConstantRange {
     int32_t left = 0;
     int32_t right = 0;
 
+    ConstantRange(int32_t left, int32_t right) : left(left), right(right) {}
+
     /// Gets the width of the range, regardless of the order in which
     /// the bounds are specified.
     bitwidth_t width() const {

diff --git a/tools/netlist/include/SplitVariables.h b/tools/netlist/include/SplitVariables.h
@@ -49,7 +49,7 @@ class AnalyseVariableReference {
             return {multiplierElem * rw, fixedSizeElem};
         }
 
-        SLANG_ASSERT(0 && "unsupported type for getTypeBitWidth");
+        SLANG_UNREACHABLE;
     }
 
     /// Return the bit width of a slang type, treating unpacked arrays as
@@ -107,7 +107,7 @@ class AnalyseVariableReference {
             return arrayType.range;
         }
         else {
-            SLANG_ASSERT(0 && "unexpected array type");
+          SLANG_UNREACHABLE;
         }
     }
 

diff --git a/tools/netlist/tests/VariableSelectorsTests.cpp b/tools/netlist/tests/VariableSelectorsTests.cpp
@@ -8,14 +8,15 @@
 
 #include "NetlistTest.h"
 #include "SplitVariables.h"
+#include "slang/util/Util.h"
 #include <stdexcept>
 
 /// Helper method to extract a variable reference from a netlist and return the
 /// bit range associated with it.
 ConstantRange getBitRange(Netlist& netlist, std::string_view variableSyntax) {
     auto* node = netlist.lookupVariableReference(variableSyntax);
     if (node == nullptr) {
-        throw std::runtime_error(fmt::format("Could not find node {}", variableSyntax));
+      SLANG_THROW(fmt::format("Could not find node {}", variableSyntax));
     }
     return AnalyseVariableReference::create(*node).getBitRange();
 }