Fixes to lib/hash and lib/big_int_util. (#4655)

* Small fixes to hashing and big int.

* Fix unused code in alloc_trace.cpp?

* Add sed_config_h dependency to config.h for Bazel builds?

* Include config in alloc trace.

BUILD.bazel

@@ -41,6 +41,7 @@ cc_library(
     name = "config_h",
     hdrs = ["config.h"],
     include_prefix = ".",
+    deps = [":sed_config_h"],
 )
 
 cc_library(

backends/p4tools/common/lib/symbolic_env.cpp

@@ -1,17 +1,14 @@
 #include "backends/p4tools/common/lib/symbolic_env.h"
 
 #include <algorithm>
-#include <string>
 #include <utility>
-#include <vector>
 
 #include <boost/container/vector.hpp>
 
 #include "backends/p4tools/common/lib/model.h"
 #include "ir/indexed_vector.h"
 #include "ir/vector.h"
 #include "ir/visitor.h"
-#include "lib/cstring.h"
 #include "lib/exceptions.h"
 
 namespace P4Tools {
@@ -28,7 +25,8 @@ bool SymbolicEnv::exists(const IR::StateVariable &var) const { return map.find(v
 
 void SymbolicEnv::set(const IR::StateVariable &var, const IR::Expression *value) {
     BUG_CHECK(value->type && !value->type->is<IR::Type_Unknown>(),
-              "Cannot set value with unspecified type: %1%", value);
+              "Cannot set value for node %1% with unspecified type: %2%", value->node_type_name(),
+              value);
     map[var] = value;
 }
 

ir/expression.cpp

@@ -161,7 +161,7 @@ const IR::Constant *IR::Constant::get(const IR::Type *t, big_int v, Util::Source
 const IR::BoolLiteral *IR::BoolLiteral::get(bool value, const Util::SourceInfo &si) {
     // Do not cache values with a non-empty source info (yet).
     if (si.isValid()) {
-        return new IR::BoolLiteral(si, value);
+        return new IR::BoolLiteral(si, IR::Type_Boolean::get(), value);
     }
     // Boolean literals are interned.
     static IR::BoolLiteral TRUE_BOOLLITERAL(si, IR::Type_Boolean::get(), true);

lib/alloc_trace.h

@@ -20,6 +20,7 @@ limitations under the License.
 #include <map>
 #include <ostream>
 
+#include "config.h"
 #include "exceptions.h"
 #include "gc.h"
 

lib/big_int.h

@@ -0,0 +1,24 @@
+/*
+Copyright 2013-present Barefoot Networks, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#ifndef LIB_BIG_INT_H_
+#define LIB_BIG_INT_H_
+
+#include <boost/multiprecision/cpp_int.hpp>
+
+using big_int = boost::multiprecision::cpp_int;
+
+#endif /* LIB_BIG_INT_H_ */

lib/big_int_util.h

@@ -17,10 +17,8 @@ limitations under the License.
 #ifndef LIB_BIG_INT_UTIL_H_
 #define LIB_BIG_INT_UTIL_H_
 
-#include <boost/multiprecision/cpp_int.hpp>
-
-#include "config.h"
-typedef boost::multiprecision::cpp_int big_int;
+#include "big_int.h"
+#include "hash.h"
 
 namespace Util {
 
@@ -93,4 +91,7 @@ static inline int floor_log2(big_int v) {
 
 static inline int ceil_log2(big_int v) { return v ? floor_log2(v - 1) + 1 : -1; }
 
+template <>
+struct Util::Hasher<big_int> : Detail::StdHasher {};
+
 #endif /* LIB_BIG_INT_UTIL_H_ */

lib/hash.h

@@ -11,8 +11,6 @@
 #include <tuple>
 #include <type_traits>
 
-#include "lib/big_int_util.h"
-
 namespace Util {
 
 namespace Detail {
@@ -178,9 +176,6 @@ struct Hasher<signed char> : Detail::IntegerHasher<signed char> {};
 template <>
 struct Hasher<char> : Detail::IntegerHasher<char> {};
 
-template <>
-struct Hasher<big_int> : Detail::StdHasher {};
-
 template <>
 struct Hasher<float> : Detail::FloatHasher<float> {};