Fixed failing test, fixed formatting and cleaned up code

shader-slang · Dec 3, 2024 · a34827e · a34827e
1 parent 33d5a5b
commit a34827e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/source/compiler-core/slang-lexer.cpp b/source/compiler-core/slang-lexer.cpp
@@ -673,7 +673,10 @@ static int _readOptionalBase(char const** ioCursor)
 }
 
 
-IntegerLiteralValue getIntegerLiteralValue(Token const& token, UnownedStringSlice* outSuffix, bool* outIsDecimalBase)
+IntegerLiteralValue getIntegerLiteralValue(
+    Token const& token,
+    UnownedStringSlice* outSuffix,
+    bool* outIsDecimalBase)
 {
     IntegerLiteralValue value = 0;
 
@@ -698,7 +701,7 @@ IntegerLiteralValue getIntegerLiteralValue(Token const& token, UnownedStringSlic
         *outSuffix = UnownedStringSlice(cursor, end);
     }
 
-    if(outIsDecimalBase)
+    if (outIsDecimalBase)
     {
         *outIsDecimalBase = (base == 10);
     }

diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp
@@ -6679,20 +6679,16 @@ static BaseType _determineNonSuffixedIntegerLiteralType(
         if (isDecimalBase)
         {
             // There is an edge case here where 9223372036854775808 or INT64_MAX + 1
-            // brings us here, but the complete literal is -9223372036854775808 or INT64_MIN and is valid.
-            // Unfortunately because the lexer handles the negative(-) part of the literal separately
-            // it is impossible to know whether the literal has a negative sign or not.
-            // We emit the warning and initially process it as a uint64 anyways, and the negative sign
-            // will be properly parsed and the value will still be properly stored as a negative INT64_MIN.
+            // brings us here, but the complete literal is -9223372036854775808 or INT64_MIN and is
+            // valid. Unfortunately because the lexer handles the negative(-) part of the literal
+            // separately it is impossible to know whether the literal has a negative sign or not.
+            // We emit the warning and initially process it as a uint64 anyways, and the negative
+            // sign will be properly parsed and the value will still be properly stored as a
+            // negative INT64_MIN.
 
             // Decimal integer is too large to be represented as signed.
             // Output warning that it is represented as unsigned instead.
-            sink->diagnose(
-                *token,
-                Diagnostics::integerLiteralTooLarge,
-                token->getContent(),
-                BaseTypeInfo::asText(baseType),
-                rawValue);
+            sink->diagnose(*token, Diagnostics::integerLiteralTooLarge);
         }
     }
 

diff --git a/tests/slang-extension/atomic-int64-byte-address-buffer.slang b/tests/slang-extension/atomic-int64-byte-address-buffer.slang
@@ -32,6 +32,6 @@ void computeMain(int3 dispatchThreadID : SV_DispatchThreadID)
     // Bit logical
     outputBuffer.InterlockedOrU64((idx << 3), (uint64_t(2) << 32) | (tid << 4));
     outputBuffer.InterlockedXorU64((idx << 3), tid << 8);
-    outputBuffer.InterlockedAndU64((idx << 3), (uint64_t(tid | 2) << 32) |  0xffffffff);
+    outputBuffer.InterlockedAndU64((idx << 3), (uint64_t(tid | 2) << 32) |  0xffffffffffffffff);
 }