diff --git a/src/tint/writer/hlsl/generator_impl.cc b/src/tint/writer/hlsl/generator_impl.cc
index 6ee986ab5d..affaf5e2ec 100644
--- a/src/tint/writer/hlsl/generator_impl.cc
+++ b/src/tint/writer/hlsl/generator_impl.cc
@@ -999,23 +999,25 @@ bool GeneratorImpl::EmitFunctionCall(std::ostream& out,
 bool GeneratorImpl::EmitBuiltinCall(std::ostream& out,
                                     const sem::Call* call,
                                     const sem::Builtin* builtin) {
+    const auto type = builtin->Type();
+
     auto* expr = call->Declaration();
     if (builtin->IsTexture()) {
         return EmitTextureCall(out, call, builtin);
     }
-    if (builtin->Type() == sem::BuiltinType::kSelect) {
+    if (type == sem::BuiltinType::kSelect) {
         return EmitSelectCall(out, expr);
     }
-    if (builtin->Type() == sem::BuiltinType::kModf) {
+    if (type == sem::BuiltinType::kModf) {
         return EmitModfCall(out, expr, builtin);
     }
-    if (builtin->Type() == sem::BuiltinType::kFrexp) {
+    if (type == sem::BuiltinType::kFrexp) {
         return EmitFrexpCall(out, expr, builtin);
     }
-    if (builtin->Type() == sem::BuiltinType::kDegrees) {
+    if (type == sem::BuiltinType::kDegrees) {
         return EmitDegreesCall(out, expr, builtin);
     }
-    if (builtin->Type() == sem::BuiltinType::kRadians) {
+    if (type == sem::BuiltinType::kRadians) {
         return EmitRadiansCall(out, expr, builtin);
     }
     if (builtin->IsDataPacking()) {
@@ -1033,11 +1035,27 @@ bool GeneratorImpl::EmitBuiltinCall(std::ostream& out,
     if (builtin->IsDP4a()) {
         return EmitDP4aCall(out, expr, builtin);
     }
+
     auto name = generate_builtin_name(builtin);
     if (name.empty()) {
         return false;
     }
 
+    // Handle single argument builtins that only accept and return uint (not int overload). We need
+    // to explicitly cast the return value (we also cast the arg for good measure). See
+    // crbug.com/tint/1550
+    if (type == sem::BuiltinType::kCountOneBits || type == sem::BuiltinType::kReverseBits) {
+        auto* arg = call->Arguments()[0];
+        if (arg->Type()->UnwrapRef()->is_signed_scalar_or_vector()) {
+            out << "asint(" << name << "(asuint(";
+            if (!EmitExpression(out, arg->Declaration())) {
+                return false;
+            }
+            out << ")))";
+            return true;
+        }
+    }
+
     out << name << "(";
 
     bool first = true;
@@ -1053,6 +1071,7 @@ bool GeneratorImpl::EmitBuiltinCall(std::ostream& out,
     }
 
     out << ")";
+
     return true;
 }
 
@@ -2546,7 +2565,7 @@ std::string GeneratorImpl::generate_builtin_name(const sem::Builtin* builtin) {
         case sem::BuiltinType::kTranspose:
         case sem::BuiltinType::kTrunc:
             return builtin->str();
-        case sem::BuiltinType::kCountOneBits:
+        case sem::BuiltinType::kCountOneBits:  // uint
             return "countbits";
         case sem::BuiltinType::kDpdx:
             return "ddx";
@@ -2574,7 +2593,7 @@ std::string GeneratorImpl::generate_builtin_name(const sem::Builtin* builtin) {
             return "rsqrt";
         case sem::BuiltinType::kMix:
             return "lerp";
-        case sem::BuiltinType::kReverseBits:
+        case sem::BuiltinType::kReverseBits:  // uint
             return "reversebits";
         case sem::BuiltinType::kSmoothstep:
         case sem::BuiltinType::kSmoothStep:
diff --git a/src/tint/writer/hlsl/generator_impl_builtin_test.cc b/src/tint/writer/hlsl/generator_impl_builtin_test.cc
index 532b82cf5f..40f550be52 100644
--- a/src/tint/writer/hlsl/generator_impl_builtin_test.cc
+++ b/src/tint/writer/hlsl/generator_impl_builtin_test.cc
@@ -778,5 +778,39 @@ void test_function() {
 )");
 }
 
+TEST_F(HlslGeneratorImplTest_Builtin, CountOneBits) {
+    auto* val = Var("val1", ty.i32());
+    auto* call = Call("countOneBits", val);
+    WrapInFunction(val, call);
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"([numthreads(1, 1, 1)]
+void test_function() {
+  int val1 = 0;
+  const int tint_symbol = asint(countbits(asuint(val1)));
+  return;
+}
+)");
+}
+
+TEST_F(HlslGeneratorImplTest_Builtin, ReverseBits) {
+    auto* val = Var("val1", ty.i32());
+    auto* call = Call("reverseBits", val);
+    WrapInFunction(val, call);
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"([numthreads(1, 1, 1)]
+void test_function() {
+  int val1 = 0;
+  const int tint_symbol = asint(reversebits(asuint(val1)));
+  return;
+}
+)");
+}
+
 }  // namespace
 }  // namespace tint::writer::hlsl
diff --git a/test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.hlsl b/test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.hlsl
index 1093720ed6..4708642f9e 100644
--- a/test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.hlsl
@@ -1,5 +1,5 @@
 void countOneBits_0f7980() {
-  int4 res = countbits(int4(0, 0, 0, 0));
+  int4 res = asint(countbits(asuint(int4(0, 0, 0, 0))));
 }
 
 struct tint_symbol {
diff --git a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.hlsl b/test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.hlsl
index cc8e8514b5..38c2601ef7 100644
--- a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.hlsl
@@ -1,5 +1,5 @@
 void countOneBits_65d2ae() {
-  int3 res = countbits(int3(0, 0, 0));
+  int3 res = asint(countbits(asuint(int3(0, 0, 0))));
 }
 
 struct tint_symbol {
diff --git a/test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.hlsl b/test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.hlsl
index faf8c7c733..7807f16ba8 100644
--- a/test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.hlsl
@@ -1,5 +1,5 @@
 void countOneBits_af90e2() {
-  int2 res = countbits(int2(0, 0));
+  int2 res = asint(countbits(asuint(int2(0, 0))));
 }
 
 struct tint_symbol {
diff --git a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.hlsl b/test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.hlsl
index bc4e67655a..2ba6e0fe7c 100644
--- a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.hlsl
@@ -1,5 +1,5 @@
 void countOneBits_fd88b2() {
-  int res = countbits(1);
+  int res = asint(countbits(asuint(1)));
 }
 
 struct tint_symbol {
diff --git a/test/tint/builtins/gen/reverseBits/222177.wgsl.expected.hlsl b/test/tint/builtins/gen/reverseBits/222177.wgsl.expected.hlsl
index 6ee1cc4cb4..f065715eb0 100644
--- a/test/tint/builtins/gen/reverseBits/222177.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/reverseBits/222177.wgsl.expected.hlsl
@@ -1,5 +1,5 @@
 void reverseBits_222177() {
-  int2 res = reversebits(int2(0, 0));
+  int2 res = asint(reversebits(asuint(int2(0, 0))));
 }
 
 struct tint_symbol {
diff --git a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.hlsl b/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.hlsl
index b3c0a73195..9ac2961d3a 100644
--- a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.hlsl
@@ -1,5 +1,5 @@
 void reverseBits_4dbd6f() {
-  int4 res = reversebits(int4(0, 0, 0, 0));
+  int4 res = asint(reversebits(asuint(int4(0, 0, 0, 0))));
 }
 
 struct tint_symbol {
diff --git a/test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.hlsl b/test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.hlsl
index 03edd621ad..e6381ab4bf 100644
--- a/test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.hlsl
@@ -1,5 +1,5 @@
 void reverseBits_7c4269() {
-  int res = reversebits(1);
+  int res = asint(reversebits(asuint(1)));
 }
 
 struct tint_symbol {
diff --git a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.hlsl b/test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.hlsl
index c7f6c4897c..b88fa30e89 100644
--- a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.hlsl
@@ -1,5 +1,5 @@
 void reverseBits_c21bc1() {
-  int3 res = reversebits(int3(0, 0, 0));
+  int3 res = asint(reversebits(asuint(int3(0, 0, 0))));
 }
 
 struct tint_symbol {