Fix 0xFFFFFFFF enum value crash.

PiperOrigin-RevId: 457749966
tryweirdier · Jun 28, 2022 · c9aa259 · c9aa259
1 parent eeacef1
commit c9aa259
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/xls/contrib/xlscc/translator.cc b/xls/contrib/xlscc/translator.cc
@@ -1687,9 +1687,9 @@ absl::StatusOr<CValue> Translator::GetIdentifier(const clang::NamedDecl* decl,
   if (enum_decl != nullptr) {
     const llvm::APSInt& aps = enum_decl->getInitVal();
 
-    std::shared_ptr<CType> type(std::make_shared<CIntType>(32, true));
+    std::shared_ptr<CType> type(std::make_shared<CIntType>(32, false));
     xls::BValue bval =
-        context().fb->Literal(xls::SBits(aps.getExtValue(), 32), global_loc);
+        context().fb->Literal(xls::UBits(aps.getExtValue(), 32), global_loc);
 
     value = CValue(bval, type);
   } else {

diff --git a/xls/contrib/xlscc/translator_test.cc b/xls/contrib/xlscc/translator_test.cc
@@ -470,6 +470,18 @@ TEST_F(TranslatorTest, GlobalEnum) {
   Run({{"a", 11}}, 11 + 3 + 3, content);
 }
 
+TEST_F(TranslatorTest, MaximumEnum) {
+  const std::string content = R"(
+       enum BlahE {
+         A=2,
+         B=0xFFFFFFFF
+       };
+       long long my_package(long long a) {
+         return a+B+B;
+       })";
+  Run({{"a", 11}}, 11L + 0xFFFFFFFFL + 0xFFFFFFFFL, content);
+}
+
 TEST_F(TranslatorTest, SetGlobal) {
   const std::string content = R"(
        int off = 60;
@@ -1777,8 +1789,6 @@ TEST_F(TranslatorTest, CapitalizeFirstLetter) {
                            ParsePackage(ir_src));
   XLS_ASSERT_OK(package->SetTopByName("my_package"));
 
-  // std::vector<xls::Value> st_elem;
-  // st_elem.push_back(xls::Value(xls::UBits(1, 1)));
   auto state =
       xls::Value(xls::Value::TupleOwned({xls::Value(xls::UBits(1, 1))}));
 
@@ -3029,7 +3039,8 @@ TEST_F(TranslatorTest, IOSubroutineDeclMissing) {
        })";
 
   ASSERT_THAT(SourceToIr(content, /*func=*/nullptr, /* clang_argv= */ {},
-                                      /* io_test_mode= */ true).status(),
+                         /* io_test_mode= */ true)
+                  .status(),
               xls::status_testing::StatusIs(
                   absl::StatusCode::kNotFound,
                   testing::HasSubstr("sub_recv used but has no body")));