[clang][test] Use sizeof(wchar_t) instead of __WCHAR_WIDTH__

[tbaederr]

__WCHAR_WIDTH__ does not exist everywhere and this broke a builder: https://lab.llvm.org/buildbot/#/builders/2/builds/60118

[llvmorg-github-actions]

@llvm/pr-subscribers-clang

Author: Timm Baeder (tbaederr)

Changes

__WCHAR_WIDTH__ does not exist everywhere and this broke a builder: https://lab.llvm.org/buildbot/#/builders/2/builds/60118

---

Full diff: https://github.com/llvm/llvm-project/pull/218707.diff

1 Files Affected:

• (modified) clang/unittests/AST/ByteCode/Pointer.cpp (+3-3)

diff --git a/clang/unittests/AST/ByteCode/Pointer.cpp b/clang/unittests/AST/ByteCode/Pointer.cpp
index a42388d434c0c..bc45da69a0410 100644
--- a/clang/unittests/AST/ByteCode/Pointer.cpp
+++ b/clang/unittests/AST/ByteCode/Pointer.cpp
@@ -315,7 +315,7 @@ TEST(Pointer, Strings) {
   Pointee = GlobalPtr.load<Pointer>();
   ASSERT_TRUE(Pointee.isStringPointer());
   ASSERT_EQ(Pointee.getNumElems(), 7u);
-  ASSERT_EQ(Pointee.elemSize(), __WCHAR_WIDTH__ / 8u);
+  ASSERT_EQ(Pointee.elemSize(), sizeof(wchar_t));
 
   D = match(varDecl(hasGlobalStorage(), hasName("c")).bind("c"), ASTCtx)[0]
           .getNodeAs<VarDecl>("c");
@@ -327,12 +327,12 @@ TEST(Pointer, Strings) {
   Pointee = GlobalPtr.load<Pointer>();
   ASSERT_TRUE(Pointee.isStringPointer());
   ASSERT_EQ(Pointee.getNumElems(), 7u);
-  ASSERT_EQ(Pointee.elemSize(), __WCHAR_WIDTH__ / 8u);
+  ASSERT_EQ(Pointee.elemSize(), sizeof(wchar_t));
   ASSERT_EQ(Pointee.getIndex(), 5u);
   APValue APV = Pointee.toAPValue(ASTCtx);
   ASSERT_TRUE(APV.isLValue());
   ASSERT_FALSE(APV.isLValueOnePastTheEnd());
-  ASSERT_EQ(APV.getLValueOffset().getQuantity(), 5u * (__WCHAR_WIDTH__ / 8u));
+  ASSERT_EQ(APV.getLValueOffset().getQuantity(), 5u * sizeof(wchar_t));
   ASSERT_TRUE(APV.hasLValuePath());
   const auto &Path = APV.getLValuePath();
   ASSERT_EQ(Path.size(), 1u);

[vvereschaka]

@tbaederr,

looks like these changes cause the Clang-Unit::AllClangUnitTests.exe/Pointer/Strings test failure on the Windows host
https://lab.llvm.org/buildbot/#/builders/2/builds/60133

******************** TEST 'Clang-Unit :: ./AllClangUnitTests.exe/97/106' FAILED ********************
Script(shard):
--
GTEST_OUTPUT=json:C:\buildbot\as-builder-3\llvm-clang-x86_64-win-fast\build\tools\clang\unittests\.\AllClangUnitTests.exe-Clang-Unit-11896-97-106.json GTEST_SHUFFLE=0 GTEST_TOTAL_SHARDS=106 GTEST_SHARD_INDEX=97 C:\buildbot\as-builder-3\llvm-clang-x86_64-win-fast\build\tools\clang\unittests\.\AllClangUnitTests.exe
--
Script:
--
C:\buildbot\as-builder-3\llvm-clang-x86_64-win-fast\build\tools\clang\unittests\.\AllClangUnitTests.exe --gtest_filter=Pointer.Strings
--
C:\buildbot\as-builder-3\llvm-clang-x86_64-win-fast\llvm-project\clang\unittests\AST\ByteCode\Pointer.cpp(318): error: Expected equality of these values:
  Pointee.elemSize()
    Which is: 4
  sizeof(wchar_t)
    Which is: 2
C:\buildbot\as-builder-3\llvm-clang-x86_64-win-fast\llvm-project\clang\unittests\AST\ByteCode\Pointer.cpp:318
Expected equality of these values:
  Pointee.elemSize()
    Which is: 4
  sizeof(wchar_t)
    Which is: 2
********************

same for https://lab.llvm.org/buildbot/#/builders/193/builds/18296