[clang][bytecode][NFC] Use getElemType() in __builtin_memchr as well

[tbaederr]

For consistency.

[llvmbot]

@llvm/pr-subscribers-clang

Author: Timm Baeder (tbaederr)

Changes

For consistency.

---

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

1 Files Affected:

• (modified) clang/lib/AST/ByteCode/InterpBuiltin.cpp (+1-3)

diff --git a/clang/lib/AST/ByteCode/InterpBuiltin.cpp b/clang/lib/AST/ByteCode/InterpBuiltin.cpp
index 57037b674feba..300c4127a9856 100644
--- a/clang/lib/AST/ByteCode/InterpBuiltin.cpp
+++ b/clang/lib/AST/ByteCode/InterpBuiltin.cpp
@@ -2052,9 +2052,7 @@ static bool interp__builtin_memchr(InterpState &S, CodePtr OpPC,
       (ID == Builtin::BIstrchr || ID == Builtin::BI__builtin_strchr);
 
   PrimType ElemT =
-      IsRawByte
-          ? PT_Sint8
-          : *S.getContext().classify(Ptr.getFieldDesc()->getElemQualType());
+      IsRawByte ? PT_Sint8 : *S.getContext().classify(getElemType(Ptr));
 
   size_t Index = Ptr.getIndex();
   size_t Step = 0;

[llvm-ci]

LLVM Buildbot has detected a new failure on builder lldb-aarch64-ubuntu running on linaro-lldb-aarch64-ubuntu while building clang at step 6 "test".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/59/builds/14750

Here is the relevant piece of the build log for the reference

Step 6 (test) failure: build (failure)
...
UNSUPPORTED: lldb-api :: functionalities/data-formatter/bytecode-summary/TestBytecodeSummary.py (324 of 2109)
UNSUPPORTED: lldb-api :: functionalities/data-formatter/compactvectors/TestCompactVectors.py (325 of 2109)
PASS: lldb-api :: functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py (326 of 2109)
PASS: lldb-api :: functionalities/data-formatter/cstring-utf8-summary/TestCstringUnicode.py (327 of 2109)
PASS: lldb-api :: functionalities/data-formatter/builtin-formats/TestBuiltinFormats.py (328 of 2109)
PASS: lldb-api :: functionalities/data-formatter/callback-matching/TestDataFormatterCallbackMatching.py (329 of 2109)
PASS: lldb-api :: functionalities/breakpoint/thread_plan_user_breakpoint/TestThreadPlanUserBreakpoint.py (330 of 2109)
PASS: lldb-api :: functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py (331 of 2109)
PASS: lldb-api :: functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py (332 of 2109)
PASS: lldb-api :: functionalities/data-formatter/custom-printf-summary/TestCustomSummaryLLVMFormat.py (333 of 2109)
FAIL: lldb-api :: functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py (334 of 2109)
******************** TEST 'lldb-api :: functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py' FAILED ********************
Script:
--
/usr/bin/python3.10 /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/llvm-project/lldb/test/API/dotest.py -u CXXFLAGS -u CFLAGS --env LLVM_LIBS_DIR=/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./lib --env LLVM_INCLUDE_DIR=/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/include --env LLVM_TOOLS_DIR=/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./bin --arch aarch64 --build-dir /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/lldb-test-build.noindex --lldb-module-cache-dir /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/lldb-test-build.noindex/module-cache-lldb/lldb-api --clang-module-cache-dir /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/lldb-test-build.noindex/module-cache-clang/lldb-api --executable /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./bin/lldb --compiler /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./bin/clang --dsymutil /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./bin/dsymutil --make /usr/bin/gmake --llvm-tools-dir /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./bin --lldb-obj-root /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/tools/lldb --lldb-libs-dir /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/./lib /home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/llvm-project/lldb/test/API/functionalities/data-formatter/data-formatter-advanced -p TestDataFormatterAdv.py
--
Exit Code: -11

Command Output (stdout):
--
lldb version 21.0.0git (https://github.com/llvm/llvm-project.git revision 5fc891b965223d66b552397e49fb4b09d781d5da)
  clang revision 5fc891b965223d66b552397e49fb4b09d781d5da
  llvm revision 5fc891b965223d66b552397e49fb4b09d781d5da
Skipping the following test categories: ['libc++', 'dsym', 'gmodules', 'debugserver', 'objc']

--
Command Output (stderr):
--
UNSUPPORTED: LLDB (/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/bin/clang-aarch64) :: test_with_run_command_dsym (TestDataFormatterAdv.AdvDataFormatterTestCase) (test case does not fall in any category of interest for this run) 
PASS: LLDB (/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/bin/clang-aarch64) :: test_with_run_command_dwarf (TestDataFormatterAdv.AdvDataFormatterTestCase)
PASS: LLDB (/home/tcwg-buildbot/worker/lldb-aarch64-ubuntu/build/bin/clang-aarch64) :: test_with_run_command_dwo (TestDataFormatterAdv.AdvDataFormatterTestCase)
----------------------------------------------------------------------
Ran 3 tests in 0.989s

OK (skipped=1)

--

********************
UNSUPPORTED: lldb-api :: functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCCF.py (335 of 2109)
PASS: lldb-api :: functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py (336 of 2109)
PASS: lldb-api :: functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py (337 of 2109)
UNSUPPORTED: lldb-api :: functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCExpr.py (338 of 2109)
PASS: lldb-api :: functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py (339 of 2109)
UNSUPPORTED: lldb-api :: functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCKVO.py (340 of 2109)
PASS: lldb-api :: functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py (341 of 2109)
PASS: lldb-api :: functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py (342 of 2109)
UNSUPPORTED: lldb-api :: functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSBundle.py (343 of 2109)
UNSUPPORTED: lldb-api :: functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSContainer.py (344 of 2109)